Add stow-1.3.3-r1 with fixed bug 246264 and new 2.1.1 version. Old version is removed

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

6 files changed, 86 insertions, 21 deletions

diff --git a/app-admin/stow/ChangeLog b/app-admin/stow/ChangeLog
index 44af0297e440..4cc4efade5e9 100644
--- a/app-admin/stow/ChangeLog
+++ b/app-admin/stow/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/stow
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/ChangeLog,v 1.16 2011/11/01 20:57:30 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/ChangeLog,v 1.17 2011/12/07 19:04:40 maksbotan Exp $
+
+*stow-2.1.1 (07 Dec 2011)
+*stow-1.3.3-r1 (07 Dec 2011)
+
+  07 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> +files/99stow,
+  -stow-1.3.3.ebuild, +stow-1.3.3-r1.ebuild, +stow-2.1.1.ebuild:
+  Add stow-1.3.3-r1 with fixed bug 246264 and new 2.1.1 version. Old version is
+  removed
 
   01 Nov 2011; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
   Add Erik Falor <ewfalor@gmail.com> as proxy-maintainer
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index e950bb329b14..e356354e4445 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,4 +1,7 @@
+AUX 99stow 38 RMD160 dbd2b9f7f4506df79f9170f408e5670ea1e7b3cd SHA1 92cca54079a00e8f85c40e0aedb7d27bf61979a6 SHA256 96dfca272df0c4919bf76c2eb4e147c624c07fecac9cf5dd074d1098dbd64e92
 DIST stow-1.3.3.tar.gz 139417 RMD160 ab192c3c709c11e0a7d39ec8de268ee6be3265f3 SHA1 570c501f8663feb26360db25df0be342278b7b99 SHA256 0cdc7fb7861e83785edd2de127268f8a72ed9ae524ddc4beca236cfd63d1f8b0
-EBUILD stow-1.3.3.ebuild 577 RMD160 1888d5f08d0ec1d978a5359f771304d17271afef SHA1 8c797c38d054f1ba8e1c393d97d76f8c9dbec207 SHA256 d03aae5bf15965a89c0e88d31bbd8711c260216f3c522b9d224eace5c526e0cd
-MISC ChangeLog 1440 RMD160 e21d2b80ab02fc858c9bc42df207020469af8792 SHA1 7549905001cb6f358c85c144715af0a887bef756 SHA256 267322a8ccc33643d78137a7153a07b2f06ba8f4c873fdc7d247b56baa2403d2
+DIST stow-2.1.1.tar.gz 458329 RMD160 1665e6f24b1c1e926e5afe8c80c65f22055dd739 SHA1 9db6f3ad6a181509db3f599adf52dbfaeafe210f SHA256 d88e1b022383ea58147f05587561b3052cadd6dc369f806c16492c159cc06c8e
+EBUILD stow-1.3.3-r1.ebuild 1106 RMD160 09c8d50ec0fe16f445f62cd968e425eadc14ed10 SHA1 fd046c0267ce8c753bc818c20b9733113525c46b SHA256 ee56bd631e3a435fc3412e4e03d62ccf6960e7153d3a8fcf107d927c824be088
+EBUILD stow-2.1.1.ebuild 1113 RMD160 f90c2f36bcd5c3ddd8d3ec316662958b31401549 SHA1 6adc151f24e3d923437cfc10b1a9caff4aca37f4 SHA256 cfe16a19141e309e301f22743a87572a702a145d1919a57e4866291a2e3a9793
+MISC ChangeLog 1719 RMD160 d5d3673fea3a9725aa4ff1f2072c1be3fc33b928 SHA1 70f65a756907136062809ff7f161c1c831b0cf0f SHA256 7d54178afb5ac592e8c06acc7aeef2cead9451de162dba9ceeaedb7cab7845ee
 MISC metadata.xml 357 RMD160 01ebb6d02b966b897649fc3deee2a19e53ad68b5 SHA1 cb002836522c104908fd0ae2bea736f290101c63 SHA256 f184706523ab6694e206cee9ba1ec855669b31ea5ff5b1e6a5b81d874cc58206
diff --git a/app-admin/stow/files/99stow b/app-admin/stow/files/99stow
new file mode 100644
index 000000000000..2edcda2d8519
--- /dev/null
+++ b/app-admin/stow/files/99stow
@@ -0,0 +1,2 @@
+LDPATH=/var/lib/lib
+PATH=/var/lib/bin
diff --git a/app-admin/stow/stow-1.3.3-r1.ebuild b/app-admin/stow/stow-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..fa4f680c4fc9
--- /dev/null
+++ b/app-admin/stow/stow-1.3.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-1.3.3-r1.ebuild,v 1.1 2011/12/07 19:04:39 maksbotan Exp $
+
+DESCRIPTION="Manage installation of software in /var/lib/"
+HOMEPAGE="http://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# create new STOWDIR
+	dodir /var/lib/stow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99stow || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/stow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264 for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/stow/bin."
+}
diff --git a/app-admin/stow/stow-1.3.3.ebuild b/app-admin/stow/stow-1.3.3.ebuild
deleted file mode 100644
index 0ea08871be9d..000000000000
--- a/app-admin/stow/stow-1.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-1.3.3.ebuild,v 1.27 2010/01/01 19:23:11 fauli Exp $
-
-DESCRIPTION="manage installation of software in /usr/local"
-HOMEPAGE="http://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
diff --git a/app-admin/stow/stow-2.1.1.ebuild b/app-admin/stow/stow-2.1.1.ebuild
new file mode 100644
index 000000000000..4e18a86d170d
--- /dev/null
+++ b/app-admin/stow/stow-2.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-2.1.1.ebuild,v 1.1 2011/12/07 19:04:40 maksbotan Exp $
+
+EAPI="2"
+
+DESCRIPTION="Manage installation of software in /var/lib/"
+HOMEPAGE="http://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# create new STOWDIR
+	dodir /var/lib/stow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99stow || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/stow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264 for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/stow/bin."
+}