Add upstream patch to fix bug #539702. Thanks to Erik Falor.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 78 insertions, 11 deletions

diff --git a/app-admin/stow/ChangeLog b/app-admin/stow/ChangeLog
index ca916b657224..9118547eff59 100644
--- a/app-admin/stow/ChangeLog
+++ b/app-admin/stow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/stow
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/ChangeLog,v 1.22 2014/03/26 16:03:19 maksbotan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/ChangeLog,v 1.23 2015/03/06 12:28:58 maksbotan Exp $
+
+*stow-2.2.0-r2 (06 Mar 2015)
+
+  06 Mar 2015; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/stow-2.2.0-avoid-precedence-warning.patch, +stow-2.2.0-r2.ebuild:
+  Add upstream patch to fix bug #539702. Thanks to Erik Falor.
 
 *stow-2.2.0-r1 (26 Mar 2014)
 
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index abe0246d158d..6cde0da55d31 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 AUX 99stow 65 SHA256 68103af0c35467cf1a726d7a7ac7815d1e4f7ed5c62058d87904829b2081bd76 SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476 WHIRLPOOL 1eed3b955957af4e32417cb25919f17580ddbd10a2908bd3c8bf9f1ada619043ffda23fa5b71a64ff3287c01585103abe8a1ca79aef6d13534dea1a494dd15d3
+AUX stow-2.2.0-avoid-precedence-warning.patch 434 SHA256 8ed1988042dcaa4b80c83495839233f553bb2b2f4e45a3006101c04ca14c60b2 SHA512 3d7ee8d7f37fead800e393be346232ea4ae26d39951fc184d6267fb2d60ed0829956b60625ef80e49bcbf5f17402e4cf2c5dd98a29b35c80d9f16115c89092eb WHIRLPOOL cee6a98415102d8286bdc38c9573e17c705527e350285a4e0ad019d74e90500c14d071d42184799929e193bb718be4536590c67540db441b5f6f95222d22c1d5
 DIST stow-2.1.1.tar.gz 458329 SHA256 d88e1b022383ea58147f05587561b3052cadd6dc369f806c16492c159cc06c8e SHA512 9999632a8ecec62e405a8fb0683181166aa4050af4e2ac7a3b66b4d325ababcd756873d39c8c8b2d19f716858cf17f313b77baac877446fde1cc590066c9b5bc WHIRLPOOL 2df1256c7bfbc9382eb85c0008e4effe26b9c428cd2b60144afb17e013cd849fc263d1e2279c48b9f8b18c508038ace77c974d1e0a3ff68747cfcb1aeb553209
 DIST stow-2.1.2.tar.gz 460706 SHA256 d523afab21eed8c0a96f1e865439cd42194e9ed42c1adc9c22cf9a50f78a24a6 SHA512 d0591f102821958368c6dd02ca7b414cdfcd9bb3bb8543f19ff4d96232352d41ee30a31e9358be9d04943014424acc2cae92c9f039fb936f9841c8e15014c2ef WHIRLPOOL ff4403c26c76a4984715285c456f882061c66c63193df656d1ef1414f0f9bbb15c72542a67ec0f923ee69bf692c96410a3b441fe592d83545b18a5709f05ba5c
 DIST stow-2.2.0.tar.gz 479109 SHA256 8b89d79939cf9ae87d2f223bb36a3b2d0c66775b62aeb9953c6d33dab40d3c2b SHA512 43de6eddd6d8323682c6f5d4de00131009b7685a937c2a88ea1596cf9e12ced073983af571255d90c6e205c60dd976668f067909c92a9bce8ba0dfd984b253be WHIRLPOOL 0148d5b8c152a2058c5856c3b3503615860228fc12c19bd5f2a959b1cd756e51df65fb26593f84d27b317c43b3d26eabe1cd3d365282fa8a6b0e04979afcf12c
 EBUILD stow-2.1.1.ebuild 1113 SHA256 cfe16a19141e309e301f22743a87572a702a145d1919a57e4866291a2e3a9793 SHA512 c3c154d6a2d7de81291cf69521123df03d6cbfd88bb2ce2184259a34890a72ea47ec168067d84bb36e1b3b1853ef3d2badf580394f83fc07c36554f435167a96 WHIRLPOOL 4cbbe2fa9767b6e74c39243e407fdf8ec836d587fd6a86d7af31bea438951809e69938150ddcad1e7762eb07ce5e0210e0fa7bedd36409a874b33e8f6d6405e8
 EBUILD stow-2.1.2.ebuild 1113 SHA256 ef5fdcba63a75c14b6a3aefa5df99318e038b5d4dd2eb2235d19b7f5b405ad00 SHA512 8b4cc6ab74cffedf800bd1b798dee7783089a610e2bc87a527ae3aa8980d99952173ee3a781b63e48164522a7e9726d6dd6669ced15798791feb48d14e3d38c2 WHIRLPOOL 588e8774e8b28ccde941b0e0a417f02ffd507cad1348e7dfcc2512e9f06c7dc55e77e594adc8ad35b61798a59397fddf3bb3f9bbd1b68b3489cefdad28a75878
 EBUILD stow-2.2.0-r1.ebuild 1187 SHA256 9bb6995ff3a13f4a73b6852b5ea6aec29cc3c675622cb9b2fd12b8012999e8f2 SHA512 66276959a486a4849be95d11b699c1c2d6d240609c1c0c43f9b9e6db4807cfd526fbb84553a118a64ca7564c5c43166c90ec537ac03ed39195051767348dcfac WHIRLPOOL 4b6467c279f36176d0ec18e9f0382ad1c31c76ce664e281db3c4550c38bf44cb9453ebca43e23c35b5c16476ff435f2528306f937462acae337688679c24bc28
