Pulling until I can debug the ebuild.

Package-Manager: portage-2.1.3.9

4 files changed, 9 insertions, 104 deletions

diff --git a/sci-biology/meme/ChangeLog b/sci-biology/meme/ChangeLog
index 227533837e05..28e5a6febb17 100644
--- a/sci-biology/meme/ChangeLog
+++ b/sci-biology/meme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/meme
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/meme/ChangeLog,v 1.2 2007/09/17 02:41:56 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/meme/ChangeLog,v 1.3 2007/09/17 06:00:16 je_fro Exp $
+
+  17 Sep 2007; <jeff@gentoo.org> -meme-3.5.4-r1.ebuild:
+  Whoa...this version worked in my overlay. Pulling until I figure out what
+  went wrong.
 
   17 Sep 2007; <jeff@gentoo.org> +files/meme-3.5.4-patch1.patch,
   +files/meme-3.5.4-patch2.patch, meme-3.5.4.ebuild:
diff --git a/sci-biology/meme/Manifest b/sci-biology/meme/Manifest
index a5815f70a1bc..68d1c1b9e698 100644
--- a/sci-biology/meme/Manifest
+++ b/sci-biology/meme/Manifest
@@ -11,18 +11,14 @@ MD5 7b0765e479af87218368f29ae7041fb8 files/meme-3.5.4-patch2.patch 2496
 RMD160 1d492e01a9e06aa0564e2c15235eb49f28f4d2b7 files/meme-3.5.4-patch2.patch 2496
 SHA256 2571bff727505cddfe59aefa931f2b2436ed2a2daf1e35b5a1d6c6014a753a21 files/meme-3.5.4-patch2.patch 2496
 DIST meme_3.5.4.tar.gz 1045501 RMD160 063a804c18f07349e95f4aba2a3c97cb025ed2a8 SHA1 d780dba0b900f840a599cf69cfeba4eefd4856b4 SHA256 b753ee276bc5eafeab8ff310e6d938977da11f466d26cfd3ae9c0f0a7a91de86
-EBUILD meme-3.5.4-r1.ebuild 2778 RMD160 db6f29dd51ecf5bac56f064c75d788b36f56a83a SHA1 cebab3898c38b9396b2cf591f8ac49ff6ddc106b SHA256 05bd30158cc5b79c2de4f2e97c523f9cff48131965c992f24137bb2e36e006e0
-MD5 c71dbb29f70e8dfa3bc3ab607c33f226 meme-3.5.4-r1.ebuild 2778
-RMD160 db6f29dd51ecf5bac56f064c75d788b36f56a83a meme-3.5.4-r1.ebuild 2778
-SHA256 05bd30158cc5b79c2de4f2e97c523f9cff48131965c992f24137bb2e36e006e0 meme-3.5.4-r1.ebuild 2778
 EBUILD meme-3.5.4.ebuild 2522 RMD160 91306d472533051cbe7ccb08594a0c527be86d5d SHA1 ca5cc1df4a8fadd2456423231cba5e2168a4eef3 SHA256 1a2e88d01b7183d530d1796b144fc0e4de6f3f0b0faa138e5552ba9a65f9c188
 MD5 f2a6ac226bbcea335120135f8a490df8 meme-3.5.4.ebuild 2522
 RMD160 91306d472533051cbe7ccb08594a0c527be86d5d meme-3.5.4.ebuild 2522
 SHA256 1a2e88d01b7183d530d1796b144fc0e4de6f3f0b0faa138e5552ba9a65f9c188 meme-3.5.4.ebuild 2522
-MISC ChangeLog 566 RMD160 74f3916e717ce84e593217bd53c0b99eb10a14c9 SHA1 799df7e3146993c26d897dd8224f302fd0970fcc SHA256 909bde96179b1488d0bcd854d9cd2d3a37a6e55c6c9756623fae0e77e8562dff
-MD5 233146864b46de91b59ff4a506da21d7 ChangeLog 566
-RMD160 74f3916e717ce84e593217bd53c0b99eb10a14c9 ChangeLog 566
-SHA256 909bde96179b1488d0bcd854d9cd2d3a37a6e55c6c9756623fae0e77e8562dff ChangeLog 566
+MISC ChangeLog 713 RMD160 bf5b78869b6c9f4da082482075db25b10387b00b SHA1 20c2c4dde29b952b7a06787e5d8f291c6958a590 SHA256 986e970eb962a95df3fcc1b2c34d7a7a9808477962b5473707fa1ffdf8c6ad3b
+MD5 de2cfd75223564ceb4ffb9888d2fa1a6 ChangeLog 713
+RMD160 bf5b78869b6c9f4da082482075db25b10387b00b ChangeLog 713
+SHA256 986e970eb962a95df3fcc1b2c34d7a7a9808477962b5473707fa1ffdf8c6ad3b ChangeLog 713
 MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
 MD5 aec0225cc3c4bc9490275e897849b449 metadata.xml 165
 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 metadata.xml 165
