ppc stable wrt bug #520776; Drop old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

3 files changed, 7 insertions, 108 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/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} )"