+EBUILD stow-2.2.0-r2.ebuild 1280 SHA256 aa82e137a5a03029b6f0d4dd04b5a2f9d72f4762550a33350db3c41e44d9e64c SHA512 3cfea9bb3b1811a9b3543192f2cc216204fa39d3919f2c479e5800f50451d45c33f0d73fb88c098c7b6cddc31891a708cf2d801a27e0f8b49eaf0be07dd6344b WHIRLPOOL dead362d0d7a92ab1f2cdb7bc788c1c236d753d11ef5c7d42717476750a5565817e07a6cc67e3e137f416e3d3ffa8b812a0d7b85b76e25cba74bbdbd7e94beaa
 EBUILD stow-2.2.0.ebuild 1184 SHA256 809a67c4faabf05615d72caadd96bc2fa0caf9fd1ad314029b49ce1dd0be1f51 SHA512 19cb35c009f0208843641f3733fce2c7b14638d1aa0d065a8e671b1058a213898fca2431ff199277872fbb88b400d4ad7af8c4cf1a64f35df4b7dc9efdca444d WHIRLPOOL 3795dbbc75151d38ba9fb07ff768e7e5b2293de47a66461c408a337c56bee1d7b3d8f4efae768103b7b0b7640fdc4938a113c8df758f555be7a696a872eedbe8
