Avoid regenerating proto.h which requires perl -- the shipped one should work in all places we care about #421625 by László Szalma.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

4 files changed, 28 insertions, 16 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 68746dd5c111..fbd96fa3e31a 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.226 2012/06/25 10:37:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.227 2012/06/29 05:11:14 vapier Exp $
+
+  29 Jun 2012; Mike Frysinger <vapier@gentoo.org> rsync-3.0.9-r2.ebuild,
+  rsync-3.0.9.ebuild:
+  Avoid regenerating proto.h which requires perl -- the shipped one should work
+  in all places we care about #421625 by László Szalma.
 
   25 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> rsync-3.0.9-r2.ebuild,
   rsync-3.0.9.ebuild:
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index b3179e6532b6..2d8f643096d4 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -15,18 +15,24 @@ DIST rsync-3.0.9.tar.gz 792725 RMD160 e5ee8d786defb0d8f937c8d027466f418c63c97e S
 EBUILD rsync-3.0.7-r2.ebuild 2073 RMD160 ec55b6c88aec6c03be61914408188e2cfb783375 SHA1 323ea389355586061aab6a84ebdd13032a09a0d3 SHA256 58381d074282ba09cf72005e301b481982e2fdbdc3cbefa24a2486c025eab507
 EBUILD rsync-3.0.7.ebuild 1818 RMD160 ae50153104de0eceef6604e4b4e7c766fe0a041d SHA1 e0998d6b323fb7a736ccf5d88440789ce88ceb0c SHA256 67840ba994553d506026e474f481eddfe66f6f63144d8293d1cb2a6485cfa4e7
 EBUILD rsync-3.0.8.ebuild 1953 RMD160 b901bb1118ab12c077b0630115c8e40fc916a7c1 SHA1 b5bff9bbc9d8fe66a18374dde1e0e12b7350a426 SHA256 ee881519a8a4e8ec074d8d8fd9e68434a46f0760b194d86ce8a1ea0edfa73263
