diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-02-07 05:39:41 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-02-07 05:39:41 +0000 |
| commit | 57202dc10ecacdd9e3b9e40d0bda8effa147b546 (patch) | |
| tree | 4d4138dac9e5686002a6478d4bbb4752dd0aff43 /app-emulation/virtualbox | |
| parent | Remove old ebuild with broken sys-apps/hwids dep (diff) | |
| download | historical-57202dc10ecacdd9e3b9e40d0bda8effa147b546.tar.gz historical-57202dc10ecacdd9e3b9e40d0bda8effa147b546.tar.bz2 historical-57202dc10ecacdd9e3b9e40d0bda8effa147b546.zip | |
Improved ifconfig location fix
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/virtualbox/Manifest | 30 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.3.6.ebuild | 14 |
3 files changed, 27 insertions, 22 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index 1c136375ffa1..e53eebd7fb2a 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/virtualbox # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.175 2014/01/20 22:33:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.176 2014/02/07 05:39:40 polynomial-c Exp $ + + 07 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.3.6.ebuild: + Improved ifconfig location fix. 20 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.2.22.ebuild, virtualbox-4.3.6.ebuild: diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 135cd5afa265..7361fb05a2fa 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -14,24 +14,24 @@ DIST VirtualBox-4.3.6.tar.bz2 89609199 SHA256 c547e1e32e0b06fba9ee4ca7842f8ddee8 DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb DIST virtualbox-4.3.4-patches-01.tar.xz 3512 SHA256 92602471590278f42db4e13aeb3975620ce0b8f1f883b82a534b6998bb4fc2e3 SHA512 3a487283066b96fb8abc765d446dbc3d3b34ed93a12d932e843b7ecdf644a02fc185f47764cfb3e4b996e104da8e1fc07432892ea126229c174e00f748468496 WHIRLPOOL 19b344f784e866b87c1f7583081746776da5203737bbb284a32b8bcb48a8546286cd209b6749c6c77c08ee02039afcf3838d49d179ae4cc1592ca1fbd5fd5b12 EBUILD virtualbox-4.2.22.ebuild 12300 SHA256 e9edc84dcda2b139a6bce90950c31a56977db718cf8daaa00f42eabcd8028bcc SHA512 c5fba1bb18cd6852fd307e9b7b8f9fb872a7f9ff870eb4e3e978ec2e6ce89a8fd4ee1f6ac5cd9c3bef8324ea304c2962db14bdde20d9f0a7204256cba2ab6244 WHIRLPOOL a7409552e7e4711bd00ca8d26d8041c244a5b6749888b098dd266f30bde147c0036b57e324dadeea5cd4958899229a5206682b606215f4919afe34aa84281572 -EBUILD virtualbox-4.3.6.ebuild 12576 SHA256 61fd74ed24219abc46b2d34bc880083e79ce4d857d29767b162c32e9baaa1e68 SHA512 945f8c716d1fb72309309870826da85ce1b58093e6da8e7ba8ebaf6528bfbe16d3029d82d157c2ed4c6c864b0f1148073b93c4830aa6a32eaf3cd17b7c9cf7f6 WHIRLPOOL 0e5f5d155023b6f0f645753854e9cb40bc8f7be9f218c6e4837b68fe92c9ef7f3f4b3ec5cfd2d46dc3b1bb87468348fc15adf67f6b610e2ab6dd64806addf914 +EBUILD virtualbox-4.3.6.ebuild 12792 SHA256 73ba9d9144e86a7be20658903b042c8872d2a49876cc762e368687e9d4a967f3 SHA512 069903ebab5ad5621000f6a84090e436e49c190d1cb18636f59e0094f523e49b459ae2e997e4e3fea99efe9042b341258fd9bcef86ff3960fbf94d271ffe4bc5 WHIRLPOOL 38e98379a779580a39273f0870e66313bf9b15b3eb325eb819c318969f47733e82bec579608c500202cfc75d68e50280929267997abfaf57347267b0372b1be1 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca -MISC ChangeLog 25581 SHA256 c5e53fe538d35cbd0e8280830297cb245ca2dceb85daa17b560ce213b622dea3 SHA512 dd108f2a0c8f59f8bd03026cef2bf49717aad622da589325a8b08333a4bdb66bf1cec4d5134acf974c248b12515d9cf570b81a6784edb1739153cc13c2837036 WHIRLPOOL b99d2b8ac90c0ff8ca72f3586783f44c5b878ca7ccf290fb56273d579f74acc0408ed37ab44480d13b2f51ecb9d71e415a9ac5226f61d769713297ea2318c65a +MISC ChangeLog 25695 SHA256 df50b892b84e2bbbe04bfbcfa83db3127d362877216c568c48033dc254b85dd9 SHA512 856996e71d76bbd35794b7bffaf8e7ce4569ec51ca848219002fc6ec867f9f5180d207360626ee434809e9fb14b575e0896dce71b7b61170c24cd759bef2055a WHIRLPOOL c83c5b7233a24527e47323b6ef537acc230f67f8f847674e5f02383e05ff21d5558ba61b8e2f18b8efb13696a2f3336690958ba8ca9f626e10660cf80a7d664d MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS3aQxAAoJEPiazRVxLXTFPDMP/2gNNzpnhmvJsjBplUnPlXDT -l+zFuJGLqGsSoolgrKVxkSD5WQRrUsD5pYyDeNliTFqYcB9IkfwbZbhbHV9PWFxJ -fJdDbFPyjat0M/x3ZBdEKh2BPJn9jf+caMODMwv6M5cyc8thkAtnzdZmXGKO5czv -1qUJCUxvYkEsDC2tqgH5bc2s/U8kLk77aICBRYYk95QaInXXsiVTjZ+H3ldrvyWy -CaEznmwx8eW2s/7IturXssr+YJFkn3heurWqBpGuvTk+hkTF7vAxtV6qniSSVL2u -LXSyDsdb2wzr+PXkZcTS0zzPqP9o+vfTTa9dNd9IC/K+cPCZKi7tZNC494T2yBvQ -+sVeBor1OTgUnub8Ldpvpz7C/Ytt0r9+momOiedbAIcS8K7x9aeLk743qPzOHOVQ -GF1ptJud+vChYYKznjIz7bdAy7iYSXrSXWvUgzZMsxF5LIrd8jbsyAX1Z44e3EjI -5+L+BABGvXmwFEh0UZCZ8bh5k5gPQznWrc6fDlbtunTcSHgENdqwzW277Wue7qWK -3x88hQAOKwzPrfOf3hntK7s8DwOmzOir2L0uod3AeptszZHpqlti8ItA8zbWo32F -BmbKzqCvLnAXHkwvyLQOs7Bjcf3Hty/w6yNJttQ+rtQcdCiFVPJKSNnMImbPS0P8 -zY6WKP0aGIIbn1PdGRPy -=UN1x +iQIcBAEBCAAGBQJS9HGdAAoJEPiazRVxLXTFPQoP/3QBqwE21iA5xlMm7ad6w1Ah +dSrFWLdIlhS/edOENi628Mgv/w/qn1CSf+bZg1Iy5CoJDJvhPu/Fu0FYolNSVuua +OjOq/xdiT1BKrasS1rBJKMrgLjGr7ZHh8stbFrYHcE42Ph0kRKUFpYsRpIj94Rmo +o5w3/8pRQNQc0ekvPpks6MIkjXhmAwO6TVZtJMre+Udhe0WrYtQXOt6EZqAuhonw +aveuNqkgp63q9GrU+n+Z5XA52jN4Mzu4JVFtJpwzG86IZVSW+PGp5UeBAL2zNwy4 +bBasNp5PZ3mHuYzgo7krUGxhMkMNf1/UC5tZGwOhtRmnPuwZj8fBip3xIUNwcwgN +Lo8gBryvP4LzZRYyUXSWxyBIH6NzzuR4hLR45RP6CVvjkmVwXAHOB4Mw67VN31BA +hf22zKRlK4pJIMWxEXt5mFS8tHdHVp33LVlcEXWBmitHzJ2XzIxE0evtnHoP77Nb +Tq/XFo4FoFRhS1miASh+ZhrdTfZta0JWIplm8B5ZzBzOAQx0TkjBQpj5xg8W90em +HleU33H6bqVkwdTHD01RkePKs53U4Drnt3ananR+H2bgG5oRVa5MZfAPhsUrRuH8 +8M2EkMGOYL3sqrORghMpIZ8GZBpEt/nIzHp7kXT0McVdbqU33eijO7/CuyduH/r7 +fImmcIoYVaHz7KjtH+iJ +=s/Ll -----END PGP SIGNATURE----- diff --git a/app-emulation/virtualbox/virtualbox-4.3.6.ebuild b/app-emulation/virtualbox/virtualbox-4.3.6.ebuild index 15fb0d0135d5..5eb83138d7f7 100644 --- a/app-emulation/virtualbox/virtualbox-4.3.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.6.ebuild,v 1.2 2014/01/20 22:33:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.6.ebuild,v 1.3 2014/02/07 05:39:40 polynomial-c Exp $ EAPI=5 @@ -178,11 +178,13 @@ src_prepare() { epatch_user # fix location of ifconfig binary (bug #455902) - local ifcfg="$(type -p ifconfig)" - if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then - sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \ - -i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \ - || die + local target_file="src/apps/adpctl/VBoxNetAdpCtl.cpp" + local define_string="VBOXADPCTL_IFCONFIG_PATH" + local vbox_ifcfg="$(grep "^#define ${define_string}" ${target_file} | sed 's@.*"\([[:alpha:]/]\+\)".*@\1@')" #' + local sys_ifcfg="$(type -p ifconfig)" + if [ -n "${vbox_ifcfg}" ] && [ "${ifcfg}" != "${vbox_ifcfg}" ] ; then + sed "/${define_string}/s@${vbox_ifcfg}@${sys_ifcfg}@" \ + -i "${S}/${target_file}" || die fi } |