From: Zac Medico Date: Sun, 26 Apr 2015 18:00:39 +0000 (+0000) Subject: Remove $$ORIGIN from DT_RUNPATH for bug 547520. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d5464ac477e3774d3e828075b90c8fccdcea41d7;p=gentoo.git Remove $$ORIGIN from DT_RUNPATH for bug 547520. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xFDE8EF85AE5719A3 --- diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index 7355d7bab2db..24b3a40bf14e 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/tora # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.112 2015/02/20 09:54:23 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.113 2015/04/26 18:00:30 zmedico Exp $ + + 26 Apr 2015; Zac Medico tora-3.0.0_pre20140929.ebuild, + tora-9999.ebuild: + Remove $$ORIGIN from DT_RUNPATH for bug 547520. 20 Feb 2015; Sergey Popov -tora-2.1.3-r3.ebuild, -files/tora-2.1.3-desktop.patch, -files/tora-2.1.3-ext-loki.patch, diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index db1144eac2d9..2fdd0ce7deac 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -2,18 +2,14 @@ Hash: SHA256 DIST tora-3.0.0_pre20140929.tar.xz 9038680 SHA256 67fb6273c930b4ba4cbc185fd3e2a68b8c7029098b14f729ffbdfa09ed91af2b SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73 WHIRLPOOL 7fcf7fbe06d1fa4d31a88674f011c634ec9ef12003a074c8185a981650fff8aef85725007f51a3e463d95f332fde724392fd748d4fdbc464663a2da3b8ec8693 -EBUILD tora-3.0.0_pre20140929.ebuild 1978 SHA256 4d5fb6f2c5eadf9f2fc2c13501ee21fd7d6c594001d0bc7af5d3b4b9d4850dd2 SHA512 a93b8889e1bf28a4ad2eca3f17ddbb33beecdcaf18ac74d57e6e446eac312e5aebd90b15ee606119e0def1ce2ef4dc89d7fa31168517ec2ed5d0966f59eb9c67 WHIRLPOOL e1444c864e6673ae654ed06547050db0e308bb66eae90efc7ef241c3c20b48a46689d2d964f93b16c0c64f4769d06ee1180b490acb639fec71fff4db98bf26f8 -EBUILD tora-9999.ebuild 2269 SHA256 2807c3c58d271e4dfb96947a84704710378951fb81add4cbd51b7419fca8d7d3 SHA512 d891a80d037396511403af3ca04fa1e7cd5cf08e66a67842d8706ea662b2213d50291c155e4a23c40f8089842f4a98bc28913f16cfc641163e7d9ce444ab8bbe WHIRLPOOL 9598625298e108f26814a040c27b2cb3f2306c446cca646c04dc05e54963dac45665f2dad77a548abddbec19d336e3e0cf5368f265b6f94923cfc3802e268c00 -MISC ChangeLog 16711 SHA256 50af5cb6840f75ae3fa0755703bc82874a0e70a94211e3c51e2e49ac68e64981 SHA512 0ded1a65479d0d12e68e74de4b524d9eb6d59ad424c046305dc0e5a1d6a9be1d4bd8ba68834a5d42d9faea1b06b59c8b1da8c7affebf9a1825e67202c4f60234 WHIRLPOOL 9adee62199a696595894e04bd953657df3d99fef74a824eb436216ebb3683316ef1fbecca24f6b1a71bec0306c79f9c1a2a8e6b121e651bdcc9ca20f125c06e2 +EBUILD tora-3.0.0_pre20140929.ebuild 2096 SHA256 0516e1842db03a0738719e011b7219bb8fece174d03b9d575d7a627f6a8f0cf2 SHA512 e6fdfa32281ed7faf2267a47179033bc93f171cb518e1549f7fbc20bf7927d42eee1b9e938d912363e9489e9ea2e03dccd8aaeb6d87762dbe917afdb3a08b310 WHIRLPOOL fba6654f154e35250ea19a0f7590c48c1fbd3983e11b736a733de41408c8508e4d5707236637af2b19bf28577e129de6ecb665e51ab8b711cdc930b93151c2eb +EBUILD tora-9999.ebuild 2384 SHA256 a94de71edb5d737984bf94f2f57555ce2d05d176c4bbf3d47257af90240a1206 SHA512 52cfc8c122c03a35253c822a1b2f735804a9e095676f56d50a2e57dab2e19561497c985e9f940ab078f8e3c2d22a454ceed961d7b8418e060b87b7235d0d270e WHIRLPOOL 3ed7235373773cae20b3021962807eb08ba0b3f20f612f250f08f89ca326ad26ee618e75e39709e8dc76427328aaa6ce4caaccda2ff104246a4b60bacfd190c8 +MISC ChangeLog 16859 SHA256 d856efd03cd98e803d2f72d111a00540d36f5b66d58dbc4badaf838bc2a4eddb SHA512 5043f6edabca5a51c1de73fcfb3164db1a7eaf5f3977f2f98dbffb026764b4efbcc237a90942583b5bb07023399f11707e6a3afab9d5c87a5c4de65ade65e4ef WHIRLPOOL de47761f668f9d66739b0d0d3ef2b7b22567d3a19bbe0badef8ad4f868afd9f4cc7d69bedac173fa462eca0dbcd511b456c68ff32e05c3f424c45e7f3975b110 MISC metadata.xml 646 SHA256 98e2edfdf95660f5b4418a33b77d0c62a1dad0f637153aa7cfed7b4706df1a54 SHA512 2ff7adad6598f7f6710a27decacaaaae77091cf85d2a743f958ffb9bc3e267367104fad3b60674d22fb7e6ebdbc10dad01d7aee781e2fc340af46afe117fa434 WHIRLPOOL bd07ea1a4bcfe96421c3381ebdb3d1e2d4d1149e2d13f7c9fde7f3127ae3ff35b53526a219edc2d424d89138fb857f2f55901b5f96ff15d7a6e11cef6916fbbd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJU5wRNAAoJECo/aRed9267Bx0H/iFhSGE7z4WxZmiECd4J+nPs -IS61L0wx/5NLYV45hwg1i567a/nPVaw7xoRPm5wv5lLAw5CROQT2WEy5jn76dw6v -14eWE6oQv0uIUBV5e9S9bompPgn0/QnycuyoVJPhMfDrs20tzNPuCgo9MMRHDP2i -IVc1649y8Ha9GMOV6bIbYu6GCIdt2o0OdcMi+drgdBoCwjaO7cTo1vWSue+ClDnw -hjwBDF9NUj4rf1Shn4TjI6Y99kCjDmK2hvvZVKk0aPuHHhYGTkCtT2sSvHy8Vtrb -OxkAH+Emdg862qL6sIzSqBbLj+w0jSOg5tQ+MNHk4DCl1XKktmhB7tr04CGdPAw= -=wHQ+ +iEYEAREIAAYFAlU9J78ACgkQ/ejvha5XGaMf6ACfRGTCOyFlkXaOmmoR9MVjIcL+ +DcQAoLT4GQNGA7PiQ2snmkMdA2dk2MT3 +=yk7u -----END PGP SIGNATURE----- diff --git a/dev-db/tora/tora-3.0.0_pre20140929.ebuild b/dev-db/tora/tora-3.0.0_pre20140929.ebuild index 8af70844b848..5265ca2505c6 100644 --- a/dev-db/tora/tora-3.0.0_pre20140929.ebuild +++ b/dev-db/tora/tora-3.0.0_pre20140929.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-3.0.0_pre20140929.ebuild,v 1.2 2014/12/29 02:28:25 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-3.0.0_pre20140929.ebuild,v 1.3 2015/04/26 18:00:30 zmedico Exp $ EAPI=5 @@ -54,6 +54,9 @@ src_prepare() { sed -i \ -e "/COPYING/ d" \ CMakeLists.txt || die "Removal of COPYING file failed" + # bug 547520 + grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ + die 'Removal of $$ORIGIN failed' } src_configure() { diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild index c92baa54b283..ecc4338ff7a1 100644 --- a/dev-db/tora/tora-9999.ebuild +++ b/dev-db/tora/tora-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.6 2014/12/28 15:20:50 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.7 2015/04/26 18:00:30 zmedico Exp $ EAPI=5 @@ -55,6 +55,9 @@ src_prepare() { CMakeLists.txt || die "Removal of COPYING file failed" # 'svn info' needs .svn subdirectory [[ ${PV} != 9999 ]] || cp -a "${ESVN_WC_PATH}"/.svn .svn || die + # bug 547520 + grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ + die 'Removal of $$ORIGIN failed' } src_configure() {