Fixed installation of netplug-2 config file (bug #386733)

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

4 files changed, 26 insertions, 19 deletions

diff --git a/sys-apps/netplug/ChangeLog b/sys-apps/netplug/ChangeLog
index 1a9914980923..c7b201fb09a8 100644
--- a/sys-apps/netplug/ChangeLog
+++ b/sys-apps/netplug/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/netplug
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.23 2011/10/03 07:09:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.24 2011/10/11 08:49:38 polynomial-c Exp $
+
+*netplug-1.2.9.2-r1 (11 Oct 2011)
+
+  11 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> -netplug-1.2.9.2.ebuild,
+  +netplug-1.2.9.2-r1.ebuild, +files/netplug-2, -files/netplug.2:
+  Fixed installation of netplug-2 config file. Thanks to Guillaume Castagnino
+  who reported this in bug #386733.
 
 *netplug-1.2.9.2 (03 Oct 2011)
 
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 5e8d95fafa7f..1eb4f66ef4c9 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -7,29 +7,29 @@ AUX netplug-1.2.9-ignore-wireless.patch 938 RMD160 fb97192a4e3d191fc2a96fd6c80fd
 AUX netplug-1.2.9-remove-nest.patch 5516 RMD160 acb52d4967c76d930c1057a835d24d79603ed0e8 SHA1 982e5c31bf3378a67ab0af74bda1e9d684068778 SHA256 282b390c459c1190b55049cc42828916189097faa75695b738a9a6391079a5a4
 AUX netplug-1.2.9-remove-werror.patch 375 RMD160 2e7f73e25551da4b26c42383b685be4dca521c7c SHA1 2e9fd6989bd1e31f2936d46ea7d66eb4463e1633 SHA256 08b43d263f8bbd2200a92a6768099c41f8cb02a4c296fc72b6526520995f9d7e
 AUX netplug-1.2.9-warn_unused_result_write_call.patch 630 RMD160 b79fc5726d2335b6a3c60c5e258df6f97f482c9c SHA1 af63a69810ad7e88b62f952329379a15df8dccad SHA256 21092d1e3be94bb2cb3c080e088b269eb490010783104c9f1850bd58fc3dfdad
-AUX netplug.2 715 RMD160 50cf69d93cef9ede86fbe607f1e1768d847b1f7f SHA1 9f60a42cca39b597ea6c49d681eb5787f3735ff4 SHA256 aaa5549bedfa767d594e76c4fde3b29c2e20c8430a24df13c656b1a2a2a16b5c
+AUX netplug-2 715 RMD160 50cf69d93cef9ede86fbe607f1e1768d847b1f7f SHA1 9f60a42cca39b597ea6c49d681eb5787f3735ff4 SHA256 aaa5549bedfa767d594e76c4fde3b29c2e20c8430a24df13c656b1a2a2a16b5c
 DIST netplug-1.2.9.1.tar.bz2 22288 RMD160 2a21c0c22250cb446fbc4208d79c34e673254a6e SHA1 38ce1ae1815a74d6ab3e7ee0e034714267456d16 SHA256 bcc7d83975e25b8b2148835f21da3e722c1a0d8a84e828b4dbbf685b3086d056
 DIST netplug-1.2.9.2.tar.bz2 22332 RMD160 8754b6d47773dc8ea1811654df9a45285de754f3 SHA1 646041d6d6f988599881b36a722296d6fedcfd99 SHA256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e
 DIST netplug-1.2.9.tar.bz2 21786 RMD160 e3e1f9cd62062fd6bca6ab86059d6eb1b4c986f2 SHA1 bf33f5d01c304306b82ffa2000bb5b0f6d88e37f SHA256 15e7928c819c72108432b0d573110630ff6eb2f7be05e5a6dc1dc04fa05f63b1
 EBUILD netplug-1.2.9-r5.ebuild 1829 RMD160 559346a4cccdb249a307c77f689504ceb5361025 SHA1 b35264c0792ff0a0e443e34429a6b78c407c3646 SHA256 00eef2759c930347859d40b59c53084e1411bba9359f62ea5df3140cfe8d8156
 EBUILD netplug-1.2.9.1.ebuild 1636 RMD160 3d29021a1dc1d0ca51d82d464b98efc2d199816a SHA1 3d118270861be2ea28b72550f330f93e2168a2c0 SHA256 8f097d9f49f2f19546889dbcb46237df4b82adf192fc880cea7feab8d73740e9
-EBUILD netplug-1.2.9.2.ebuild 1506 RMD160 d82f97f80561428907b8640cd93b8fe4223509b2 SHA1 1bb67413b93aa2beae5226c9869bd9ec5b166d8a SHA256 7f68ce330a873c9810557707c0a0dc720ec9877a54c3b51519bb46b3be89ff5b
-MISC ChangeLog 4002 RMD160 312519e9de44c09abf88b21c6be5050b708545b7 SHA1 12d5d09fcd9f6258dfc70d6305c9a247d67fc56c SHA256 1810bc02f6a962fbde54efd8b822cb0d957341e0af01f4cebb29ac764703ac97
+EBUILD netplug-1.2.9.2-r1.ebuild 1518 RMD160 85ba0f4548452d16367a349bb75153b7ecc03c5f SHA1 03f298f3f6c949c40fa23cdce84bc54b89390dc1 SHA256 2d428e4867f78f5a4e0fde546b568187d8c0459ee42140b906aad72d6d13b02d
+MISC ChangeLog 4297 RMD160 fc0f195fa97b7327263a05d4a86a88b98b0faa7a SHA1 2d96ae6f116d17921eb291fa94489386c0953c2d SHA256 749b564258f26f1d469eb7c0b89eeaef6d3e69ad33eacbf697d5b424f6d81292
 MISC metadata.xml 353 RMD160 27e077343cf6693c1157ae9cc3765c1afb19bc08 SHA1 557b857e3b07d8ae70c09db5b034da6191edef77 SHA256 0907dec553f7f4a30b21a2ec89f3574f443dbdda52f066ef47e85de60dc5d257
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOiV+pAAoJEPiazRVxLXTFBiQP/0tocxgHv0sWf63oD7BHoOdf
-TSJyPRVvG+8UnbJ3ziuZ6+vfjB3/Al/tFfnRH2V7PaKsTXeqh05Q1frjastZn7Ud
-gYuPjQhcrirAvTuaA1Mgbl5sUhBX1e1Jl7NWDly2wLIYFwwEwYgycDc1YrPR/pJL
-xqgfuS7PCHDQkRlfzOJ85otZqAQ5sWPuC4Hst6lDuS+si5egbjMXJfTkJHlV2MJw
-WaXAxum0eWddxn7l78jpIqmTNjcNf/zussUi4Z8TEdeHvtqmReFhRAir7mGlQXTY
-ZML9ofzQ5yvmDK32PWO1+5y3ztUtC/sfguFKoMTxa2MLaMSMDR1D3GQ8ysI6ryW4
-dDsjbEi2iQN5hV6tM/Ap/iHkKGIVE2foB9dX6KkZe6TI5u7+IHDY21XD8g6srcHe
-pfRMUch1Nc0CjG7PrlZ+6nN82OCkUFLqI63Ch0Yby08HvbEwbve0c8fZC5QFRCWJ
-U1ISXkPfdLITRTwUCU5aWD9fYrsUaEHrrm4ek+VHXdMkFhnz7xiIMHHGHA2E9WxF
-Zai5xY077bGinBktjn32XFbKkexQPZteqXc5y++kagNz3wZA6ffRD6F/WcKfy8Wz
-pQDQgFjqeauh/D/3w11qSq2Z1jnapCV9nKprmdN0s5xwD4w4ctQZgTnTjWzNJ+cu
-Zn8lZGVh+w3uVppNbeER
-=wxbd
+iQIcBAEBCgAGBQJOlAMnAAoJEPiazRVxLXTFuCoP/AgliH4G6PjQ3Z4qBzhN89yw
+mW0AMaDULz0TKa9rENDuCAdQWTFRokYKGQfyM7z36eolhYCNaqczU0sSpGdMiEFL
+b83O0mwFscbUUhH1BmQcdZo1LA7DkYAH8SUAOZ2vTDSNjhBJToMPulVXlu5LAb4t
+qnvmOO9I8duNcpog9cZUVsekKst36JTIODChue3XZaKa4e0SN1srT4+Jq5Qn1jTL
+AdlTKwxCtavn5f/3MgBQyKyK0RQFAfarOqbJnh+6nCMpgYsZK8yTbQ260qHb/zX1
+qse97hr3DegudjVz4ODp5Qcsh6H+JZk217e/Z7iZrEeuw/auEfi/X1pl72nFAJ94
+8j596HVhW5huX4NBpOUvus6aBwUU6FSzXkqiwGpaGQF0cG3fTYIombKXW9cLGvCC
+ZVWaz4vf6db4FLGXEsHVtRc/TU68Y6ILljUE2B14jAJYEMn/OeOmAgUHAzlal/GA
+E1lYzffN3HFg8LXl4AS2oIVGFnb4YIe0oM6EjPCtxDe7HAeEu3pJfeTwu7maFwuj
+nogjejtZ1j6j1beoX1PYMx2NBUwheU8rrn6p8GaJ551y47E/lIrpGRJKXgLGtq5u
+fslkd6v0X09nnROsyr6t6Gik/jiOXi4tFaQ8wIzPQWvFN3pimYcXfp+rXLyfZXWg
+D733c39EaJMbcmNTU+W3
+=mcQR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/netplug/files/netplug.2 b/sys-apps/netplug/files/netplug-2
index 539f1465516a..539f1465516a 100755
--- a/sys-apps/netplug/files/netplug.2
+++ b/sys-apps/netplug/files/netplug-2
diff --git a/sys-apps/netplug/netplug-1.2.9.2.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
index ab094175328c..6a3fc39b33f1 100644
--- a/sys-apps/netplug/netplug-1.2.9.2.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2.ebuild,v 1.1 2011/10/03 07:09:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild,v 1.1 2011/10/11 08:49:38 polynomial-c Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ src_install() {
 
 	dodir /etc/netplug.d
 	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug.2"
+	newexe "${FILESDIR}/netplug-2" netplug
 
 	dodir /etc/netplug
 	echo "eth*" > "${D}"/etc/netplug/netplugd.conf