Applied patchelf patch to spideroak-bin ebuild properly

4 files changed, 21 insertions, 33 deletions

diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog
index 80ae030..3d3848d 100644
--- a/app-backup/spideroak-bin/ChangeLog
+++ b/app-backup/spideroak-bin/ChangeLog
@@ -3,6 +3,14 @@
 # $Header: $
 
   11 Oct 2012; Randall Wald <rwald@gentoo.org>
+  spideroak-bin-4.7.9948-r1.ebuild,
+  -files/spideroak-bin-4.7.9948-r1-patchelf.patch:
+
+
+  Applied patchelf to ebuild, rather than trying to patch afterwards
+
+
+  11 Oct 2012; Randall Wald <rwald@gentoo.org>
   -files/spideroak-bin-4.7.9948-headless.patch,
   -files/spideroak-bin-4.7.9948-opt-path.patch,
   -files/spideroak-bin-4.7.9948-patchelf.patch,
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index fd33129..85e9dcf 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,7 +1,6 @@
 AUX spideroak-bin-4.7.9948-r1-headless.patch 353 SHA256 b9db5b3ebdba8e2b3e36c78b133a3ce3d17d5784bbbcf906b8e61b383a19886d SHA512 aab0d738d567504fa4b65dc8e17d24cac8dc92f4a805924c50bb2fc68531d372e3061df080598ab09a8b6dbdc337764f927333b958af8fa8e00a6d34b4be32f4 WHIRLPOOL 59c4884cb3a3c5f5983dbf1fc4591e0f69f7f106b9721dbff9eb552249155a436f7742bcc12d9dc7b9845f54042ce1276d41e7eda757ef8dd72d72b325aff57c
 AUX spideroak-bin-4.7.9948-r1-opt-path.patch 489 SHA256 f1e15bd47107d3f40004140b0e0e67d7936fcb86dea55e91e0c7651842aa4eaf SHA512 71912bdc30a735c50ea7204bdee2f94585260f752ba68677c74295c47ca01236be3cf7ec1910d0dbcc892ee2d41e2a53dea611379b78b9d791efd7af662c4df6 WHIRLPOOL 815a1825cb4a74fb93202907b3579efdb66f8d8f55753042d848c69cce964e615f535c919a40de520752247acd3b847603bbc486ab689ecd92b90ea4eef97ade
-AUX spideroak-bin-4.7.9948-r1-patchelf.patch 786 SHA256 fec778bea9da99aa9e55179a0a878c887c9e1096df2cb0a57db815af8fc26924 SHA512 3fea8601a6fd5df000a0c9e18b9eb6d33f7f89d2c09e9045ec35c5e0c9ca1edbd9be5fa04b27fa5a6148453c3845e3ee4955a789a804f36f5583256728c54a63 WHIRLPOOL 4aa12f92f9244ace441a8f16ac5c132ae3ef7d33a77879c15857acfdc64bb54062f0d9f1ae3df1bd2320f2f81e9372930d07693a4d76126f7870223c6b6b8fc0
 DIST spideroak-bin-4.7.9948_amd64.deb 22739294 SHA256 643fe98a02635f37b2a4122eb81679954291a53e67af959e6d24c26aa737536b SHA512 5a6de79066087adccd3d89af17cc40254809e9cd5f12ccb1daada340e7b357d33d7e25179a54f700f8100abc91fc4e16a729726d549ca624fdad0a42183314f8 WHIRLPOOL e9376610a9811c68ad3230597d66578864e095e9fde9cf77eee6808a3409e0cff6e2f0548e625cd158a37cbd256dddb54520b4354de27008003c361ecd87465b
 DIST spideroak-bin-4.7.9948_x86.deb 22132538 SHA256 a7b6d44d0197e46334646db9a2015d2987cd4c9a8b77423284044092265bfa8d SHA512 45f93a40bfc2227573aabb4ae9d820fe832726dce512435e9ef34d2d82a234a729313bfb83f340a00de3955e7c08f851915626eed2d02c767dc6949e9c8f74ed WHIRLPOOL 6b4220b1c790e65e5b0ce96acd8aa459848a0c14fa9e216816ecce12fe3576601feb3e10afe036d4f537cc62c96f069043ab61a07b9e7abd5ab9568483ad975a
