Version bump.

Package-Manager: portage-2.2_pre5

4 files changed, 87 insertions, 20 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/Manifest b/sys-devel/libtool/Manifest
index adb64e136aae..baffa4033389 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -17,18 +17,20 @@ AUX ltconfig-uclibc.patch 1167 RMD160 67684826cd75f91660ad0d51ccf9fb0dc250dda9 S
 DIST libtool-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f
 DIST libtool-1.5.24.tar.gz 2919557 RMD160 e682fe6570c71d93ad65e0c6c77cb6558846f27d SHA1 b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db SHA256 1e54016a76e9704f11eccf9bb73e2faa0699f002b00b6630df82b8882ff2e5b2
 DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09
+DIST libtool-2.2.2.tar.bz2 1447913 RMD160 0c8848f3cb0da548629c36c5f69dfd44a71c4250 SHA1 a7ce88fc92411380081fd47d3197e7d539755365 SHA256 906dcb99ac02eb921b77881b2778f60188219b74fd01ae85f56a23da2da9742b
 DIST libtool-2.2.tar.bz2 1446665 RMD160 b04729ea15f08786e42c1557b9c332793f245d38 SHA1 c257134336130d741182c8443683d6f89b391801 SHA256 cead9df5ba15c85c5e553e2f8e4273025c0e0ee8af9558f205b3c9b0861e602d
 EBUILD libtool-1.3.5.ebuild 1157 RMD160 1655d7000af5869115b006ac1095195a140433d7 SHA1 4c93b4520b02380aa6ce153dbb6f5b6ee628073e SHA256 3479e6bf816003ff706850f6720a3f20f30a02b8db670624044970bae313944d
 EBUILD libtool-1.5.24.ebuild 2768 RMD160 e7c5d56039c019d45d73b8567fc955b49c03ceca SHA1 c059a3ecfbf61cfa5094afef324692d8a8071983 SHA256 162c21d6ebf7c138ef12718eef25f78c205efe5bfb4bb4ea26d3871e37a1d9ca
 EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d
+EBUILD libtool-2.2.2.ebuild 1186 RMD160 5496e4abac055746fd7450b3a19b544b7a75f7a0 SHA1 3709e56d226f2f86d807bbb56f84054bd213712d SHA256 400a6ed5c08327560c4bc44b9ca60669dc5eedb0d50d47171b67cf5d37ada0d3
 EBUILD libtool-2.2.ebuild 1184 RMD160 7615b946064816072542716561103a426c16d931 SHA1 5d04b67ed32d403bccd21299276bfddc118b4f01 SHA256 32925e767a3ec309fa515470c327861a2a25f1bbdca3515523b52f82c1806679
-EBUILD libtool-9999.ebuild 1140 RMD160 15796fe820cc91b7b905292fe1c6dea14da089b9 SHA1 b4f378f84605ce41cd65f20910b5ce23f3386edd SHA256 903b3267d2994ad7a917c34f860fe2c4f572015176f7c33e06d1b76e60dc0d7e
-MISC ChangeLog 20420 RMD160 0e33171b5703669f0a41d1fb753e942d826a7bff SHA1 a2bc724230f7624ead20bc10d75e589f532ae0d6 SHA256 d8faecb95e100da8d3a310a99644815975db95e1fa0425006c1fc7d4271c6230
+EBUILD libtool-9999.ebuild 1336 RMD160 3bc7d744987752c512ec6ad248905519574113a1 SHA1 48e00f0b8c9ddee8f660a4d0f06b4942565e1674 SHA256 0916b94107c4de2e6c54ac4ce4b3f7521d37fd3e988c0922840c591976aecc0c
+MISC ChangeLog 20563 RMD160 0a8970d46cada9a45b31027f04783a4e2f775120 SHA1 13af6ad0e5ff22f4af10aa41598c17cd0e4db8a0 SHA256 ab7df4f2faf20b8f5ec0e9beb48fc6dc20bfbb17bf3340cbdedacc00b72d6f31
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH2mAkj9hvisErhMIRAtryAJ9n2La7e6qH9g6zrhH7K5DrJ0XlyACg4Dnl
-M/rxk8miv5YWE1ejFgDXzz4=
-=Lmdb
+iD8DBQFH8vmpj9hvisErhMIRAlzgAKC4py9W+uMaBIlF4QDEr8SHHiFvcACfZMjc
+hBx6D1rbbqRiC4lUWxkSfcE=
+=cx9T
 -----END PGP SIGNATURE-----
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
 }