ppc stable wrt bug #520776; Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 119 deletions

diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index f31de99a8fa6..92d4c0ad8d00 100644
--- a/sci-biology/vienna-rna/ChangeLog
+++ b/sci-biology/vienna-rna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/vienna-rna
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.52 2014/08/29 15:05:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.53 2014/08/29 16:54:27 zlogene Exp $
+
+  29 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> -vienna-rna-1.8.5.ebuild,
+  vienna-rna-2.1.1.ebuild:
+  ppc stable wrt bug #520776; Drop old.
 
   29 Aug 2014; Sergey Popov <pinkbyte@gentoo.org> vienna-rna-2.1.1.ebuild:
   Stable on amd64 and x86, wrt bug #520776
diff --git a/sci-biology/vienna-rna/Manifest b/sci-biology/vienna-rna/Manifest
index 57157938f39a..73129560d7a0 100644
--- a/sci-biology/vienna-rna/Manifest
+++ b/sci-biology/vienna-rna/Manifest
@@ -14,20 +14,16 @@ AUX vienna-rna-2.1.1-bindir.patch 361 SHA256 cf5f393cb9ad1aba9e054d9ba7a0f876812
 AUX vienna-rna-2.1.1-impl-decl.patch 354 SHA256 9f9005092b060db501b51c37f215f9ca87da53720609ce971c3d9ad6bcf2ea39 SHA512 7c288b4889f11b5cc4e6db5b5db6dfcd70843aa135181e8d819ae86c90faed4a43e08f99b47f418caa23643642e68bf5e153f4d279f7566433af1c9093ec6e8b WHIRLPOOL 02ce683c58e4f5715ab75445d9efeb02c1c104a6faa25b19739dc43931f813d6c7637a6690026d18607da98f2f7a7185ffe3491c237d1f40dd09340dc44c651e
 AUX vienna-rna-2.1.1-prll.patch 885 SHA256 0438173aa9d336ae41d7024d66dd6b07c1bac3c812750198ef0113e6a8407dee SHA512 1b80636b43e1ce9ca54431358b45f2503ef3f49b8cd049b5ef501058e1771bda3628c88e63cc1bea9a32aff5a004ccef663b47dae385a5df6071793f292dff94 WHIRLPOOL 6a0661741d7aa0f0461c7dbc68b2967e10f380cf8c42c699fe7ae568e48441bc0e726c2c49942af1f9f2557725de1545718fa66fa336de00f84ea1660b984898
 AUX vienna-rna-2.1.1-setup.py 810 SHA256 035f9c8aff6b6bc575b089e48e79bffe7da093de499a1d88eb1785346025940a SHA512 57feac6d5701a25fcda01f93f506a422d4639595a7d0ef73575af88f283fabc3730a8ea3e116ccfd417b015611c813f08ff047c9e362eaa74d2ce275ae65f8b8 WHIRLPOOL 8d9eb802bb055e30992a9509c43638e5602d434c5237729d816833f3e10f858ead48fb228728c5842a9e09b678f85091fab32b976ca8db4cc023c4fad2382b85
-DIST ViennaRNA-1.8.5.tar.gz 1306792 SHA256 f4e2d94beaf77165e8321758e4ab0ad1c5d49879cefa12e48b07d09ed2d0ecf9 SHA512 3121bbeb476c1828f2238d32ab4fea724fd17d9108cb38ea76a73b64eda97a36689080faa6745a4cd369178239443eeb68621da0cd96beb55d2bd0b6cb0891de WHIRLPOOL e561f6e3506e85f54974d3bf9def910d404cdc94bb8e184933b90698a083c5c5e40510deec6486737081ca602b560b5409c79a21a517daa2b859c7430abc0fb6
 DIST ViennaRNA-2.1.1.tar.gz 5327215 SHA256 bfea440dface4562d5dfb0a1c83bf226c0697bb18aacae0dc84c555282cedebe SHA512 b272afa1146543b290db605debab2badbdbf04fcdfd6130ed3b10604255476b3472b184e9af8a0bbeaa0def266f1a167c125d6cfd02aa3f7ae463697dc5226d5 WHIRLPOOL 48b6bcd96b2ff2523ba00335cac7fe141b6ed7f037a3192e6c174297266d0f967492a67afaaa6c05f8b28fdc0eb7c9b72d0d9daba286b5dd3dca4456cc058b1f
