New maintainer. Version bump. New startup script

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

5 files changed, 138 insertions, 12 deletions

diff --git a/sys-apps/netplug/ChangeLog b/sys-apps/netplug/ChangeLog
index 5817aebf6894..1a9914980923 100644
--- a/sys-apps/netplug/ChangeLog
+++ b/sys-apps/netplug/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/netplug
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.22 2010/02/28 18:52:11 volkmar Exp $
+# 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 $
+
+*netplug-1.2.9.2 (03 Oct 2011)
+
+  03 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> +netplug-1.2.9.2.ebuild,
+  +files/netplug.2, metadata.xml:
+  Took over maintenance. Version bump. Thanks to Marco Paolone who reported
+  this in bug #367227. Removed init-ng support. Thanks to Nikoli who provided a
+  working script in bug #373107.
 
   28 Feb 2010; Mounir Lamouri <volkmar@gentoo.org> files/netplug:
   Exit correctly when probe is called. Fix bug 228663
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 3835e72ca0e2..5e8d95fafa7f 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX netplug 1008 RMD160 2ca2f8c42699ed5227d40071275629f116456080 SHA1 1ee3d098a285f66425141c41bceb6af012b3f2fc SHA256 60ece80219a5ded005c4bfdcc82e66407e68725c373422cddf85f5bef6fabb55
 AUX netplug-1.2.9-gcc4.patch 362 RMD160 4fe338393c08945451858dc4811d6caa358b2a00 SHA1 870dce484cdab85f90b1a03c4a75e308e23da47b SHA256 ad9ac4a60d041decf945861fc41b48ccd2e1c31dc57fc4c9518cd6f495b6f214
@@ -7,18 +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
 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
-MISC ChangeLog 3662 RMD160 0fedae89acce777961b4b35ac136986c1803a6f6 SHA1 06511a2c3ff0f719cca467d7999e905082ad0741 SHA256 b0ead50ba2e6a707cadec5ecae8b99c49228461337a61fe51fafb62c27f95c34
-MISC metadata.xml 350 RMD160 cbf16e0312a9fc41d56dfbbeb11babeef0ddf6df SHA1 a99ceededbbc447daa36597173f4b71ebe8d724d SHA256 ab395f6b3962ffdcea055ccdb6a05a5a9d63c55221aa87a6f113d524383dcdec
+EBUILD netplug-1.2.9.2.ebuild 1506 RMD160 d82f97f80561428907b8640cd93b8fe4223509b2 SHA1 1bb67413b93aa2beae5226c9869bd9ec5b166d8a SHA256 7f68ce330a873c9810557707c0a0dc720ec9877a54c3b51519bb46b3be89ff5b
+MISC ChangeLog 4002 RMD160 312519e9de44c09abf88b21c6be5050b708545b7 SHA1 12d5d09fcd9f6258dfc70d6305c9a247d67fc56c SHA256 1810bc02f6a962fbde54efd8b822cb0d957341e0af01f4cebb29ac764703ac97
+MISC metadata.xml 353 RMD160 27e077343cf6693c1157ae9cc3765c1afb19bc08 SHA1 557b857e3b07d8ae70c09db5b034da6191edef77 SHA256 0907dec553f7f4a30b21a2ec89f3574f443dbdda52f066ef47e85de60dc5d257
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sb0ACgkQfXuS5UK5QB0wlAQAnUZMAvhQDGYdxOuU1DBFOeEu
-QT9sL+2aYs6p9myPNzMpFj4ObNHXSEXPoibEpJ2Kpoz5r87+L3OTGd1sZmCTdbdb
-icBf06dAWzcS96zXrJYDw8tsJE/XoYpVNsS9It/8oXjhadB/NR/3AGf4kD2xyWnK
-z63TeTC2+TWV6mCttVA=
-=sNvx
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/netplug/files/netplug.2 b/sys-apps/netplug/files/netplug.2
new file mode 100755
index 000000000000..539f1465516a
--- /dev/null
+++ b/sys-apps/netplug/files/netplug.2
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# Gentoo-specific netplug script
+#
+# This file gets called by netplug when it wants to bring an interface
+# up or down.
+#
+
+IFACE="$1"
+ACTION="$2"
+
+EXEC="/etc/init.d/net.${IFACE}"
+
+case "${ACTION}" in
+	in)
+		ARGS="--quiet start"
+	;;
+	out)
+		ARGS="--quiet stop"
+	;;
+	probe)
+		# Do nothing as we should already be up
+		exit 0
+	;;
+	*)
+		echo "$0: wrong arguments" >&2
+		echo "Call with <interface> <in|out|probe>" >&2
+		exit 1
+	;;
+esac
+
+export IN_BACKGROUND=true
+
+if [ -x "${EXEC}" ]
+then
+	${EXEC} ${ARGS}
+	exit 0
+else
+	logger -t netplug "Error: Couldn't configure ${IFACE}, no ${EXEC} !"
+	exit 1
+fi
diff --git a/sys-apps/netplug/metadata.xml b/sys-apps/netplug/metadata.xml
index dd7901efc224..786355e6ed0d 100644
--- a/sys-apps/netplug/metadata.xml
+++ b/sys-apps/netplug/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>volkmar@gentoo.org</email>
-		<name>Mounir Lamouri</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<longdescription lang="en">
 		Brings up/down ethernet ports automatically with cable detection
diff --git a/sys-apps/netplug/netplug-1.2.9.2.ebuild b/sys-apps/netplug/netplug-1.2.9.2.ebuild
new file mode 100644
index 000000000000..ab094175328c
--- /dev/null
+++ b/sys-apps/netplug/netplug-1.2.9.2.ebuild
@@ -0,0 +1,64 @@
+# 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 $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://www.red-bean.com/~bos/"
+SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE="debug doc"
+
+DEPEND="doc? ( app-text/ghostscript-gpl
+		media-gfx/graphviz )"
+RDEPEND=""
+
+src_prepare() {
+	# Remove debug flags from CFLAGS
+	if ! use debug; then
+		sed -i -e "s/ -ggdb3//" Makefile || die "sed failed"
+	fi
+
+	# Remove -O3 and -Werror from CFLAGS
+	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die "sed failed"
+
+	# Remove nested functions, #116140
+	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
+
+	# Ignore wireless events
+	epatch "${FILESDIR}/${PN}-1.2.9-ignore-wireless.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake CC="${CC}" || die "emake failed"
+
+	if use doc; then
+		emake -C docs/ || die "emake failed"
+	fi
+}
+
+src_install() {
+	into /
+	dosbin netplugd
+	doman man/man8/netplugd.8
+
+	dodir /etc/netplug.d
+	exeinto /etc/netplug.d
+	doexe "${FILESDIR}/netplug.2"
+
+	dodir /etc/netplug
+	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
+
+	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
+
+	if use doc; then
+		dodoc docs/state-machine.ps || die "dodoc failed"
+	fi
+}