Version bump to 1.2.9.1.

Cleaning old ebuilds.
Taking maintainership.
Package-Manager: portage-15321-svn/cvs/Linux ppc

7 files changed, 82 insertions, 196 deletions

diff --git a/sys-apps/netplug/ChangeLog b/sys-apps/netplug/ChangeLog
index 265964ea770b..3b90737efb85 100644
--- a/sys-apps/netplug/ChangeLog
+++ b/sys-apps/netplug/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/netplug
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.20 2009/07/13 18:24:16 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.21 2010/02/22 09:50:14 volkmar Exp $
+
+*netplug-1.2.9.1 (22 Feb 2010)
+
+  22 Feb 2010; Mounir Lamouri <volkmar@gentoo.org> -netplug-1.2.9-r2.ebuild,
+  -netplug-1.2.9-r3.ebuild, -netplug-1.2.9-r4.ebuild,
+  +netplug-1.2.9.1.ebuild, metadata.xml:
+  Version bump to 1.2.9.1. Cleaning old ebuilds. Taking maintainership.
 
   13 Jul 2009; Joseph Jezak <josejx@gentoo.org> netplug-1.2.9-r5.ebuild:
   Marked ppc stable for bug #273072.
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index c7bf211e1ca6..2d533cc0de6c 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX netplug 1000 RMD160 2d0fd92cf0283af762db3986af9b32eaa730a9b0 SHA1 ae5a70432593918417d5b5b7104c827751132112 SHA256 35b3e2585a453f1108e9da835e25965bbad978c27b9319dd9c376f72138ee8f9
 AUX netplug-1.2.9-gcc4.patch 362 RMD160 4fe338393c08945451858dc4811d6caa358b2a00 SHA1 870dce484cdab85f90b1a03c4a75e308e23da47b SHA256 ad9ac4a60d041decf945861fc41b48ccd2e1c31dc57fc4c9518cd6f495b6f214
 AUX netplug-1.2.9-ignore-wireless.patch 938 RMD160 fb97192a4e3d191fc2a96fd6c80fd35e22efe7af SHA1 c66d268c737a1eb4ba6741990802a9e92b390845 SHA256 75cf296b40316a387c76db51ab2534426a3784ac8ea1ce94b9f32dddd8a3419a
 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
+DIST netplug-1.2.9.1.tar.bz2 22288 RMD160 2a21c0c22250cb446fbc4208d79c34e673254a6e SHA1 38ce1ae1815a74d6ab3e7ee0e034714267456d16 SHA256 bcc7d83975e25b8b2148835f21da3e722c1a0d8a84e828b4dbbf685b3086d056
 DIST netplug-1.2.9.tar.bz2 21786 RMD160 e3e1f9cd62062fd6bca6ab86059d6eb1b4c986f2 SHA1 bf33f5d01c304306b82ffa2000bb5b0f6d88e37f SHA256 15e7928c819c72108432b0d573110630ff6eb2f7be05e5a6dc1dc04fa05f63b1
-EBUILD netplug-1.2.9-r2.ebuild 1491 RMD160 dca979996b0da610e2b685813de863a96fa1a96d SHA1 f85f3fa345b9283811d9faf9b6c643c01264ae7e SHA256 00f38561c851dbb32ade3995fe818f5ed1fd87192f4a08adedc57f9f95e506dd
-EBUILD netplug-1.2.9-r3.ebuild 1576 RMD160 110704277c51544229f43bbce6b90e621ffd067e SHA1 82a627cae3aa17f4dfdb0d38ffc11af993baf8ee SHA256 bc06a62d16455c89adc3b5aaf2e4f7b5468ec0f34f8aa4b74572741f0ab466fe
-EBUILD netplug-1.2.9-r4.ebuild 1623 RMD160 a1f6750d832d0c3807f8b2d11d948d5d5ff0982c SHA1 329e753576af81238a71b09baf152724cbd5be62 SHA256 35f932d77fa3f0e0316b540acb11cd647df0c144d8bbb1b385112e30b9ae3422
 EBUILD netplug-1.2.9-r5.ebuild 1829 RMD160 559346a4cccdb249a307c77f689504ceb5361025 SHA1 b35264c0792ff0a0e443e34429a6b78c407c3646 SHA256 00eef2759c930347859d40b59c53084e1411bba9359f62ea5df3140cfe8d8156
