Patch ELF only when USE=-librsync-bundled.

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

5 files changed, 31 insertions, 24 deletions

diff --git a/net-misc/dropbox/ChangeLog b/net-misc/dropbox/ChangeLog
index b08037500494..31be3a3183fe 100644
--- a/net-misc/dropbox/ChangeLog
+++ b/net-misc/dropbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dropbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.22 2012/07/08 20:40:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/ChangeLog,v 1.23 2012/07/08 20:44:32 naota Exp $
+
+  08 Jul 2012; Naohiro Aota <naota@gentoo.org> dropbox-1.2.51-r2.ebuild,
+  dropbox-1.4.3.ebuild, dropbox-1.4.7.ebuild:
+  Patch ELF only when USE=-librsync-bundled.
 
   08 Jul 2012; Naohiro Aota <naota@gentoo.org> dropbox-1.2.51-r2.ebuild,
   dropbox-1.4.3.ebuild, dropbox-1.4.7.ebuild:
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index a683a2651483..ad325a463aa0 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -12,25 +12,25 @@ DIST dropbox-lnx.x86_64-1.2.51.tar.gz 16578440 SHA256 692862a685f4ef0424ea43eb30
 DIST dropbox-lnx.x86_64-1.4.3.tar.gz 18546137 SHA256 7b93436027d961eb7ec097f1695a1361b3262b45d90ea445a3170a0faea878ba
 DIST dropbox-lnx.x86_64-1.4.7.tar.gz 18570864 SHA256 a9ca298ec869cabe1232e42c2ab7d5f84935f75602f6464b7926a7e5b2ca84c2 SHA512 b05f2d909f3c3b51acadbf715312afa18385f9366e82b4ed9f14bc42d8197a38744263f793552793889bdf9ece4dff0d97ad57f584d6d5f5fced5549e4e4b358 WHIRLPOOL 89483c05a5b843190a3c11bfb04290b9253a7ffab03bbbb76f4a6de00ad957b3c4aa29775c2c8cf5c95ff84feb2f24ee65d66ea2754ddf4b95cd0650f0a4796b
 EBUILD dropbox-1.2.48-r1.ebuild 1392 SHA256 c7c7ba7c97802390a2f6d5fe30dd6c67612f11df8caba9b6a26373003a504c1d SHA512 d967f7b8c8892005ec1770d364ab216399b44105293b67955c56898921038c5c9da001fc5b88ef957e695e9b91470353c1138c1652648a910954955b4e26ae7d WHIRLPOOL 2248fcc6f6dc8f0134bb7f5c3a3cc5b473f359f40c8ec536839f780290b3fd991f785b4e33c371b722c73bd27cdcb55e8766a557f24d0d998be4624c074bf35f
