Version bump.

(Portage version: 2.2_pre5)

3 files changed, 80 insertions, 15 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 3361e0252355..3f4d87972e54 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.134 2008/03/08 12:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.135 2008/04/02 03:08:37 vapier Exp $
+
+*libtool-2.2.2 (02 Apr 2008)
+
+  02 Apr 2008; Mike Frysinger <vapier@gentoo.org> +libtool-2.2.2.ebuild,
+  libtool-9999.ebuild:
+  Version bump.
 
 *libtool-2.2 (08 Mar 2008)
 
diff --git a/sys-devel/libtool/libtool-2.2.2.ebuild b/sys-devel/libtool/libtool-2.2.2.ebuild
new file mode 100644
index 000000000000..bc16a03d71df
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.2.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.2.ebuild,v 1.1 2008/04/02 03:08:37 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use vanilla && return 0
+
+	epunt_cxx
+	cd libltdl/m4
+	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	local x
+	for x in libtool libtoolize ; do
+		help2man ${x} > ${x}.1
+		doman ${x}.1 || die
+	done
+
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+	done
+}
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 4fe2689fb652..85e7daa591e2 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,10 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.1 2007/12/31 20:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.2 2008/04/02 03:08:37 vapier Exp $
 
-ECVS_SERVER="cvs.sv.gnu.org:/sources/libtool"
-ECVS_MODULE="libtool"
-inherit cvs
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	ECVS_SERVER="cvs.sv.gnu.org:/sources/libtool"
+	ECVS_MODULE="libtool"
+	inherit cvs
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+fi
 
 DESCRIPTION="A shared library tool for developers"
 HOMEPAGE="http://www.gnu.org/software/libtool/"
@@ -12,7 +18,7 @@ HOMEPAGE="http://www.gnu.org/software/libtool/"
 LICENSE="GPL-2"
 SLOT="1.5"
 KEYWORDS=""
-IUSE=""
+IUSE="vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.60
@@ -23,9 +29,20 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${ECVS_MODULE}
 
 src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	./bootstrap || die
+	if [[ ${PV} == "9999" ]] ; then
+		cvs_src_unpack
+		cd "${S}"
+		./bootstrap || die
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
+
+	use vanilla && return 0
+
+	epunt_cxx
+	cd libltdl/m4
+	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
 }
 
 src_install() {
@@ -39,10 +56,6 @@ src_install() {
 	done
 
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
-		rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
-	done
-	cd "${D}"/usr/share/libtool/libltdl
-	for x in config.guess config.sub ; do
-		rm -f ${x} ; ln -sfn ../${x} ${x}
+		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
 	done
 }