Cleanup ebuild and fix building with newer glibc #240916 by Diego E. Pettenò.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

1 files changed, 17 insertions, 21 deletions

diff --git a/net-misc/dibbler/dibbler-0.6.1.ebuild b/net-misc/dibbler/dibbler-0.6.1.ebuild
index a6392cf409c2..6daa9aeddfe2 100644
--- a/net-misc/dibbler/dibbler-0.6.1.ebuild
+++ b/net-misc/dibbler/dibbler-0.6.1.ebuild
@@ -1,50 +1,46 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.6.1.ebuild,v 1.2 2007/09/28 07:20:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-0.6.1.ebuild,v 1.3 2009/01/14 05:04:33 vapier Exp $
 
-inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
 HOMEPAGE="http://klub.com.pl/dhcpv6/"
-
 SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~hppa ~amd64 ~mips"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
 IUSE="doc"
-DEPEND=""
 
-DIBBLER_DOCDIR=${S}/doc
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/^COPTS/s:$: $(CPPFLAGS):' \
+		Makefile.inc || die
+	append-cppflags -D_GNU_SOURCE #240916
+}
 
 src_compile() {
 	emake -j1 || die "Compilation failed"
 }
 
 src_install() {
-	dosbin dibbler-server
-	dosbin dibbler-client
-	dosbin dibbler-relay
-	doman doc/man/dibbler-server.8 doc/man/dibbler-client.8 \
-		doc/man/dibbler-relay.8
+	dosbin dibbler-{client,relay,server} || die
+	doman doc/man/dibbler-{client,relay,server}.8
 	dodoc CHANGELOG RELNOTES
 
 	insinto /etc/dibbler
 	doins *.conf
 	dodir /var/lib/dibbler
 
-	use doc && dodoc ${DIBBLER_DOCDIR}/dibbler-user.pdf \
-			${DIBBLER_DOCDIR}/dibbler-devel.pdf
+	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
 
-	insinto /etc/init.d
-	doins ${FILESDIR}/dibbler-server ${FILESDIR}/dibbler-client \
-		${FILESDIR}/dibbler-relay
-	fperms 755 /etc/init.d/dibbler-server
-	fperms 755 /etc/init.d/dibbler-client
-	fperms 755 /etc/init.d/dibbler-relay
+	use doc && dodoc doc/dibbler-{devel,user}.pdf
 }
 
 pkg_postinst() {
-	einfo "Make sure that you modify client.conf, server.conf and/or relay.conf "
+	einfo "Make sure that you modify client.conf, server.conf and/or relay.conf"
 	einfo "to suit your needs. They are stored in /etc/dibbler."
 }