-MISC ChangeLog 2425 SHA256 d32c6fe403c5ef04551bebc7e4700f318e7a0344bba25048d22dc5082bffc312 SHA512 93b02ab98166178b6e3ab1ad7fa6e74aabe53eeeaf0002124e50f93124e683870e2bd657f0325b2a1b84ca165c24b9c6efa3c291f5dcc7a11cd17803002b340c WHIRLPOOL 300cec04a29e6ba630cb94a5020a76b88089833f20b5150c0768a0bbff459135307c3d42e11a50fd9f2b8c8e310a877bdbe88ad5d93ced4dd446443a8b48d0a6
+MISC ChangeLog 2646 SHA256 b8d34fdcb97a2c66474aa352fc6c6fadd96e03c13b3e1a96b38f3f241570c874 SHA512 7320de53f9bda5e427af16af67880d2c7adfaee5fd33449a8d5bfbcabd6ca956b572426b9505d6567d46627bea87db704a023d352bc7c3d69c722e59bf10c170 WHIRLPOOL 308a031e84507432239b1b3639a7d379742070168ced3996e785f73fda7f2927a0f573be8586964ce045beb7accf28eb20c5fd497abb74e69431d0a457b2a578
 MISC metadata.xml 357 SHA256 f184706523ab6694e206cee9ba1ec855669b31ea5ff5b1e6a5b81d874cc58206 SHA512 42ce26b60f2cc1c6f6b0dc24a44dac23d41247637bc596297670de37b05f9bdcaca88190d16c24017587842956448883b6f52271ded2f365fb024c4b425bddcb WHIRLPOOL 0d8b6c0017d9819a66b08bcf8ee71067988779f9a47567d10f9957d9163de6919121310c61e92b6f19ae1bfd058421862f6eeb28f915fc5203e1c7c61dac032e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTMvpAAAoJEAmJmMX429reDUMH/3ZG51XmCjrOoLFMFRTK+r31
-U/zcjDG0V6JeTxZjjRNKH/gqGf8PAgatt+LaxGOXCpoW60mqg62E37ln7uvpOTRF
-NeCJSTQVdmP+68qmxkIWlLkNrAio9JgKbuz2pBwgOYE5EQXkFTHJyk2uXRNbu3tv
-jYfachXvyzJhF9hmDlQswloZ4gyRxdqS6uhvahoiUFUcciKXu4NQDZJZdv2/xyhs
-zxGqndkuuXutEUAYjxSe52NvqSkQbgR4Xjl4ph0PdEAnpYzIK0Er8O8DepdP4+CK
-k5zF7J7cp3btw6kL568z9dyORcYap2vFKjidaFbz7sLk0UE6tXYlGugtZyQxri8=
-=BwYy
+iQEcBAEBCAAGBQJU+Z1AAAoJEAmJmMX429re5X0H/iRmTLAMOl4sX9KcJLLb3GYa
+jdg4ntzGhrRGKHPe2WVQrFWrgFJUBv/lZi2NWkKgN/NdUssW6ijRO+z6Br/APpN2
+o7hHCN9FlboF+4Emcu56cLPExrKTg2qa93aECl1XiI82mTuAPwedB0iXExQcGEw7
+Pk8IMGDggXajVG/ddZK4LKgm3byeyK0OiyBbE8Kpbz08+cZB3pu87dHi54W4ZlUu
+t8RtcJp9TTf7cFctUf5LuQt+r1SBuWSdcy5A2WyOzLihDk07DT1QlkpREaDHE6Ts
+FrlweP9CnULbMj1a4h8aKE/l5Znbei+mblu1ObdAOoDd/FzmogJ25RLE5lVZNUc=
+=cRQd
 -----END PGP SIGNATURE-----
diff --git a/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch b/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch
new file mode 100644
index 000000000000..75838e3a7c62
--- /dev/null
+++ b/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch
@@ -0,0 +1,13 @@
+--- lib/Stow.pm.in
++++ lib/Stow.pm.in
+@@ -1734,8 +1734,8 @@ sub read_a_link {
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
+-            or error("Could not read link: $path");
++        my $target = readlink $path or error("Could not read link: $path ($!)");
++        return $target;
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");
+ }
diff --git a/app-admin/stow/stow-2.2.0-r2.ebuild b/app-admin/stow/stow-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..602a51ebd96b
--- /dev/null
+++ b/app-admin/stow/stow-2.2.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-2.2.0-r2.ebuild,v 1.1 2015/03/06 12:28:58 maksbotan Exp $
+
+EAPI="5"
+
+inherit eutils
+
+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="test"
+
+DEPEND="dev-lang/perl
+	test? (
+		virtual/perl-Test-Harness
+		dev-perl/Test-Output
+	)"
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-avoid-precedence-warning.patch"
+}
+
+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."
+}