-EBUILD dropbox-1.2.51-r2.ebuild 1870 SHA256 325db25693a3fdd77f605a0d2d0f78c0415c5ccb656cde7dee7e96edb295793a SHA512 0b64f1fdff30eca73d43d0b5022af5c78566babcb184226c4c50c448203eb5802af894570f3bb68a98b582cf5add41da8a1fde28b7fc60ba4a8545e1ddc96f7f WHIRLPOOL 3a56a9b54b8f330f443aee5e889e1cb8d67a69160afc1bdb7d4812cf4c78b2f784ccd184e82351439733ad70674a7c8cfc7653c41d7cd1b9373412db792599a1
-EBUILD dropbox-1.4.3.ebuild 1981 SHA256 a8f03fe677193651b6725753b2c904922bb8024d0e6ec4d025341fb71c809488 SHA512 aa6d824dc2d2533e5419112372a19ec9b55a803c2dfd5bff17e02605937a50945e4014cef65ba65db899769e3978879180d509ca8022233dd9d6c61112c8c8f7 WHIRLPOOL 9723e8943bbaa2c2394f171f2938e645e6e93ef610d3bac3af600fde1b9fd501686c3dc85bb83d423400feb13859afb5b4b5106cd1a577cf4e7c92cc5962711d
-EBUILD dropbox-1.4.7.ebuild 1981 SHA256 41356b3561c8b0b6483029415256020887f9919783452b889fd286ca4d2ca86b SHA512 b4e789906776aba11968f0c533c50599be1a2a6f6c85055526ae7a1e2dd6669cf8f3b0f8cc50c914050a6c9909a0f3e82738caa8b563cafa7ff5045fe55a7718 WHIRLPOOL c17c577cb7fc13a3f60c7860fe5d5bb1e08149373ec4121d6d8c33d698e6f35519213714a7419ee8eeb7bda00cddee5083ac18fd6cbeb06f8e4cc5e9e58eecd9
-MISC ChangeLog 3912 SHA256 4a327fd83c4f230135bb23a44b03973643066b2c6325cb27cf1f35505cf4c6c4 SHA512 2018b7b1a4877001d10294925a641e6450aaec0f6be7822d601f18fbefb9ba8cc648da92defc17396602a4f2741631078992f130b7bd38856f1758b712956e5f WHIRLPOOL 05a7c151adec61690209ed8d5531fe502c55048523f032cfc67640d7b1c84143b1353f2499eb4370b73a58e128cc16b3230602c4948f92c80c2edc030aa45201
+EBUILD dropbox-1.2.51-r2.ebuild 1877 SHA256 50c6875def6fc5ffa0fdc2ee084b92eb4c1d064d876cc4b9b6fbc3ff9d7660de SHA512 074218d5780895a156f72432165790120e5c64c863dd14e47fdd0a9ec33542055233c2351d455b5d7bab383825b1c86f1e69a6431b7c9b282b1d0f3bcd29afe3 WHIRLPOOL 31f32c72eb64314c1249d490bd26a3954a6e55c25b77adef66d7be536ab061f119c69898900f688877910d19aa8a71165762e8b84e591743719bb44be8b996b8
+EBUILD dropbox-1.4.3.ebuild 1988 SHA256 34de504855206b30a2312d07187537120bb9b7ebbf3cee4017d9b139b3ad667d SHA512 84dd4866329c9e0935a17e3aaa03b84426e351a6424ad5f22d29a50ae597c9c8f85b37a3733d5bfbe39c869b2f0a2659d0af35deb1a5c11149367af2650ec009 WHIRLPOOL aa94fe0c17f52a3f0b78badb85ab4251b9c930abbf75291780bd614b836978b5384b35a297b4a7a490a24f51c86066fd2ab76c79b05da838fcb6affd75aa2211
+EBUILD dropbox-1.4.7.ebuild 1988 SHA256 05dea69b762de2fcbc596e33d6855769ebfffa0eb6ecae6f2bf98cadd963c5a1 SHA512 0116f5608c60ffd342a9d54f22e8217b4dbf0cfc98687f1f120f0c5e5d1ad4c486a6e7590f4864e67afc1fd6bee44353830ca7065044832a805909001486a61d WHIRLPOOL 08c940385f1452a38a580ce62cf5b229dae8287b541c402b13933c7685a4374d0832cf381a9e7eee19af491f3fcac3e51ce76b418af800cd06ef323c43422167
+MISC ChangeLog 4077 SHA256 bc707293e95b6f5e9cb58794b0c6ab69ffd00660c499ce549d58ffe96d1d3276 SHA512 2090ff5f265f9ec74958224e95d9434e26eb051f90896f7133bf8911b34b573a35cf5f73f32b291f59a1525e1051e753f87944ec1b864539cb1a32f190d2ae24 WHIRLPOOL 66730d8d286d52138481c2a888a5a4c0985555dd7adcb108f29e29c1f94f6b1d45bd0d6ad650e3138afccb6efe6c1b89f7f2ff9d9062885f764a0ca913220b71
 MISC metadata.xml 285 SHA256 9aea162d0e73c42a22183dac59a6e57f5e695bc4020d41377aedd731a1a4ad5f SHA512 d5b85b34badc10a4e18457c94c47d13bac2a7a30c3d33ddd0d505d23e6faf60746d650fa2085bbd3a292cc0187bd03d099a211264f858273bed8d4ec1dd506da WHIRLPOOL 1e44d0937c7d2913c22025197d39b09eed3af3afa6cf6047ede0dd6bf17505af05422af26fe24729a1fa2085f374662cf432ebf37bac955dc0f9d8b4c146cba9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP+fBYAAoJEDYO1FT4VRUUQJsP/1g0TWvPUk5up7cFUendCV8J