-EBUILD vienna-rna-1.8.5.ebuild 2894 SHA256 2fa8a73b0119ae259a50a467e7ad219e5b43940a241fedbc2d1b60f679cce4ef SHA512 7240d39a6aca463c381c8ffbf50273cc01822d2bb8d8654a044b462d4f14efba175b29bbf7bafc1d0fd7a2dcf4bac5ac8d6e89b71f80586cb837186f6025e97c WHIRLPOOL 363bb606d1f3f436a77deaf7a42fb6797b67937770f7f58d744450216fdcf63ce6aa12ff748a30d7ace3ce499c8fbf3ac15f8fc1f721568396f2034014588043
-EBUILD vienna-rna-2.1.1.ebuild 2770 SHA256 e1ad63d2ac0fd2cfc0b6fd4aa7769d85ca1d52bcd7a5dc05d0873d8ee2fc1cca SHA512 1b3726af4aec5f9b6250cd26604a94cc6d7ad0def2a5204344af470650e8bd6e6e47b4fca9de04cf63ef68b8a3445cdb57e30a1ffae26a495a1ef7af5335151c WHIRLPOOL 0006014eb4617c70b8b93ee097951a003823e535f56fc99744b108f001eac50d29045cadf8034634a22d114db12d5b67cbff109692c317c1963cafb5d4e8cf47
-MISC ChangeLog 8091 SHA256 68677295c899c6a6a45c65bcbb6963bde8b84621e2b503ee2bbd5914247f2985 SHA512 fc06c442acc8f32b00a059b8c67a36aa68c70de29c22a0b23e1d6ec1d770df1a236d5d6f877d8b7ab4d2920859b67a4b98c85d4a76e47e9fc4077ac8dc0e4dda WHIRLPOOL 0aeb3bc344ed518222136b77d43dd29400e83c6722aa160b577d9b88a7c2ea1ba850f7231e2e78eb7c29db13836ef017aaf06a24abbcc557583c581c0700d579
+EBUILD vienna-rna-2.1.1.ebuild 2768 SHA256 f3d39910625307313d661cdaf254919a9537b801c7faea087f7aa74287d0e96e SHA512 f63e55c20b2f358176b2ef8544f721c2f239610c0c409d608fe8fa8024437d54145fcc3e7aa40a2ab2a98281d2249ec9d5e3a6fde6b6c38038a0c95ff513145e WHIRLPOOL 67bf0a1f21bf3628ff805279eee4641bcf053cee6155906a02f4a0d8be30f5eb109861e16a267e6921829a347f4ac764967a2de682e7c31868fe05585471f109
+MISC ChangeLog 8234 SHA256 bf59cd253d82de9ef941dc911a4e6da1d2c4dfb081260e199b259d7ef1ec67e6 SHA512 6eba0f2f3d644072ff87b08f9d418c78eaec9e0026474105f0572e3d81d09b43f71c52e7a4b41facbc450ec9985d7b770bd47d9eef231609472df49b18627ad9 WHIRLPOOL fb736139c56e3a54d634673af8bb690d24fcb1c46e1592052f1e3d8a71b94fe85020774eba00a84358110a52c12683e05c6b979779630f06972c33c5ab9e458d
 MISC metadata.xml 1214 SHA256 7b2e9d412019304d74ae0175f40767d78b1668ff0173bb07618e23478337b165 SHA512 0c86849ca974997da0f4ef044a07d1eb963a02889b2a7cbf4e0b2e5dac09a6da58eaf1e492e387f0c059f1c8517f27a122a16c4fd8e92b54cf3a1e3ff6707def WHIRLPOOL c96b3021b444150a580ff9923d37a6e50ba2059d5e4bf8d812a60ff7216c338e974f94d2525d494487bbcd6c83f78580afde89a58ce85d7b0dfab7cad7502ea3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUAJaqAAoJECo/aRed9267RwkIAMrzFJZ6zSxcM9/4Jw5cY+ms
