Version bump; 0.25 stable on x86. Major cleanup and uncrustification; old ebuilds/filesdir cruft removed. doxygen dep removed as it was never required in the first place. Also updated metadata.xml.

15 files changed, 164 insertions, 319 deletions

diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index 60a100f02acc..8354e666914b 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/ifplugd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.12 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.13 2004/12/20 13:57:11 ka0ttic Exp $
+
+*ifplugd-0.26 (20 Dec 2004)
+
+  20 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  -files/gentoo-ifplugd-init-v2, +files/ifplugd-0.26-gentoo.diff,
+  ifplugd-0.13-r1.ebuild, -ifplugd-0.15.ebuild, -ifplugd-0.20.ebuild,
+  -ifplugd-0.24.ebuild, ifplugd-0.25.ebuild, +ifplugd-0.26.ebuild:
+  Version bump; 0.25 stable on x86. Major cleanup and uncrustification; old
+  ebuilds/filesdir cruft removed. Doxygen removed from deps as it was never
+  required in the first place. Also updated metadata.xml.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   ifplugd-0.20.ebuild, ifplugd-0.24.ebuild, ifplugd-0.25.ebuild:
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 12781a38d7a8..dd14b6c04c76 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -1,18 +1,24 @@
-MD5 75fe3dc874a6aaba4389eb78d45ce90b ChangeLog 2250
-MD5 9bb82fd3fcd35f85635432c619541cb0 ifplugd-0.13-r1.ebuild 975
-MD5 d9ea6dc512ab39327a9b6b664e69d725 ifplugd-0.15.ebuild 1468
-MD5 98afa5f95b29c4d3945c89e44a044479 ifplugd-0.20.ebuild 1659
-MD5 d3b7e12b11bcb4bfbb9e59326012272b ifplugd-0.24.ebuild 1742
-MD5 5f5de2061981f7adabe5ea73ba55af9a ifplugd-0.25.ebuild 1765
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1b861d571aed96fc06f363f318fa7f98 files/digest-ifplugd-0.13-r1 63
-MD5 ed84e9ddf90cec9fd2bba39a6aca4652 files/digest-ifplugd-0.15 64
-MD5 085ed0911e79c8f6a2f03c4d02602ee8 files/digest-ifplugd-0.20 64
-MD5 692d07775953a0ee60e6e475db87276c files/digest-ifplugd-0.24 64
-MD5 fb5b08b163ee5cef2761fa8c851c33c2 files/digest-ifplugd-0.25 64
-MD5 46b7e993f02c5071a712a6a137de977a files/gentoo-ifplugd-conf-v3 2250
-MD5 ed17e2b15df0b976e99d2bc43d7f7036 files/gentoo-ifplugd-init-v2 1318
-MD5 3043ebbf928500cc8373f329d48eba7f files/gentoo-ifplugd-init-v3 2661
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5528ab08db465547d886dfdc734b5e30 ifplugd-0.25.ebuild 1676
+MD5 376b334ea4357ce4d2e063335dee7c35 ifplugd-0.13-r1.ebuild 962
+MD5 2cd0d3374f0361b2f1d5636598e2f666 ifplugd-0.26.ebuild 1444
+MD5 4d16bdf9a20b8629c6995fe359286875 ChangeLog 2755
+MD5 f452b142802fc6ec5d75004af15d01e6 metadata.xml 258
 MD5 0f11772693878629fb851b68920004c5 files/gentoo-ifplugd.action-v2 703
-MD5 69b2ed677c0524a1c6dd321e8ce5a6f0 files/ifplugd 892
+MD5 d1e98cefa277ba313dd66e04563a2225 files/ifplugd-0.26-gentoo.diff 1557
 MD5 d0a4a1e77a6aae59935cfd6d150ee3b7 files/ifplugd.action 583