-EBUILD spideroak-bin-4.7.9948-r1.ebuild 4453 SHA256 9ec71bc222b93ba2df64b065221604b99dc82f8c88310f71dcb12b7c647852a4 SHA512 77962fb82c60082033ceda4ca9b33a28b7507a10e8b02488f20d916948a709e95dac8f260b727273e68b5a51fabf52c2ff815898f41dc20ec4f6aa049fd0a178 WHIRLPOOL dfa22d9bb4c76e285ea833bf849b3aead9d4dd93411aeda3a52b4839b44dc0dc474d69ea56f2ec4e9c8d390aa91d64470cf8545215e3d9891c7d1a4132e3db17
-MISC ChangeLog 834 SHA256 1878060ff15e278adf53bc3a812ce43a1ae891046d79561eaf4dceed5a99e7e8 SHA512 fc57307fd23265f9a6f1e01b99745733a66e50fc6f37efa5341906946244b0a6dff8d26899ef79f2f2cefc63f3a6ce6ffe294fc0626dde15c3f2461229328f44 WHIRLPOOL 90d9a5da4246d8aedeb1b22b86c2e9c71595800f29994412418e430e0b61d48d2520b63bb0c5e0f9d33bc97160637aa8feaad90ba4bbe2cffa0af57911d71221
+EBUILD spideroak-bin-4.7.9948-r1.ebuild 4768 SHA256 0b6b9bb5ced788a637539e668e1dce6cc1d462214a3eabe21202b45dbb14ff08 SHA512 0b5eba994fdeaa970e987c5cfaf2d4eef9dcb1696efceda43d5811fbb71ec1bb8516f2fce67bc9464c327065a292cd8c7a67f6616308ad99fdb309f127be1f2b WHIRLPOOL eba22c43a1f07c53a1664068472ee81b2ebdcb981f15b4d910b3c29203af1cffb4faa466598a1266c93883f06235574e2b1f6c40669997ddf082e1222011b80e
+MISC ChangeLog 1041 SHA256 b2162746c91c77f30e9f6882db638ad48def1798f20c49906ac40bb5402942b0 SHA512 53d3ed97d5a3ae485eeacc6bac96e3b341e7a8fb3bd7a4efdf4ad6fad684abc933092c7f11804c2a101d40756810a55b956088b383289e803a36537a64f93f8d WHIRLPOOL cf3cd55aa8a3beea63cdfc41316a51742b3afd0bf766200f9ff00909e09da484e78ee2256ed36b5c63c8584f70ec9afef58e964cc77ae16259b86745ea23ba34
diff --git a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-r1-patchelf.patch b/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-r1-patchelf.patch
deleted file mode 100644
index 8d406b1..0000000
--- a/app-backup/spideroak-bin/files/spideroak-bin-4.7.9948-r1-patchelf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- spideroak-bin-4.7.9948.ebuild.orig	2012-08-30 18:08:49.333150726 -0700
-+++ spideroak-bin-4.7.9948.ebuild	2012-10-11 07:15:24.798099441 -0700
-@@ -22,7 +22,7 @@
- 
- SSL_SLOT="0.9.8"
- 
--DEPEND=""
-+DEPEND="dev-util/patchelf"
- RDEPEND="
- 	dbus? ( sys-apps/dbus )
- 	!headless? (
-@@ -113,6 +113,16 @@
- 		# Remove bundled python interpreter => dev-lang/python:2.7
- 		rm usr/lib/SpiderOak/py || die "rm py failed"
- 	fi
-+
-+	# Set RPATH for preserve-libs handling (bug #400979).
-+	cd "${S}/usr/lib/SpiderOak" || die
-+	local x
-+	for x in * ; do
-+		# Use \x7fELF header to separate ELF executables and libraries
-+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
-+		patchelf --set-rpath '$ORIGIN' "${x}" || \
-+			die "patchelf failed on ${x}"
-+	done
- }
- 
- src_install() {
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild
index 8bb53e4..e99e80e 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.7.9948-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="dbus headless system-libs"
 
 SSL_SLOT="0.9.8"
 
-DEPEND=""
+DEPEND="dev-util/patchelf"
 RDEPEND="
 	dbus? ( sys-apps/dbus )
 	!headless? (
@@ -68,7 +68,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PF}-opt-path.patch
 	use headless && epatch "${FILESDIR}"/${PF}-headless.patch
-	epatch "${FILESDIR}"/${PF}-patchelf.patch
 
 	# Remove bundled libraries/plugins/python interpreter.  Please keep this
 	# mapping in sync with the RDEPEND system-libs? ( atoms ) above, and the
@@ -114,6 +113,16 @@ src_prepare() {
 		# Remove bundled python interpreter => dev-lang/python:2.7
 		rm usr/lib/SpiderOak/py || die "rm py failed"
 	fi
+
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/usr/lib/SpiderOak" || die
+	local x
+	for x in * ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
 }
 
 src_install() {