-GSUMbiQ3+o8vndZdYA4SSZ75dg4NfsXJxtb4/5ZCTD6ZUdbLb5ZE0+5ri0RmW0ft
-9FbOBX1lwB8b6d6AAVtI+dszsoUE24E6ZBl20GYtU4uDMDNyKYVhz9MPXba33fk1
-sAXPifxiOHEgNZC3SWxGrpKgTlW4/Ql2gfhuX+Cobbbn85uCfqa7dOlwkuB8Cxis
-3UvsvKB1uXw5tx8xvgq1HI3cfemK5mOxNIzUzSG69Y/ETjbue7wzv6zaLUOgohnc
-mRiW6ppuax3f9DiG+8c9drM3MWkFVULZ5kH7k6l94fPVCHN7spuoJxYcJC00T2A=
-=G3OE
+iJwEAQEIAAYFAlQAsAcACgkQG9wOWsQutdZkmAP8DfE7jNssayf7PEn8+0WSlP9u
+NyCItIBVLa9oexMg2aDzUZkyLIC8kw1q3uCaDsovS8q1+Ni2Ll7lOXVwRZJkWCEz
+RUFSKWximoCTQhVue3EobiFcpFVPEfSzGR5cdoD9wk5tIX3lhTmdy+GDO99/Asjy
+v3wy2BNtxzzGFunlDa4=
+=iNse
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/vienna-rna/vienna-rna-1.8.5.ebuild b/sci-biology/vienna-rna/vienna-rna-1.8.5.ebuild
deleted file mode 100644
index da45a4cf3cf9..000000000000
--- a/sci-biology/vienna-rna/vienna-rna-1.8.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.8.5.ebuild,v 1.11 2014/01/06 15:32:47 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit autotools distutils multilib perl-module toolchain-funcs
-
-DESCRIPTION="RNA secondary structure prediction and comparison"
-HOMEPAGE="http://www.tbi.univie.ac.at/~ivo/RNA/"
-SRC_URI="http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-${PV}.tar.gz"
-
-LICENSE="vienna-rna"
-SLOT="0"
-IUSE="python static-libs"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-	dev-lang/perl
-	media-libs/gd
-	python? ( dev-lang/swig )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ViennaRNA-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.5-c-fixes.patch
-	"${FILESDIR}"/${PN}-1.7.2-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-1.8.3-gcc4.3.patch
-	"${FILESDIR}"/${PN}-1.8.3-disable-gd.patch
-	"${FILESDIR}"/${PN}-1.8.4-jobserver-fix.patch
-	"${FILESDIR}"/${PN}-1.8.4-bindir.patch
-	"${FILESDIR}"/${PN}-1.8.4-overflows.patch
-	"${FILESDIR}"/${PN}-1.8.4-implicits.patch
-)
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-	sed -i 's/ getline/ v_getline/' Readseq/ureadseq.c || die
-	sed -i 's/@PerlCmd@ Makefile.PL/& INSTALLDIRS=vendor/' Perl/Makefile.am || die
-
-	eautoreconf
-	cd RNAforester && eautoreconf
-	use python && cp "${FILESDIR}"/${P}-setup.py "${S}"/setup.py
-}
-
-src_configure() {
-	econf --with-cluster
-	sed -e "s:LIBDIR = /usr/lib:LIBDIR = ${D}/usr/$(get_libdir):" \
-		-e "s:INCDIR = /usr/include:INCDIR = ${D}/usr/include:" \
-		-i RNAforester/g2-0.70/Makefile \
-			|| die "Failed patching RNAForester build system."
-	sed -e "s:CC=cc:CC=$(tc-getCC):" -e "s:CFLAGS=:CFLAGS=${CFLAGS}:" \
-		-i Readseq/Makefile || die "Failed patching readseq Makefile."
-}
-
-src_compile() {
-	emake clean || die
-	emake || die
-	emake -C Readseq || die "Failed to compile readseq."
-	# TODO: Add (optional?) support for the NCBI toolkit.
-	if use python; then
-		pushd Perl > /dev/null
-			mv RNA_wrap.c{,-perl}
-			swig -python RNA.i
-		popd > /dev/null
-		distutils_src_compile
-		mv Perl/RNA_wrap.c{-perl,}
-	fi
-}
-
-src_test() {
-	cd "${S}"/Perl && emake check || die "Perl tests failed"
-	cd "${S}"/Readseq && emake test || die "Readseq tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
-	newbin Readseq/readseq readseq-vienna || die
-	dodoc Readseq/Readseq.help || die
-	newdoc Readseq/Readme README.readseq || die
-	newdoc Readseq/Formats Formats.readseq || die
-
-	# remove perlocal.pod to avoid file collisions (see #240358)
-	fixlocalpod || die "Failed to remove perlocal.pod"
-	use python && distutils_src_install
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild b/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
index 968ef262fd09..39594eb0429a 100644
--- a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild,v 1.5 2014/08/29 15:05:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild,v 1.6 2014/08/29 16:54:27 zlogene Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="vienna-rna"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc openmp python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"