sci-biology/readseq: Drop old; Resolve file collision sci-biology/meme, #455010

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

5 files changed, 16 insertions, 68 deletions

diff --git a/sci-biology/readseq/ChangeLog b/sci-biology/readseq/ChangeLog
index 5489094e21cf..748097ff38db 100644
--- a/sci-biology/readseq/ChangeLog
+++ b/sci-biology/readseq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/readseq
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/ChangeLog,v 1.9 2010/11/28 08:56:48 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/ChangeLog,v 1.10 2013/02/01 14:55:17 jlec Exp $
+
+  01 Feb 2013; Justin Lecher <jlec@gentoo.org> -readseq-19930201.ebuild,
+  -readseq-19930201-r1.ebuild, readseq-20080420.ebuild, metadata.xml:
+  Drop old; Resolve file collision sci-biology/meme, #455010
 
 *readseq-19930201-r1 (28 Nov 2010)
 
diff --git a/sci-biology/readseq/metadata.xml b/sci-biology/readseq/metadata.xml
index 829014583306..b198f044f3f5 100644
--- a/sci-biology/readseq/metadata.xml
+++ b/sci-biology/readseq/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<longdescription>
+  <herd>sci-biology</herd>
+  <longdescription>
 		Reads and writes nucleic/protein sequences in various formats. Data
 		files may have multiple sequences.
 	</longdescription>
diff --git a/sci-biology/readseq/readseq-19930201-r1.ebuild b/sci-biology/readseq/readseq-19930201-r1.ebuild
deleted file mode 100644
index 89add3a9535b..000000000000
--- a/sci-biology/readseq/readseq-19930201-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-19930201-r1.ebuild,v 1.1 2010/11/28 08:56:48 jlec Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Reads and writes nucleic/protein sequences in various formats."
-SRC_URI="mirror://debian/pool/main/r/readseq/readseq_1.orig.tar.gz"
-HOMEPAGE="http://iubio.bio.indiana.edu/soft/molbio/readseq/"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/readseq-1"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-getline.patch \
-		"${FILESDIR}"/${PV}-buffer.patch \
-		"${FILESDIR}"/${PV}-impl-dec.patch \
-		"${FILESDIR}"/${PV}-ldflags.patch
-}
-
-src_compile() {
-	emake -e \
-		CC=$(tc-getCC) \
-		build || die
-}
-
-src_install() {
-	dobin readseq || die
-	dodoc Readme Readseq.help || die
-}
diff --git a/sci-biology/readseq/readseq-19930201.ebuild b/sci-biology/readseq/readseq-19930201.ebuild
deleted file mode 100644
index 45251beb271b..000000000000
--- a/sci-biology/readseq/readseq-19930201.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-19930201.ebuild,v 1.4 2006/08/17 22:20:51 weeve Exp $
-
-DESCRIPTION="Reads and writes nucleic/protein sequences in various formats."
-SRC_URI="mirror://debian/pool/main/r/readseq/readseq_1.orig.tar.gz"
-HOMEPAGE="http://iubio.bio.indiana.edu/soft/molbio/readseq/"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~sparc x86"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/readseq-1"
-
-src_compile() {
-	make -e || die
-}
-
-src_install() {
-	dobin readseq || die
-	dodoc Readme Readseq.help || die
-}
diff --git a/sci-biology/readseq/readseq-20080420.ebuild b/sci-biology/readseq/readseq-20080420.ebuild
index d91ec3bd4521..173fc172da18 100644
--- a/sci-biology/readseq/readseq-20080420.ebuild
+++ b/sci-biology/readseq/readseq-20080420.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-20080420.ebuild,v 1.3 2008/07/16 17:00:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/readseq/readseq-20080420.ebuild,v 1.4 2013/02/01 14:55:17 jlec Exp $
 
 EAPI=1
 
@@ -14,13 +14,17 @@ HOMEPAGE="http://iubio.bio.indiana.edu/soft/molbio/readseq/"
 # Renamed to the date of the modification and mirrored
 SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/${MY_P}.zip"
 #SRC_URI="mirror://gentoo/${MY_P}.zip"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-COMMON="dev-java/xerces:2
-	dev-java/jaxp"
+
+COMMON="
+	dev-java/jaxp
+	dev-java/xerces:2"
 RDEPEND="${COMMON}
+	!=sci-biology/meme-4.8.1
 	>=virtual/jre-1.4"
 DEPEND="${COMMON}
 	>=virtual/jdk-1.4