From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1637963-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id D8E7E1581D3
	for <garchives@archives.gentoo.org>; Sat,  1 Jun 2024 23:21:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0BE4CE2A88;
	Sat,  1 Jun 2024 23:21:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DBA3BE2A88
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2024 23:21:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id DE0C8343010
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2024 23:21:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 39CA11ACB
	for <gentoo-commits@lists.gentoo.org>; Sat,  1 Jun 2024 23:21:03 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1717283949.7955b031affbce3bce05db8f44802c37a34c6c46.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/ucsc-genome-browser/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
X-VCS-Directories: sci-biology/ucsc-genome-browser/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 7955b031affbce3bce05db8f44802c37a34c6c46
X-VCS-Branch: master
Date: Sat,  1 Jun 2024 23:21:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e4889a61-365a-4dfb-bdd4-248f5e24dfc8
X-Archives-Hash: 97acd61d16a5aec83f48c71abc46d6fb

commit:     7955b031affbce3bce05db8f44802c37a34c6c46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 23:18:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 23:19:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7955b031

sci-biology/ucsc-genome-browser: EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...r1.ebuild => ucsc-genome-browser-260-r2.ebuild} | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

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
similarity index 88%
rename from sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
rename to sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r2.ebuild
index 2219008438c1..769a4481eeee 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,34 +1,33 @@
 # 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= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	server? ( virtual/httpd-cgi )
 "
-DEPEND="${RDEPEND} app-arch/unzip"
-
-S="${WORKDIR}/kent"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 pkg_setup() {
 	use server && webapp_pkg_setup
@@ -72,10 +71,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"