+MD5 3043ebbf928500cc8373f329d48eba7f files/gentoo-ifplugd-init-v3 2661
+MD5 46b7e993f02c5071a712a6a137de977a files/gentoo-ifplugd-conf-v3 2250
+MD5 69b2ed677c0524a1c6dd321e8ce5a6f0 files/ifplugd 892
+MD5 fb5b08b163ee5cef2761fa8c851c33c2 files/digest-ifplugd-0.25 64
+MD5 6f22a4f464e4c07ea9220fb81ba6848a files/digest-ifplugd-0.26 64
+MD5 1b861d571aed96fc06f363f318fa7f98 files/digest-ifplugd-0.13-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBxtpBEZCkKN40op4RAt+DAJ94ozWJ+Yf0OZM5y947wuDulGJ22QCgoEGO
+y0A2j6K7m62V1r3pHwtflrA=
+=yRJq
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.15 b/sys-apps/ifplugd/files/digest-ifplugd-0.15
deleted file mode 100644
index d77ec5c1646c..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1439df09fc8e8c7516f08bf889742615 ifplugd-0.15.tar.gz 112731
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.20 b/sys-apps/ifplugd/files/digest-ifplugd-0.20
deleted file mode 100644
index c45cfd6edb4a..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d259502c75f5ea9aebcd57c1a3d0739 ifplugd-0.20.tar.gz 128798
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.24 b/sys-apps/ifplugd/files/digest-ifplugd-0.24
deleted file mode 100644
index cf4d76ba7862..000000000000
--- a/sys-apps/ifplugd/files/digest-ifplugd-0.24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e077079c3ff229e6ff74ddbc6b20a5ae ifplugd-0.24.tar.gz 137871
diff --git a/sys-apps/ifplugd/files/digest-ifplugd-0.26 b/sys-apps/ifplugd/files/digest-ifplugd-0.26
new file mode 100644
index 000000000000..3e81a2bee88c
--- /dev/null
+++ b/sys-apps/ifplugd/files/digest-ifplugd-0.26
@@ -0,0 +1 @@
+MD5 f0ceac6690b02928015aa00c0d3e663b ifplugd-0.26.tar.gz 138914
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2 b/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2
deleted file mode 100644
index f57f4d23b38e..000000000000
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd-init-v2,v 1.3 2004/07/15 00:43:53 agriffis Exp $
-
-#NB: Config is in /etc/conf.d/ifplugd
-
-opts="stop start status suspend resume"
-
-IFPLUGD=/usr/sbin/ifplugd
-
-[ -z "$INTERFACES" ] && INTERFACES="eth0"
-[ "$INTERFACES" = "auto" ] && INTERFACES=`cat /proc/net/dev | awk '{ print $1 }' | grep ^eth | cut -d: -f1`
-
-# Handle starting for all interfaces
-# $1 is extra args, $2 is action name
-do_all_if() {
-	local status
-	for IF in $INTERFACES ; do
-		echo -n "$IF "
-		$IFPLUGD $1 -i $IF $ARGS
-		status=$?
-		[ $status -ne 0 ] && break
-	done
-	echo
-	eend $status "Couldn't $2 ifplugd for $IF"
-}
-	
-start() {
-	einfon "Starting ifplugd: "
-	do_all_if "" start
-}
-
-stop() {
-	einfon "Stopping ifplugd: "
-	do_all_if -k stop
-	# Now we have to wait until it's actually down
-	local i=10
-	while [ $i -gt 0 ] && status | grep -q "running as"; do
-		i=$(( $i - 1 ))
-		sleep 1
-	done
-	if [ $i -eq 0 ]; then
-		eend 1 "Timeout exceeded, ifplugd won't die!"
-	fi
-}
-
-status() {
-	do_all_if -c "get status from"
-}
-
-suspend() {
-	einfon "Suspending ifplugd: "
-	do_all_if -S suspend
-}
-
-resume() {
-	einfon "Resuming ifplugd: "
-	do_all_if -R resume
-}
-# vim:ts=4
diff --git a/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff b/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
new file mode 100644
index 000000000000..800d94849d98
--- /dev/null
+++ b/sys-apps/ifplugd/files/ifplugd-0.26-gentoo.diff
@@ -0,0 +1,36 @@
+diff -urN ifplugd-0.26.orig/configure ifplugd-0.26/configure
+--- ifplugd-0.26.orig/configure	2004-12-20 08:39:14.684706181 -0500
++++ ifplugd-0.26/configure	2004-12-20 08:39:50.184734260 -0500
+@@ -3644,7 +3644,7 @@
+ 
+ # If using GCC specify some additional parameters
+ if test "x$GCC" = "xyes" ; then
+-   CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
++   CFLAGS="$CFLAGS -W -Wall"
+ 
+    cat >conftest.$ac_ext <<_ACEOF
+ int main() {}
+diff -urN ifplugd-0.26.orig/src/ifplugd.c ifplugd-0.26/src/ifplugd.c
+--- ifplugd-0.26.orig/src/ifplugd.c	2004-12-20 08:39:14.682706517 -0500
++++ ifplugd-0.26/src/ifplugd.c	2004-12-20 08:40:56.903506651 -0500
+@@ -64,7 +64,7 @@
+ 	interface_do_message = 1;
+ 
+ char *interface = NULL;
+-char *run = SYSCONFDIR"/ifplugd/ifplugd.action";
++char *run = SYSCONFDIR"/usr/sbin/ifplugd.action";
+ char *extra_arg = NULL;
+ 
+ int polltime = 1,
+diff -urN ifplugd-0.26.orig/src/nlapi.c ifplugd-0.26/src/nlapi.c
+--- ifplugd-0.26.orig/src/nlapi.c	2004-12-20 08:39:14.682706517 -0500
++++ ifplugd-0.26/src/nlapi.c	2004-12-20 08:39:50.185734092 -0500
+@@ -86,7 +86,7 @@
+         for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
+             struct callback_info *c;
+             
+-            if (!NLMSG_OK(p, bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < p->nlmsg_len) {
++            if (!NLMSG_OK(p, (size_t) bytes) || (size_t) bytes < sizeof(struct nlmsghdr) || (size_t) bytes < (size_t) p->nlmsg_len) {
+                 daemon_log(LOG_ERR, "NLAPI: Packet too small or truncated!\n");
+                 return -1;
+             }
diff --git a/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild b/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
index ccd02eaa76c5..24b9b364a1bc 100644
--- a/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild
@@ -1,40 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild,v 1.5 2004/06/24 22:11:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.13-r1.ebuild,v 1.6 2004/12/20 13:57:11 ka0ttic Exp $
 
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.stud.uni-hamburg.de/users/lennart/projects/ifplugd"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE=""
-DEPEND=""
-#RDEPEND=""
 
-S=${WORKDIR}/ifplugd
+DEPEND=">=sys-apps/sed-4"
+
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	perl -pi.orig -e 's:^CFLAGS=.*$:CFLAGS='"${CFLAGS}:" Makefile
-	perl -pi.orig -e 's:/etc/ifplugd/ifplugd.action:/usr/sbin/ifplugd.action:' ifplugd.c
-}
-
-src_compile() {
-	emake
+	sed -i -e "s|\(^CFLAGS=\).*$|\1${CFLAGS}|" Makefile \
+		-e 's:/etc/ifplugd/ifplugd.action:/usr/sbin/ifplugd.action:' ifplugd.c \
+		|| die "sed failed"
 }
 
 src_install() {
 	dosbin ifplugd ${FILESDIR}/ifplugd.action ifstatus
 	doman ifplugd.8 ifstatus.8
 
-	dodir /etc/conf.d
-	mv ifplugd.conf ${D}/etc/conf.d/ifplugd
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/ifplugd
+	insinto /etc/conf.d ; newins ifplugd.conf ifplugd
+	exeinto /etc/init.d ; doexe ${FILESDIR}/ifplugd
 
 	dodoc README SUPPORTED_DRIVERS FAQ NEWS
 }
diff --git a/sys-apps/ifplugd/ifplugd-0.15.ebuild b/sys-apps/ifplugd/ifplugd-0.15.ebuild
deleted file mode 100644
index c4f4bd41d604..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.15.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.15.ebuild,v 1.6 2004/07/15 01:47:49 agriffis Exp $
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.stud.uni-hamburg.de/users/lennart/projects/ifplugd"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-DEPEND="dev-libs/libdaemon"
-
-# Gentoo-provided scripts. Version is for the scripts, not ifplugd.
-INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v2
-ACTIONSCRIPT=${FILESDIR}/gentoo-ifplugd.action-v2
-
-src_unpack() {
-	unpack ${A}
-
-	cp ${ACTIONSCRIPT} ${T}/ifplugd.action
-	cp ${INITSCRIPT} ${T}/ifplugd
-
-	cd ${S}
-	# This moves the default location for the script that handles
-	# calling the distro network scripts to /usr/sbin. The reason
-	# is that the user probably shouldn't mess with it.
-	sed -i~ 's:SYSCONFDIR"/ifplugd/:"/usr/sbin/:' src/ifplugd.c
-	# Remove the -w startup option; it gives an unwanted error return
-	sed -i~ 's/ -w//' conf/ifplugd.conf
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	use doc && dohtml doc/*.html doc/*.css
-
-	# Fix init.d configuration
-	dodir /etc/conf.d
-	cd ${D}/etc
-	# rc config file
-	mv ifplugd/ifplugd.conf conf.d/ifplugd
-	rm -rf ifplugd/
-	rm -f init.d/ifplugd
-
-	dosbin ${T}/ifplugd.action
-
-	exeinto /etc/init.d
-	doexe ${T}/ifplugd
-}
diff --git a/sys-apps/ifplugd/ifplugd-0.20.ebuild b/sys-apps/ifplugd/ifplugd-0.20.ebuild
deleted file mode 100644
index 75e955c941d9..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.20.ebuild,v 1.5 2004/09/03 21:03:23 pvdabeel Exp $
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ppc"
-IUSE="doc"
-DEPEND=">=dev-libs/libdaemon-0.3
-	doc? ( app-doc/doxygen net-www/lynx )"
-
-# Gentoo-provided scripts. Version is for the scripts, not ifplugd.
-INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v3
-ACTIONSCRIPT=${FILESDIR}/gentoo-ifplugd.action-v2
-CONFFILE=${FILESDIR}/gentoo-ifplugd-conf-v3
-
-src_unpack() {
-	unpack ${A}
-
-	cp ${INITSCRIPT} ${T}/ifplugd
-	cp ${ACTIONSCRIPT} ${T}/ifplugd.action
-
-	# This moves the default location for the script that handles
-	# calling the distro network scripts to /usr/sbin. The reason
-	# is that the user very probably shouldn't mess with it.
-	cd ${S}
-	sed -i~ 's:SYSCONFDIR"/ifplugd/:"/usr/sbin/:' src/ifplugd.c
-}
-
-src_compile() {
-	local myconf
-
-	# These are not needed for building
-	myconf="--disable-xmltoman --disable-subversion"
-
-	use doc \
-		&& myconf="${myconf} --enable-doxygen --enable-lynx" \
-		|| myconf="${myconf} --disable-doxygen --disable-lynx"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	# Fix init.d configuration
-	cd ${D}/etc
-	rm -rf ifplugd/
-	rm -f init.d/ifplugd
-
-	use doc && dohtml doc/*.html doc/*.css
-
-	dodir /etc/conf.d
-	cp ${CONFFILE} conf.d/ifplugd
-
-	dosbin ${T}/ifplugd.action
-
-	exeinto /etc/init.d
-	doexe ${T}/ifplugd
-}
diff --git a/sys-apps/ifplugd/ifplugd-0.24.ebuild b/sys-apps/ifplugd/ifplugd-0.24.ebuild
deleted file mode 100644
index 6adaec36fbf7..000000000000
--- a/sys-apps/ifplugd/ifplugd-0.24.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.24.ebuild,v 1.3 2004/09/03 21:03:23 pvdabeel Exp $
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
-SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ppc"
-IUSE="doc"
-DEPEND=">=dev-libs/libdaemon-0.5
-	doc? ( app-doc/doxygen net-www/lynx )"
-
-# Gentoo-provided scripts. Version is for the scripts, not ifplugd.
-INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v3
-ACTIONSCRIPT=${FILESDIR}/gentoo-ifplugd.action-v2
-CONFFILE=${FILESDIR}/gentoo-ifplugd-conf-v3
-
-src_unpack() {
-	unpack ${A}
-
-	cp ${INITSCRIPT} ${T}/ifplugd
-	cp ${ACTIONSCRIPT} ${T}/ifplugd.action
-
-	# This moves the default location for the script that handles
-	# calling the distro network scripts to /usr/sbin. The reason
-	# is that the user very probably shouldn't mess with it.
-	cd ${S}
-	sed -i~ 's:SYSCONFDIR"/ifplugd/:"/usr/sbin/:' src/ifplugd.c
-}
-
-src_compile() {
-	local myconf
-
-	# These are not needed for building
-	myconf="--disable-xmltoman --disable-subversion"
-	myconf="${myconf} --with-initdir=${D}/etc/init.d"
-
-	use doc \
-		&& myconf="${myconf} --enable-doxygen --enable-lynx" \
-		|| myconf="${myconf} --disable-doxygen --disable-lynx"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	# Fix init.d configuration
-	cd ${D}/etc
-	rm -rf ifplugd/
-	rm -f init.d/ifplugd
-
-	use doc && dohtml doc/*.html doc/*.css
-
-	dodir /etc/conf.d
-	cp ${CONFFILE} conf.d/ifplugd
-
-	dosbin ${T}/ifplugd.action
-
-	exeinto /etc/init.d
-	doexe ${T}/ifplugd
-}
diff --git a/sys-apps/ifplugd/ifplugd-0.25.ebuild b/sys-apps/ifplugd/ifplugd-0.25.ebuild
index 9359a3f7811d..91186504c4b2 100644
--- a/sys-apps/ifplugd/ifplugd-0.25.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.25.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.25.ebuild,v 1.4 2004/09/03 21:03:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.25.ebuild,v 1.5 2004/12/20 13:57:11 ka0ttic Exp $
 
-IUSE="doc"
 
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
 HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
 SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ppc"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ppc"
+IUSE="doc"
 
-DEPEND=">=dev-libs/libdaemon-0.5
+DEPEND=">=sys-apps/sed-4
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen net-www/lynx )"
+	doc? ( net-www/lynx )"
+RDEPEND=">=dev-libs/libdaemon-0.5"
 
 # Gentoo-provided scripts. Version is for the scripts, not ifplugd.
 INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v3
@@ -23,47 +24,34 @@ CONFFILE=${FILESDIR}/gentoo-ifplugd-conf-v3
 
 src_unpack() {
 	unpack ${A}
-
-	cp ${INITSCRIPT} ${T}/ifplugd
-	cp ${ACTIONSCRIPT} ${T}/ifplugd.action
-
+	cd ${S}
 	# This moves the default location for the script that handles
 	# calling the distro network scripts to /usr/sbin. The reason
 	# is that the user very probably shouldn't mess with it.
-	cd ${S}
-	sed -i~ 's:SYSCONFDIR"/ifplugd/:"/usr/sbin/:' src/ifplugd.c
+	sed -i 's:SYSCONFDIR"/ifplugd/:"/usr/sbin/:' src/ifplugd.c \
+		|| die "sed failed"
 }
 
 src_compile() {
-	local myconf
-
-	# These are not needed for building
-	myconf="--disable-xmltoman --disable-subversion"
-	myconf="${myconf} --with-initdir=${D}/etc/init.d"
-
-	use doc \
-		&& myconf="${myconf} --enable-doxygen --enable-lynx" \
-		|| myconf="${myconf} --disable-doxygen --disable-lynx"
-
-	econf ${myconf} || die
-	emake || die
+	econf $(use_enable doc lynx) \
+		--with-initdir=/etc/init.d \
+		--disable-xmltoman \
+		--disable-subversion \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die "make install failed"
+	newsbin ${ACTIONSCRIPT} ifplugd.action
 
 	# Fix init.d configuration
-	cd ${D}/etc
-	rm -rf ifplugd/
-	rm -f init.d/ifplugd
-
-	use doc && dohtml doc/*.html doc/*.css
-
-	dodir /etc/conf.d
-	cp ${CONFFILE} conf.d/ifplugd
+	rm -fr ${D}/etc/ifplugd ${D}/etc/init.d/ifplugd
 
-	dosbin ${T}/ifplugd.action
+	insinto /etc/conf.d ; newins ${CONFFILE} ${PN} || die
+	exeinto /etc/init.d ; newexe ${INITSCRIPT} ${PN} || die
 
-	exeinto /etc/init.d
-	doexe ${T}/ifplugd
+	cd ${S}/doc
+	dodoc README SUPPORTED_DRIVERS
+	use doc && dohtml *.{html,css}
 }
diff --git a/sys-apps/ifplugd/ifplugd-0.26.ebuild b/sys-apps/ifplugd/ifplugd-0.26.ebuild
new file mode 100644
index 000000000000..ac9ea8b60134
--- /dev/null
+++ b/sys-apps/ifplugd/ifplugd-0.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.26.ebuild,v 1.1 2004/12/20 13:57:11 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
+HOMEPAGE="http://0pointer.de/lennart/projects/ifplugd/"
+SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc"
+
+DEPEND="dev-util/pkgconfig
+	doc? ( net-www/lynx )"
+RDEPEND=">=dev-libs/libdaemon-0.5"
+
+# Gentoo-provided scripts. Version is for the scripts, not ifplugd.
+INITSCRIPT=${FILESDIR}/gentoo-ifplugd-init-v3
+ACTIONSCRIPT=${FILESDIR}/gentoo-ifplugd.action-v2
+CONFFILE=${FILESDIR}/gentoo-ifplugd-conf-v3
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	econf $(use_enable doc lynx) \
+		--with-initdir=/etc/init.d \
+		--disable-xmltoman \
+		--disable-subversion \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	newsbin ${ACTIONSCRIPT} ifplugd.action
+
+	# Fix init.d configuration
+	rm -fr ${D}/etc/ifplugd ${D}/etc/init.d/ifplugd
+
+	insinto /etc/conf.d ; newins ${CONFFILE} ${PN} || die
+	exeinto /etc/init.d ; newexe ${INITSCRIPT} ${PN} || die
+
+	cd ${S}/doc
+	dodoc README SUPPORTED_DRIVERS
+	use doc && dohtml *.{html,css}
+}
diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index 96a2d586367d..e21d1ba7fea4 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>