app-admin/stow: Version bump 2.2.2

Closes: https://github.com/gentoo/gentoo/pull/1705

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 1ae23061477f637b6749c32c97c74898f623ecfa..3c999eefa3b27a2313b401d91824a074755a0ff4 100644 (file)
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1 +1 @@
-DIST stow-2.2.0.tar.gz 479109 SHA256 8b89d79939cf9ae87d2f223bb36a3b2d0c66775b62aeb9953c6d33dab40d3c2b SHA512 43de6eddd6d8323682c6f5d4de00131009b7685a937c2a88ea1596cf9e12ced073983af571255d90c6e205c60dd976668f067909c92a9bce8ba0dfd984b253be WHIRLPOOL 0148d5b8c152a2058c5856c3b3503615860228fc12c19bd5f2a959b1cd756e51df65fb26593f84d27b317c43b3d26eabe1cd3d365282fa8a6b0e04979afcf12c
+DIST stow-2.2.2.tar.gz 579324 SHA256 e2f77649301b215b9adbc2f074523bedebad366812690b9dc94457af5cf273df SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5 WHIRLPOOL 261899d7e9765e9c7de587e8084b714e6ed8ea90497fa813dbd8a309d17aa4b3edaf47436c2936c9a93d5338f32ffe8c0734b1c4c2e44ca39c8ace1da4ef0891

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
deleted file mode 100644 (file)
index 75838e3..0000000
--- a/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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.2.ebuild
similarity index 90%
rename from app-admin/stow/stow-2.2.0-r2.ebuild
rename to app-admin/stow/stow-2.2.2.ebuild
index 64cf9432c8aaa641e9dfab58a178181d02958341..14c9b9389755ced2b870064941bfdf9ad929e6d7 100644 (file)
--- a/app-admin/stow/stow-2.2.0-r2.ebuild
+++ b/app-admin/stow/stow-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,10 +22,6 @@ DEPEND="dev-lang/perl
        )"
 RDEPEND="dev-lang/perl"
 
-src_prepare() {
-       epatch "${FILESDIR}/${P}-avoid-precedence-warning.patch"
-}
-
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed."