4 files changed, 10 insertions, 52 deletions
diff --git a/dev-libs/gnulib/ChangeLog b/dev-libs/gnulib/ChangeLog
index 872f1185f661..88f8c3d53c8a 100644
--- a/dev-libs/gnulib/ChangeLog
+++ b/dev-libs/gnulib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gnulib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.2 2007/10/27 17:25:13 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.3 2007/10/28 21:03:33 vapier Exp $
+
+  28 Oct 2007; Mike Frysinger <vapier@gentoo.org> gnulib-9999.ebuild,
+  -gnulib-9999-r1.ebuild:
+  You dont rev-bump live ebuilds as that is the entire point of them.
 
 *gnulib-9999-r1 (27 Oct 2007)
 
diff --git a/dev-libs/gnulib/files/digest-gnulib-9999-r1 b/dev-libs/gnulib/files/digest-gnulib-9999-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-libs/gnulib/files/digest-gnulib-9999-r1
+++ /dev/null
diff --git a/dev-libs/gnulib/gnulib-9999-r1.ebuild b/dev-libs/gnulib/gnulib-9999-r1.ebuild
deleted file mode 100644
index 6dec8cb45cda..000000000000
--- a/dev-libs/gnulib/gnulib-9999-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-9999-r1.ebuild,v 1.1 2007/10/27 17:25:13 drizzt Exp $
-
-EGIT_REPO_URI="git://git.savannah.gnu.org/gnulib.git"
-
-inherit eutils git
-
-DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level."
-HOMEPAGE="http://www.gnu.org/software/gnulib"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}
-
-src_compile() {
-	emake -C doc info html || die "emake failed"
-}
-
-src_install() {
-	dodoc README COPYING ChangeLog
-	dohtml doc/gnulib.html
-	doinfo doc/gnulib.info
-
-	insinto /usr/share/${PN}
-	doins -r lib
-	doins -r m4
-	doins -r modules
-
-	# remove CVS dirs
-	#find "${D}" -name CVS -type d -print0 | xargs -0 rm -r
-
-	# install the real script
-	exeinto /usr/share/${PN}
-	doexe gnulib-tool
-
-	# create and install the wrapper
-	dosym /usr/share/${PN}/gnulib-tool /usr/bin/gnulib-tool
-}
diff --git a/dev-libs/gnulib/gnulib-9999.ebuild b/dev-libs/gnulib/gnulib-9999.ebuild
index 6e068988e249..fea5da7e1fc4 100644
--- a/dev-libs/gnulib/gnulib-9999.ebuild
+++ b/dev-libs/gnulib/gnulib-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-9999.ebuild,v 1.1 2007/05/08 16:14:50 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-9999.ebuild,v 1.2 2007/10/28 21:03:33 vapier Exp $
 
-ECVS_SERVER="cvs.savannah.gnu.org:/cvsroot/gnulib"
-ECVS_MODULE="gnulib"
+EGIT_REPO_URI="git://git.savannah.gnu.org/gnulib.git"
 
-inherit eutils cvs
+inherit eutils git
 
 DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level."
 HOMEPAGE="http://www.gnu.org/software/gnulib"
@@ -35,12 +34,12 @@ src_install() {
 	doins -r modules
 
 	# remove CVS dirs
-	find "${D}" -name CVS -type d -print0 | xargs -0 rm -r
+	#find "${D}" -name CVS -type d -print0 | xargs -0 rm -r
 
 	# install the real script
 	exeinto /usr/share/${PN}
 	doexe gnulib-tool
 
 	# create and install the wrapper
-	make_wrapper gnulib-tool ./gnulib-tool /usr/share/${PN}
+	dosym /usr/share/${PN}/gnulib-tool /usr/bin/gnulib-tool
 }