summaryrefslogtreecommitdiff
path: root/sci-biology
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-03 00:07:26 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-03 00:07:26 +0100
commita3bb28551df94028000fb72308a9e9baa01458b0 (patch)
tree33b14c7bf0dffbd5bb04dbd5b395514ebdda4896 /sci-biology
parent6657c680376cedf378fcf328e5fa03ed3b41d580 (diff)
gentoo auto-resync : 03:06:2024 - 00:07:25edge
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/Manifest.gzbin19006 -> 19006 bytes
-rw-r--r--sci-biology/ucsc-genome-browser/Manifest2
-rw-r--r--sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild (renamed from sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild)41
3 files changed, 26 insertions, 17 deletions
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index b00432ffd6cc..375bb3febb00 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
Binary files differ
diff --git a/sci-biology/ucsc-genome-browser/Manifest b/sci-biology/ucsc-genome-browser/Manifest
index 13c0c81fd95e..352d6f97739a 100644
--- a/sci-biology/ucsc-genome-browser/Manifest
+++ b/sci-biology/ucsc-genome-browser/Manifest
@@ -1,3 +1,3 @@
DIST jksrc.v260.zip 59090224 BLAKE2B 755bb97f50cde97e7634f38aa81f0843de52710cac78f5b0a2ee6129cffc99f730b8e1ab41d24e2faebb3c0a3e1d1309c84307e2dc4af1efe9a30fb0b9ae1670 SHA512 48aa964ab3ae456ab7e7ddc5d73b91774bd4892f21f1498578a5de38d3a07e4684778ddb1ac1ae389d5bbb3586f9b8506ca3697acca1f6777b85d343cf5d9485
-EBUILD ucsc-genome-browser-260-r1.ebuild 3134 BLAKE2B f9b628c78939377f66c9aca6b68ca3cbebf7c41dde18a8d03dbc4533593069dff0381d0fe206b0287569739a96010661d275c2d43a8ffc9e1ad8f73b4d73be5e SHA512 6f33bd29ac24661d8a495913b6746d60ca4eb95e91e5ca7325420a9b430f9ca8fe990d9167ab2ffd500f151f8cce045601e1dde24efde05b185511c1b06593a7
+EBUILD ucsc-genome-browser-260-r2.ebuild 3247 BLAKE2B 7f8ece657ec2fa39c623712293009645f247f427149e617287d458a97364bf6070a3bc1c94ef2b447c6751e58b0b98f7996c7a941342ed937d9455a84a1233fb SHA512 99716737f5cb5e03ecc162a97a79e8f3369dea1452819c9dce4ae2ec593953b0c031929c0785b8677506483d6537c59d113888b89b804d9796b767f364bfc5cf
MISC metadata.xml 436 BLAKE2B f0bf2e08eaadf20a1810abf0e3cd42494197b8fe2593c5f3ee243f58af5676a795009fefbc7f11d2d8e4d42ff9e34790dd7be9999a37839fe6ce780b12714116 SHA512 43d2b6e4519270b495122711c747c906ba64993811a6f4d63af5fc17a6752232dde3717f193432d673e2c183e35fb88421a39077d3d0dad18b712d26c6e64caa
diff --git a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
index f0bb0676ae85..ef96f491fb51 100644
--- a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
+++ b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+WEBAPP_MANUAL_SLOT="yes"
+# TODO: use WEBAPP_OPTIONAL?
inherit toolchain-funcs flag-o-matic webapp
DESCRIPTION="The UCSC genome browser suite, also known as Jim Kent's library and GoldenPath"
HOMEPAGE="http://genome.ucsc.edu/"
SRC_URI="http://hgdownload.cse.ucsc.edu/admin/jksrc.v${PV}.zip"
+S="${WORKDIR}/kent"
LICENSE="blat"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+mysql +server static-libs"
-
REQUIRED_USE="server? ( mysql )"
-WEBAPP_MANUAL_SLOT="yes"
-
+# TODO: test with other webservers
RDEPEND="
- dev-libs/openssl:0=
- media-libs/libpng:0=
+ dev-libs/openssl:=
+ media-libs/libpng:=
!<sci-biology/ucsc-genome-browser-223
- mysql? ( dev-db/mysql-connector-c:0= )
- server? ( virtual/httpd-cgi )" # TODO: test with other webservers
-DEPEND="${RDEPEND} app-arch/unzip"
-
-S="${WORKDIR}/kent"
+ mysql? ( dev-db/mysql-connector-c:= )
+ server? ( virtual/httpd-cgi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/cpio
+ app-arch/unzip
+"
+
+pkg_setup() {
+ use server && webapp_pkg_setup
+}
src_prepare() {
default
@@ -35,6 +43,8 @@ src_prepare() {
# bug #708064
append-flags -fcommon
+ # bug #831491, bug #919200, bug #921261
+ append-flags -std=gnu89
sed \
-e 's/-Werror//' \
@@ -64,10 +74,9 @@ src_compile() {
export MYSQLLIBS="none" MYSQLINC="none" DOCUMENTROOT="none" CGI_BIN="none"
- # TODO: Change ${EPREFIX} to ${ESYSROOT} in EAPI 7
- # (and ideally use pkg-config here)
- use mysql && export MYSQLLIBS="-L${EPREFIX%/}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
- MYSQLINC="${EPREFIX%/}/usr/include/mysql"
+ # TODO: use pkg-config here
+ use mysql && export MYSQLLIBS="-L${ESYSROOT}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
+ MYSQLINC="${ESYSROOT}/usr/include/mysql"
use server && export DOCUMENTROOT="${WORKDIR}/destdir/${MY_HTDOCSDIR}" \
CGI_BIN="${WORKDIR}/destdir/${MY_HTDOCSDIR}/cgi-bin"