sci-biology/qrna: Move to EAPI=4

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 44 insertions, 44 deletions

diff --git a/sci-biology/qrna/ChangeLog b/sci-biology/qrna/ChangeLog
index 0f5150b086a6..79254c1ce621 100644
--- a/sci-biology/qrna/ChangeLog
+++ b/sci-biology/qrna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-biology/qrna
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/qrna/ChangeLog,v 1.21 2010/03/10 21:13:06 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/qrna/ChangeLog,v 1.22 2012/11/09 14:14:49 jlec Exp $
+
+  09 Nov 2012; Justin Lecher <jlec@gentoo.org> qrna-2.0.3c-r1.ebuild:
+  Move to EAPI=4
 
 *qrna-2.0.3c-r1 (10 Mar 2010)
 
diff --git a/sci-biology/qrna/Manifest b/sci-biology/qrna/Manifest
index 10e62a0b8784..bf4dfd6dafd4 100644
--- a/sci-biology/qrna/Manifest
+++ b/sci-biology/qrna/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 26qrna 30 RMD160 c6eb4ba1c559f2cce296915c3d166e134d54b7c4 SHA1 34b74c24f599e5387dd788ec2df1752b043b7b9a SHA256 218d879e5ef893cba33d8be7e0a6cba3f08c0a475781bbbb4c32bde6e79a32b7
-AUX qrna-2.0.3c-glibc-2.10.patch 7571 RMD160 a5e616dfa354361efa117aa8598552d7d81fdf46 SHA1 273aed2a373e9b0f81d977cbb2c54d81be534557 SHA256 17f34c9e3087f2c9d2decd95e07663813087843a778db45c5be793c6b51bb82c
-AUX qrna-2.0.3c-ldflags.patch 1368 RMD160 30d595372093b17fb159213b594bde3d8ed2cf55 SHA1 a684a770cb114b0cc9de3617a830af9fb571904b SHA256 ec99724754ff3f667be139832fd871bd93f7ae0cf7247fb8d15696b0315e01d6
-DIST qrna-2.0.3c.tar.bz2 6423705 RMD160 df0fe89e45d64cf6f205dd3e524a9a27d6c14961 SHA1 1c577a495d538eb50531c4672decae85649ac066 SHA256 fc88b58dddab26f20477a50340453e9d360ea34956ba526f7db6959283399b1c
-EBUILD qrna-2.0.3c-r1.ebuild 1310 RMD160 957caa12dd44753885909ce1cebbfaa18482fcd4 SHA1 c5afbd6f51ec320f4482181e01f6d13c08e671a9 SHA256 ab48a66efd42c85952ccf5d07a406d427abfefa24ccbf86befa297a3bb1b07c2
-EBUILD qrna-2.0.3c.ebuild 1197 RMD160 93543df0a60c501b1abf4cd546e925988f102481 SHA1 53f414307e942d9e627ef646f151f100fda4f003 SHA256 53885ad72d003f6c060b10d5d45e3b3f98499e5108c5e1d7533d3c7172d0f97a
-MISC ChangeLog 3249 RMD160 fbb8c3acd203e17005cb348d5c5ddacc7414fae3 SHA1 fc2bd3ee87c843765b861ac81195a365a3913639 SHA256 01947fc3bcab271d1c84e8780df3e72ec078669eab4d7feff75250b44af3b45a
-MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
+AUX 26qrna 30 SHA256 218d879e5ef893cba33d8be7e0a6cba3f08c0a475781bbbb4c32bde6e79a32b7 SHA512 ba47d1fe1cba68ca7dce369e814a67cca24339a1ec213d206001b4f87f8939d81c7e59bc285090e5ec2cec05693f560c9c4883cae8f67891f6053d9bc69cc46b WHIRLPOOL 2a4d368c898fec40b1a48484b82e6ea29d9e95a8c99622bb45d59bb999813461314589bfeec2fa223b178837f69c04ea99bb8433a9481e91464d1357e0f29547
+AUX qrna-2.0.3c-glibc-2.10.patch 7571 SHA256 17f34c9e3087f2c9d2decd95e07663813087843a778db45c5be793c6b51bb82c SHA512 afa8767baadf99dafbb0ce4fa8b31017f6a12e1eadbcbd41a7e04e571d3f059395356178df3ab28f8c03c10f227123361590357c6ace6256727322ade00228e6 WHIRLPOOL ff1d1a6d0d045b406e6616512f0f2d5fbb0513a1331b475e2582e9d3eb1b4fee8b0093db01e0220bcef55470b892f57823aac8664f3ad470d5a90f91775fe37f
+AUX qrna-2.0.3c-ldflags.patch 1368 SHA256 ec99724754ff3f667be139832fd871bd93f7ae0cf7247fb8d15696b0315e01d6 SHA512 4b1be14c664056eebb914e8c8223686ef0f345c860bd5aca82dced67b9580a205ef9539c563c0b0c646a9781ed0c58c4cec69d71bceb2c410dc485e9b5881c54 WHIRLPOOL 538627ab602f8f92af014e38ce5764c574f2820c7ff2c25b3f999a2e658413421c886abe7451443f907f0db52d3fdb9b6f4fb4011232e66e3ac79039dddadd13
+DIST qrna-2.0.3c.tar.bz2 6423705 SHA256 fc88b58dddab26f20477a50340453e9d360ea34956ba526f7db6959283399b1c SHA512 98710bcf8993e2c09ec1eb33632a18ac993ab817dc95a865200b0868f79b95ff61f5f7d3f0c1c33de6d26f674025ea11a8c7d8175b96071e4594daa252fa52b5 WHIRLPOOL f7c788629f6580e3f1c2ccaa5109ba13d8f103abfd3a88f3ef127577fc825fdc7deef102325ab2645a24ba1215d59b21e2c77448631c90d6eae47aa95a9463e5
+EBUILD qrna-2.0.3c-r1.ebuild 1249 SHA256 771927c36ae479ec1ab9599b6c32b347790ade982555ca35c7e6bd2d11e7fbff SHA512 f40f809f332f4a9ee140331a8e7c6557a2f71b48e93a6c86934f8253f716265059107479245024144304c5f77f4981e65fee28516fcf104ea34fcd8d683eb72b WHIRLPOOL 83b6a5ed0cc61b58f98275514c17411c3a0a717b26504f05447e3a0749524672fb71f5a364caa374939e52607d12b6fb321b97e9417d3350db423fed4a9c6e06
+EBUILD qrna-2.0.3c.ebuild 1197 SHA256 53885ad72d003f6c060b10d5d45e3b3f98499e5108c5e1d7533d3c7172d0f97a SHA512 f1e303c2c93bc6deead833c800f958e326e71e93b1df87f919569acdd36394fa33eed16ecf776f9ad96d686e0bb7604193df1ee9ae3d2e4e954dcf50fa0b389c WHIRLPOOL 7081b0e994553f5fbe192da8402fa8dfb84da23033d788bc63c413b9fd35fc62c8d70c64b57af10f3f6d1590f9e532c522ea118cc43975a9a5913c7143a12d84
+MISC ChangeLog 3337 SHA256 5ecb5a2f345deae54fbb84a0fc4608863080a2090b68ef290a4a88bc487bf78a SHA512 daa062a322368737bfd749a01962eaadad76297da002e6127f4e1e552726a13322b59485a316aa512e528eded37f69563100073a86eb8dd00aea5bfb5bb17aeb WHIRLPOOL 90a39087eb671839747b633262888fa7d7e3fbe45690b34621586d44cac13430bad0d1df1236296dbc3c818466159f0b28c063810d295f45ae1bda81932b4b93
+MISC metadata.xml 165 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132 SHA512 f197731b98b313b41180dc4b553dab070b28f1badcb259973d528640166feaf8b6c48f56158431d1a4daac9b2873da05c2bd4e4ec269db310581d398a494d166 WHIRLPOOL 83774f905f256ee3dc965af16b472d0ac546314f46d02414b1da590eae1059f8076e63d67f763f9a3afb60a12072fd18c49937b039acbc8ac599ae45c0a04139
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkuYC2gACgkQgAnW8HDreRbsqQCeOmKlBZk1keAgE3cOq5de1BUx
-yt8An0McWpUUm/+zIlRkIWNNTzcHv/cE
-=lTuP
+iEYEAREIAAYFAlCdD9oACgkQgAnW8HDreRYfMgCgtaGg4anOYMYQlVj5KYRgNbwm
+RP8AoJpd53vLyhUTt7RyvmeEeZ1iGqGB
+=KgyZ
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/qrna/qrna-2.0.3c-r1.ebuild b/sci-biology/qrna/qrna-2.0.3c-r1.ebuild
index 257bffd7f3e6..88bd2c9f3fd3 100644
--- a/sci-biology/qrna/qrna-2.0.3c-r1.ebuild
+++ b/sci-biology/qrna/qrna-2.0.3c-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/qrna/qrna-2.0.3c-r1.ebuild,v 1.1 2010/03/10 21:13:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/qrna/qrna-2.0.3c-r1.ebuild,v 1.2 2012/11/09 14:14:49 jlec Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -13,48 +15,43 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	sci-biology/hmmer"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	sed -e "s/^CC.*/CC = $(tc-getCC)/" \
-		-e "s/CFLAGS = -O/CFLAGS = ${CFLAGS}/" \
-		-i src/Makefile squid/Makefile squid02/Makefile || die
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed \
+		-e "s:^CC.*:CC = $(tc-getCC):" \
+		-e "/^AR/s:ar:$(tc-getAR):g" \
+		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):g" \
+		-e "/CFLAGS/s:=.*$:= ${CFLAGS}:" \
+		-i {src,squid,squid02}/Makefile || die
 	rm -v squid*/*.a
 }
 
 src_compile() {
-	cd "${S}"/squid
-	emake || die
-
-	cd "${S}"/squid02
-	emake || die
-
-	cd "${S}"/src
-	emake || die
+	local dir
+	for dir in squid squid02 src; do
+		emake -C ${dir}
+	done
 }
 
 src_install () {
-	cd "${S}"/src
-	dobin cfgbuild eqrna eqrna_sample main rnamat_main || die
-
-	cd "${S}"
-	dobin scripts/* || die
+	dobin src/{cfgbuild,eqrna,eqrna_sample,rnamat_main} scripts/*
 
-	newdoc 00README README || die
+	newdoc 00README README
 	insinto /usr/share/doc/${PF}
-	doins documentation/* || die
+	doins documentation/*
 
 	insinto /usr/share/${PN}/data
-	doins lib/* || die
+	doins lib/*
 	insinto /usr/share/${PN}/demos
-	doins Demos/* || die
+	doins Demos/*
 
 	# Sets the path to the QRNA data files.
-	doenvd "${FILESDIR}"/26qrna || die
+	doenvd "${FILESDIR}"/26qrna
 }