Version bump to 1.2.9.1.

Cleaning old ebuilds.
Taking maintainership.
(Portage version: 15321-svn/cvs/Linux ppc)

6 files changed, 78 insertions, 181 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/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
+}