@@ -30,6 +26,3 @@ SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132 metadata
 MD5 1eaad7de1310f43b70c0414c120687f6 files/digest-meme-3.5.4 235
 RMD160 ed97244306a01084ca6973c50c49726724212632 files/digest-meme-3.5.4 235
 SHA256 98b3e51f5544aa86ee4cfed70da0b3d9068cd677c3744e750b4f0bee2be5be8b files/digest-meme-3.5.4 235
-MD5 1eaad7de1310f43b70c0414c120687f6 files/digest-meme-3.5.4-r1 235
-RMD160 ed97244306a01084ca6973c50c49726724212632 files/digest-meme-3.5.4-r1 235
-SHA256 98b3e51f5544aa86ee4cfed70da0b3d9068cd677c3744e750b4f0bee2be5be8b files/digest-meme-3.5.4-r1 235
diff --git a/sci-biology/meme/files/digest-meme-3.5.4-r1 b/sci-biology/meme/files/digest-meme-3.5.4-r1
deleted file mode 100644
index 01fad3060d81..000000000000
--- a/sci-biology/meme/files/digest-meme-3.5.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9a8b3d21c6094616cc7b9b424352c697 meme_3.5.4.tar.gz 1045501
-RMD160 063a804c18f07349e95f4aba2a3c97cb025ed2a8 meme_3.5.4.tar.gz 1045501
-SHA256 b753ee276bc5eafeab8ff310e6d938977da11f466d26cfd3ae9c0f0a7a91de86 meme_3.5.4.tar.gz 1045501
diff --git a/sci-biology/meme/meme-3.5.4-r1.ebuild b/sci-biology/meme/meme-3.5.4-r1.ebuild
deleted file mode 100644
index 1932bd7952c2..000000000000
--- a/sci-biology/meme/meme-3.5.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/meme/meme-3.5.4-r1.ebuild,v 1.1 2007/09/17 02:41:56 je_fro Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The MEME/MAST system - Motif discovery and search"
-HOMEPAGE="http://meme.sdsc.edu/meme"
-SRC_URI="http://meme.nbcr.net/downloads/${PN}_${PV}.tar.gz"
-LICENSE="meme"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-# Other possible USE flags include "debug", "client", "server", "web",
-# "queue". Other variables must be set at compile time, but only when
-# the Web server is built. Right now, Web server and client are disabled.
-IUSE="mpi"
-
-# Works only with LAM-MPI.
-DEPEND=">=dev-lang/perl-5.6.1
-	mpi? ( sys-cluster/lam-mpi )"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-	epatch "${FILESDIR}/${P}-patch1.patch"
-	epatch "${FILESDIR}/${P}-patch2.patch"
-	eautoreconf
-}
-
-src_compile() {
-	local EXTRA_CONF
-	# Build system is too bugy to make the programs use standard locations.
-	# Put everything in "/opt" instead.
-	EXTRA_CONF="${EXTRA_CONF} --prefix=/opt/${PN}"
-	EXTRA_CONF="${EXTRA_CONF} --with-logs=/var/log/${PN}"
-	# Connect hyperlinks to official Web site.
-	EXTRA_CONF="${EXTRA_CONF} --with-url=http://meme.nbcr.net/meme"
-	# Disable Web server, client and Web site.
-	EXTRA_CONF="${EXTRA_CONF} --disable-server --disable-client --disable-web"
-	# Parallel implementation
-	if ! use mpi; then
-		EXTRA_CONF="${EXTRA_CONF} --enable-serial"
-	fi
-
-	./configure ${EXTRA_CONF} || die "Configure failed."
-	CC="$(tc-getCC)" ac_cc_opt="${CFLAGS}"  make -e || die "Make failed."
-
-# Install parallel files only on x86, otherwise the install fails with the error:
-# i386 architecture of input file `mp.o' is incompatible with i386:x86-64 output
-	if [[ "${ARCH}" == "x86" ]] ; then
-		if use mpi; then
-			cd src/parallel
-			make || die "Parallel make failed."
-		fi
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Failed to install program files."
-	exeinto "/opt/${PN}/bin"
-	if [[ "${ARCH}" == "x86" ]] ; then
-		if use mpi; then
-			doexe "${S}/src/parallel/${PN}_p" || \
-			die "Failed to install parallel MEME implementation."
-		fi
-	fi
-	keepdir "/var/log/${PN}"
-	fperms 777 "/var/log/${PN}"
-}
-
-pkg_postinst() {
-	echo
-	einfo 'Prior to using MEME/MAST, you should source "/opt/meme/etc/meme.sh"'
-	einfo '(or "/opt/meme/etc/meme.csh" if you use a csh-style shell). To do'
-	einfo 'this automatically with bash, add the following statement to your'
-	einfo '"~/.bashrc" file (without the quotes): "source /opt/meme/etc/meme.sh".'
-	echo
-	einfo 'Log files are produced in the "/var/log/meme" directory.'
-	echo
-}
-
-src_test() {
-	make test || die "Regression tests failed."
-}