Add missing ifup/ifdown scripts, change install logic, make sure they are not added executable to CVS.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 69 insertions, 9 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 59e85832846b..4a2ce198731e 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.63 2009/05/17 10:40:43 lu_zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.64 2009/05/17 21:20:30 flameeyes Exp $
+
+  17 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> qemu-0.10.3.ebuild,
+  +files/qemu-ifdown, +files/qemu-ifup:
+  Add missing ifup/ifdown scripts, change install logic, make sure they are
+  not added executable to CVS.
 
 *qemu-0.10.3 (17 May 2009)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index d944a784d1a6..31de5a0af7cf 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qemu-0.10.3-nopl-fix.patch 1118 RMD160 849e4b88ca7985dc3faae0a225181205043f0265 SHA1 70cf0727a7cbdd79243ae6768f34c07c6e9c5aec SHA256 24656137f1f38aed2c2661ebd20d9a6d86eaf9768c3e239b971f01418b396028
+AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
+AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 DIST qemu-0.10.3.tar.gz 3661566 RMD160 785262c98fd07431068627284eee400bb962b7ef SHA1 272dbb61ddfdb717982d39472bda1b5fd0b81e9f SHA256 89540d7a8c880a6ae33f8a55d55d580f3f03c10b02e32b7323719b3354f7b077
 EBUILD qemu-0.10.0.ebuild 523 RMD160 3ed38003b3d0f40e4ef5c878b6e179d82e8c7dc3 SHA1 feb4b6f73ad34b5e944bc322313a8e8366f52e63 SHA256 a8fd334edf8d63615a7e556a9d2acd12b91437c00287b2a887515f3d7a563056
 EBUILD qemu-0.10.1.ebuild 523 RMD160 f0bcfa00d5c1d8bb746f77e9e9d8f4a91862f632 SHA1 58e0e0cd1f90ab699fcc3f6f4f280c6515bd6397 SHA256 cb86803cd8fa2985373717c209b4f8bddd5f0ca3de32f3ecce84883468c8a946
-EBUILD qemu-0.10.3.ebuild 4675 RMD160 a0b6e4b30931b3651e8a7750fa96f26cf12ab856 SHA1 8eb2b3cfc26f0e341744a9e9b740d88c42618ecb SHA256 34a96c0bf5d0189b775c10c04a867b5b6f0a058a4448b8dbc6ce2979daf5eb83
+EBUILD qemu-0.10.3.ebuild 4703 RMD160 e852ff28e625bc8f768a188ae71d66dbb23979f0 SHA1 ed61fd6b4a21c8854f4a65e54757c1ed59787521 SHA256 833daa66b0f562fb6649c968ab1447d6b287330175ed7777610297061a71d494
 EBUILD qemu-0.9.0.ebuild 503 RMD160 e6261c120b646da7f2106984ab8a833da1eaa095 SHA1 c4ec2424d608d4b38f395dbfe8f761ba4fbab835 SHA256 baa5050753763d8c20384f22de5e70748b100c66b8aa8a54107917519d00db4c
 EBUILD qemu-0.9.1.ebuild 515 RMD160 51683f0657c0e4ac6fbfa403fa9b81f027c9a830 SHA1 87031abd8579289862a692d32845b131f4cb3e1b SHA256 cd2b063cf0f40a170abfcbe2593ae1a82e99e3262d321a5bfdf02b5b62eab1e9
-MISC ChangeLog 8125 RMD160 c3d7534f0db4839ba763e65150be166489dc84df SHA1 a7228d253cdcb4798e8f0fcb0d5ce3777b00208d SHA256 1caef6a6bb5bdb3964fb772693b5515a838ec0aaffdbf9fe55f18de9096493d1
+MISC ChangeLog 8351 RMD160 42682d79539810476306f6a29638ce9a9f05bb3d SHA1 f680ec323c149567533d9d0c84a961c2a63c4223 SHA256 51c35ae7bd84baecb040bf900a65bb84372dfaa04234e69d924c0a8de1874d5f
 MISC metadata.xml 882 RMD160 259583b24a6eec2cbcca323e754f677041d44d54 SHA1 690460cdb502fd47b51eb1d51938d1c7629f7918 SHA256 8584426258959783d4da117036fa1d773b91b8f90d6a3c1ee7d065446e3d91f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoQf6MACgkQAiZjviIA2XhFxgCfft2Xv/b9Ko+lGVYlvkp6BrfO
+1+gAoK0LZSS4tsQrpEA7tcMpCsmYxjzD
+=Ggnu
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/files/qemu-ifdown b/app-emulation/qemu/files/qemu-ifdown
new file mode 100644
index 000000000000..c173e43a9813
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-ifdown
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ -x /sbin/brctl ]; then
+  BRCTL="/sbin/brctl"
+elif [ -x /usr/sbin/brctl ]; then
+  BRCTL="/usr/sbin/brctl"
+else
+  echo "no bridge utils installed"
+  exit 1
+fi
+
+if [ -x /sbin/ip ]; then
+  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
+  ${BRCTL} delif ${switch} $1
+  /sbin/ip link set $1 down
+else
+  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
+  ${BRCTL} delif ${switch} $1
+  /sbin/ifconfig $1 down
+fi
diff --git a/app-emulation/qemu/files/qemu-ifup b/app-emulation/qemu/files/qemu-ifup
new file mode 100644
index 000000000000..4a30e7d5645f
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-ifup
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ -x /sbin/brctl ]; then
+  BRCTL="/sbin/brctl"
+elif [ -x /usr/sbin/brctl ]; then
+  BRCTL="/usr/sbin/brctl"
+else
+  echo "no bridge utils installed"
+  exit 1
+fi
+
+if [ -x /sbin/ip ]; then
+  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
+  /sbin/ip link set $1 up
+else
+  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
+  /sbin/ifconfig $1 0.0.0.0 up
+fi
+
+[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}"
+${BRCTL} addif ${switch} $1
+
diff --git a/app-emulation/qemu/qemu-0.10.3.ebuild b/app-emulation/qemu/qemu-0.10.3.ebuild
index 46dedf74c178..408298499a98 100644
--- a/app-emulation/qemu/qemu-0.10.3.ebuild
+++ b/app-emulation/qemu/qemu-0.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.3.ebuild,v 1.2 2009/05/17 13:56:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.3.ebuild,v 1.3 2009/05/17 21:20:30 flameeyes Exp $
 
 EAPI="2"
 
@@ -127,10 +127,11 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	insinto /etc/qemu
-	insopts -m0755
-	doins "${FILESDIR}/qemu-ifup"
-	doins "${FILESDIR}/qemu-ifdown"
+	exeinto /etc/qemu
+	doexe \
+		"${FILESDIR}/qemu-ifup" \
+		"${FILESDIR}/qemu-ifdown" \
+		|| die "qemu interface scripts failed"
 
 	dodoc pc-bios/README
 	dodoc qemu-doc.html