-EBUILD rsync-3.0.9-r2.ebuild 2397 RMD160 be2ab67f22c6848a771d6d4d9b06bf2d518b9cf1 SHA1 aafc8d9d807ca0e88f2a8e8e7165908a6f6e3e17 SHA256 6f81778e3033f96da17a8b0ce2005ccafe51e6045aed923668c2a44642f10f69
-EBUILD rsync-3.0.9.ebuild 1966 RMD160 7305ba7b71ea534d71cd4bca6d8e493c6cd6069b SHA1 5157a0e375a7bf6d2f3393a8c56eee043d1df86f SHA256 dd16b46120baa944966fee6551a9123f589a00a68de41ec05bdc3a18e0e3da3b
-MISC ChangeLog 28778 RMD160 ad89843a40876dc0f2a9b4507586496fcf842944 SHA1 b0d1afa3e4952166e1543d34a1d76ce8d0691aa5 SHA256 c62402b3cc59f0c6a32013a3fe2d8e8689a888a305144ecc1eb299d83e459578
+EBUILD rsync-3.0.9-r2.ebuild 2425 RMD160 1c75a856c26cb443a9839323624fb1957d817e3d SHA1 7a250941b6497fd92d448015d1b72b8e942d33df SHA256 1077071ae4e5c02c305d6f02160f7d62972404ac45ec32f743a18f3f2cc0d47a
+EBUILD rsync-3.0.9.ebuild 1983 RMD160 c7b36f04cb0419eb08a5b640a9b7fe847bf7f0dd SHA1 68dd8484b433546c41c90135e7b1ea94b6241756 SHA256 69df35fbe5b61a853bbafbd36b8012f509477856773b7d12d4e05c1526f4a751
+MISC ChangeLog 29009 RMD160 c2352fbff7476f5fa304b62f78bc3e2d66a510f9 SHA1 b5edf48e4098243ac894c72b4d2897fa7ebbdee4 SHA256 9aaab62418e3f1ff70a05a760097fbb226ce0d4a376fe1daa441f2f77de50ac6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6D9qAAoJEBzRPIrUMBNCUZsIAIKar0Rr+F6f7fvNZJ6YD1LT
-I1zS/0hvXrLpKgY9UpiLOA+FGSfozWG9/ttYKAx899axtt4z4E2QUENuj8BGOHdk
-60BYSws5EuI9MLspI9rWYUoOVpM4MN6vRc37n3Ib5DFlsBDNjpvCv5DG3LBqQu7H
-YgZ4CYNcSu1B70h7Qg4M+ZVSqFvZ+RK6nJpL97TIPcPqiUMcfKQS+JtNZojfGcjI
-j1YN5B0JT/rAzqCwx6Lj+SQpy4XlkYmhUq08IUTUMErq/wwU1IBLH0k1rbrXdesc
-vT3YXpkhGaxph5kN8OhUwDrkUqyqTG1vTqIq9ZjHFrInycWV/7uqyJU8awmH/6A=
-=za1N
+iQIcBAEBAgAGBQJP7Tj8AAoJELEHsLL7fEFW6oYP/1DbRxwanx6Yh3gMg4jGILHz
+lXt/wm7nkTuJG59BnkS5Yu6GxrM3bk1vOk+tOSzneJ1F8CRQ7+0/628/Q8UTv9W6
+ANpKuQUm27FzIqc0bEL9aLxCptO5TnOv9BHNVLooNXr1xjtFX15LFZ/sxhbCsYr4
+XEN7diG5kvXSBtPGzv1CQZ+8o9s5gT+/FE2f2qeqWOaYnl3CPwlaEO8au7IbLyAc
+28nOoIozwPtPmXVzWUH2hqdbkx77YKz3BXKsbSJCD8DR72Lrbt8DWKt7jHE1PpGp
+Q/PMYqxyDJsXlB5brZt/HEq4ySGtusy5ajHdOM3tlscnq6wxQTqGzRMc3eXv9kEt
+pZB++BtZuWKWg8bG9EDMYMkRsqfoog0UXTBuOUnMpLRuNIYWeBdKiDAqMpIQvL9q
+huGfVlLy8HDfAOlQ5l77Kffd7coUX9PC4t8VoazmFhn4txdu6pENtZScJZXcUDQG
+MptCb3gymn+CdzPL+V8YmCsMsdDT9Gv8Qj3diIjkETemjvytg9BuNX/KAZ5Y/dcE
+Enj6v31S7/hpGfmPyr1ZyMssMQcdjWY6qJqYY/vkT1Mjz7UBtJ92Wt3+mwutI/M6
+Z8sHWsXqowTYRX+mTEhN7X2Hg5XrBzMGF4NN0zCQNmW76TAJcxRkydepzyarRtIs
+bcrcNvIHh5doY4JaOnwy
+=Cu5v
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/rsync-3.0.9-r2.ebuild b/net-misc/rsync/rsync-3.0.9-r2.ebuild
index f4a76d1b9261..d2502260add2 100644
--- a/net-misc/rsync/rsync-3.0.9-r2.ebuild
+++ b/net-misc/rsync/rsync-3.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9-r2.ebuild,v 1.3 2012/06/25 10:37:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9-r2.ebuild,v 1.4 2012/06/29 05:11:14 vapier Exp $
 
 EAPI="4"
 
@@ -39,10 +39,11 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable iconv) \
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+	touch proto.h-tstamp #421625
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
 	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
 	dodoc NEWS OLDNEWS README TODO tech_report.tex
diff --git a/net-misc/rsync/rsync-3.0.9.ebuild b/net-misc/rsync/rsync-3.0.9.ebuild
index 56230fe65647..ede644f543aa 100644
--- a/net-misc/rsync/rsync-3.0.9.ebuild
+++ b/net-misc/rsync/rsync-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v 1.9 2012/06/25 10:37:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v 1.10 2012/06/29 05:11:14 vapier Exp $
 
 EAPI="2"
 
@@ -36,8 +36,8 @@ src_configure() {
 		$(use_enable xattr xattr-support) \
 		$(use_enable ipv6) \
 		$(use_enable iconv) \
-		--with-rsyncd-conf=/etc/rsyncd.conf \
-		|| die
+		--with-rsyncd-conf=/etc/rsyncd.conf
+	touch proto.h-tstamp #421625
 }
 
 src_install() {