-MISC ChangeLog 3263 RMD160 cd4640f4b1c87ff064778348dc8a4dd59751ae67 SHA1 8ef3ebc8bcc6c55534c825567f8be84d2f20b54b SHA256 1b8563dfd3243b8b6235a786f1809cbfe5c2413b060615d27fcd3d26e928e315
-MISC metadata.xml 352 RMD160 74234ad9140ea871c51cbd11f78c68b01509ecb3 SHA1 ea32f691a777d867608afe2200c1c9c34b7998de SHA256 87387340ceb587b6eaee2f561386ecdb693508466549092be957092024602991
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpbey8ACgkQcsIHjyDViGQoXwCg12OxSfHK28SZ6akfPd8jTg40
-bSMAnilIFBxDnN04R+HHlDNv7rHFNRXB
-=nSp+
------END PGP SIGNATURE-----
+EBUILD netplug-1.2.9.1.ebuild 1636 RMD160 3d29021a1dc1d0ca51d82d464b98efc2d199816a SHA1 3d118270861be2ea28b72550f330f93e2168a2c0 SHA256 8f097d9f49f2f19546889dbcb46237df4b82adf192fc880cea7feab8d73740e9
+MISC ChangeLog 3541 RMD160 bf41b4f51973f4beb35bbe235b00a7f95b3891c8 SHA1 3a069a034bb6fd8b61c8dc1a44db5dc62ac9feb8 SHA256 a95099bf867530d7fd8e9400d57445d3a9a76a7504ee4594001a3951a6258978
+MISC metadata.xml 372 RMD160 3d538334bd532cdefef555346e50fbacd761cf72 SHA1 6e7a8a45d7e51805da0d7e0aa6e56df872f0e889 SHA256 975584b3fbb19657ccf299088e29fdec5c0dd818c8e427d18e146f80791af539
diff --git a/sys-apps/netplug/metadata.xml b/sys-apps/netplug/metadata.xml
index 45922629bec0..9975ac0b710b 100644
--- a/sys-apps/netplug/metadata.xml
+++ b/sys-apps/netplug/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>volkmar@gentoo.org</email>
+		<name>Mounir Lamouri</name>
 	</maintainer>
 	<longdescription lang="en">
 		Brings up/down ethernet ports automatically with cable detection
diff --git a/sys-apps/netplug/netplug-1.2.9-r2.ebuild b/sys-apps/netplug/netplug-1.2.9-r2.ebuild
deleted file mode 100644
index fa2d9bf36d11..000000000000
--- a/sys-apps/netplug/netplug-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.4 2006/04/30 13:26:23 blubb Exp $
-
-inherit eutils
-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 ppc x86"
-IUSE=""
-
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir "${T}/fakebin"
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}/fakebin/bk"
-	chmod a+x "${T}/fakebin/bk"
-	export PATH="${T}/fakebin:${PATH}"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Remove debugging from Makefile
-	# Remove -O3 if we have -O[0-9] in our CFLAGS
-	local remove=" -ggdb3 "
-	[[ " ${CFLAGS} " == *" -O"[0-9]" "* ]] && remove="${remove}-O3 "
-	sed -i -e "s/${remove}/ /" Makefile
-
-	# Use correct structure for getsockname arg 3
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${P}-remove-nest.patch"
-}
-
-src_compile() {
-	hax_bitkeeper
-	make || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-}
diff --git a/sys-apps/netplug/netplug-1.2.9-r3.ebuild b/sys-apps/netplug/netplug-1.2.9-r3.ebuild
deleted file mode 100644
index 8f23a614ce24..000000000000
--- a/sys-apps/netplug/netplug-1.2.9-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 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-r3.ebuild,v 1.5 2007/07/12 13:46:51 gustavoz Exp $
-
-inherit eutils
-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 ppc sparc x86"
-IUSE=""
-
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir "${T}/fakebin"
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}/fakebin/bk"
-	chmod a+x "${T}/fakebin/bk"
-	export PATH="${T}/fakebin:${PATH}"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Remove debugging from Makefile
-	# Remove -O3 if we have -O[0-9] in our CFLAGS
-	local remove=" -ggdb3 "
-	[[ " ${CFLAGS} " == *" -O"[0-9]" "* ]] && remove="${remove}-O3 "
-	sed -i -e "s/${remove}/ /" Makefile
-
-	# Use correct structure for getsockname arg 3
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${P}-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${P}-ignore-wireless.patch"
-}
-
-src_compile() {
-	hax_bitkeeper
-	make || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-}
diff --git a/sys-apps/netplug/netplug-1.2.9-r4.ebuild b/sys-apps/netplug/netplug-1.2.9-r4.ebuild
deleted file mode 100644
index 32cb8acaea56..000000000000
--- a/sys-apps/netplug/netplug-1.2.9-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 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-r4.ebuild,v 1.3 2008/12/07 11:00:02 vapier Exp $
-
-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=""
-
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir "${T}/fakebin"
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}/fakebin/bk"
-	chmod a+x "${T}/fakebin/bk"
-	export PATH="${T}/fakebin:${PATH}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove debugging from Makefile
-	# Remove -O3 if we have -O[0-9,s] in our CFLAGS
-	local remove=" -ggdb3 "
-	[[ " ${CFLAGS} " == *" -O"[0-9,s]" "* ]] && remove="${remove}-O3 "
-	sed -i -e "s/${remove}/ /" Makefile
-
-	# Use correct structure for getsockname arg 3
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${P}-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${P}-ignore-wireless.patch"
-}
-
-src_compile() {
-	tc-export CC
-	hax_bitkeeper
-	make CC="${CC}" || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-}
diff --git a/sys-apps/netplug/netplug-1.2.9.1.ebuild b/sys-apps/netplug/netplug-1.2.9.1.ebuild
new file mode 100644
index 000000000000..b2caa161ce93
--- /dev/null
+++ b/sys-apps/netplug/netplug-1.2.9.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 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.1.ebuild,v 1.1 2010/02/22 09:50:14 volkmar Exp $
+
+EAPI="2"
+
+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"
+
+	# warn_unused_result of write POSIX function (which can fails)
+	epatch "${FILESDIR}/${PN}-1.2.9-warn_unused_result_write_call.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"
+
+	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
+}