-WTuVaXA2iXE8LpgmRsTt3ckEJM7w3LUtDgXABSAYe1Pi3+rvDLoWxIY1wledaDbl
-7ht/SKPBDa6YygvEv6LREDG7AIFl1JdlwT0m0ctuZsXpWHmYNtVnF83Nr5aEstws
-Acdsek116YPzUuIjDzGP3rT0OpuX5auggNURsXl1SlDLncI0ciiZ2uEeTqSVSHwi
-fIwg20Lbe62VAM0BiWYvSq9ALp5KvDLgx01uEWRuQXxZProctDVpmo1bbrkUPoOH
-DO1CEYijHOuvAbSej+Lxezia89sK2d+fHmSR/aCrJUzSCF9Xrd0oL+/VWf5ic4X1
-AjYm0HmMOmqQC6acNIb3FHXv8FR1DlvbruBvETMK6e42zHyVdsWHi/ay+sLpfaex
-0AlwPhn0CnrfrQrrAu+T0h47dTxQ0A6Hyee6lgOZgY/PWDnB4aEj5buvc+JuLeOw
-Tc1VXgSXvQMHHJXE0ljsrTHiwXEEZgCMru4CGs1hgzKgRYMfMVuD6amONetd1N+F
-0EdHJK9DWSEdx9yuKIPX3ukBLudzKwSmjyRMnmaOjo1BtAZ4MAkHRePi0bSzTyYx
-ITbyA1qkLXMPluIOJNgnysJ5F9nrNQORwIcklhuKta3SubBW95f7ReJZMO7TOnm+
-Hd0akJG/xVYePvj+/tDY
-=8UOs
+iQIcBAEBCAAGBQJP+fElAAoJEDYO1FT4VRUU7UcQAIWPJB1FRjdkKxO8EkebF1k5
+ImKH3Zl6jeja5lPH/ojfTftme1eLDElpvPdzU1LpFR/9lIt/uzr5SLziyIJRU9u2
+lFzZ0uNy8uN9qbNa4IW7qPUixYE0nUt7vpGal1Op363rwYW2uBSI6LHlcX6MEO6O
+Izu3cbCGCpUnVvPuITmbsUngpajd/DRcKfXb/JgN7/BxuFj73Be2+NzSAb8hCB8P
+HgfbGnwO1m8UHXAkO4uqYxoLw0xXIH2R6mizE9mPaaOZoCNMSGo+tKAPEUnxObgF
+WyzLOxXZYEtwDuAm55/BGe6B0cfU/jRQFDTiRgivkcOiY7Y0A59eLMFCkvkvBzJQ
+DUNUfaBVj+fkrohA67hgKWA0nNKhzqBn6SrBJJJuP0CBzADr1022jk4N8yVjwHjn
+ZN90wb5bRTMh1XS9LKGVSGW8/GHi7eBQtMcp1Pa8LmeRZ7kqdIR7/pLI+h4Tm4tW
+yZ+mJB/bfCCodvIbGd8d4OmyllayXNHz4oINXlhyju1DrjERwpZlUA7zjhsqAA7r
+JiEXG22OTIR7rC0NBb8yIVRc6xrhdv8Qwagx6Hzcu06mahwXlBc1ZZz69LNNgfYQ
+C7QRwkP6+zelirbTG4TRNzQmWIMbvP22FHqK+AWXwjjXFivGouSAklXZRdlPPHDD
+IxXJKi70wnRVacYimYI+
+=rRZp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbox/dropbox-1.2.51-r2.ebuild b/net-misc/dropbox/dropbox-1.2.51-r2.ebuild
index dfed01c6ce9c..7c8f2366540c 100644
--- a/net-misc/dropbox/dropbox-1.2.51-r2.ebuild
+++ b/net-misc/dropbox/dropbox-1.2.51-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/dropbox/dropbox-1.2.51-r2.ebuild,v 1.3 2012/07/08 20:40:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.2.51-r2.ebuild,v 1.4 2012/07/08 20:44:32 naota Exp $
 
 EAPI="4"
 
@@ -44,8 +44,9 @@ src_unpack() {
 	rm -vf libstdc++.so.6 libz* libssl* libbz2* libpopt.so.0 libcrypto.so.0.9.8 libpng12.so.0 || die
 	if ! use librsync-bundled; then
 		rm -vf librsync.so.1 || die
+	else
+		patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	fi
-	patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	pax-mark cm "${S}/src/dropbox"
 	cd "${WORKDIR}"
 }
diff --git a/net-misc/dropbox/dropbox-1.4.3.ebuild b/net-misc/dropbox/dropbox-1.4.3.ebuild
index e1deb3d215ae..9ee48467e029 100644
--- a/net-misc/dropbox/dropbox-1.4.3.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.3.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/dropbox/dropbox-1.4.3.ebuild,v 1.2 2012/07/08 20:40:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.3.ebuild,v 1.3 2012/07/08 20:44:32 naota Exp $
 
 EAPI="4"
 
@@ -44,8 +44,9 @@ src_unpack() {
 	rm -vf libstdc++.so.6 libz* libssl* libbz2* libpopt.so.0 libcrypto.so.0.9.8 libpng12.so.0 || die
 	if ! use librsync-bundled; then
 		rm -vf librsync.so.1 || die
+	else
+		patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	fi
-	patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	pax-mark cm "${S}/src/dropbox"
 	cd "${WORKDIR}"
 }
diff --git a/net-misc/dropbox/dropbox-1.4.7.ebuild b/net-misc/dropbox/dropbox-1.4.7.ebuild
index 2316a5c85381..576eee647f2e 100644
--- a/net-misc/dropbox/dropbox-1.4.7.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.7.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/dropbox/dropbox-1.4.7.ebuild,v 1.2 2012/07/08 20:40:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7.ebuild,v 1.3 2012/07/08 20:44:32 naota Exp $
 
 EAPI="4"
 
@@ -44,8 +44,9 @@ src_unpack() {
 	rm -vf libstdc++.so.6 libz* libssl* libbz2* libpopt.so.0 libcrypto.so.0.9.8 libpng12.so.0 || die
 	if ! use librsync-bundled; then
 		rm -vf librsync.so.1 || die
+	else
+		patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	fi
-	patchelf --set-rpath '$ORIGIN' _librsync.so || die
 	pax-mark cm "${S}/src/dropbox"
 	cd "${WORKDIR}"
 }