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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

3 files changed, 35 insertions, 25 deletions

diff --git a/net-misc/dibbler/ChangeLog b/net-misc/dibbler/ChangeLog
index aaa63d628944..58af14522335 100644
--- a/net-misc/dibbler/ChangeLog
+++ b/net-misc/dibbler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dibbler
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.5 2007/09/26 12:56:55 gmsoft Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/ChangeLog,v 1.6 2009/01/14 05:04:33 vapier Exp $
+
+  14 Jan 2009; Mike Frysinger <vapier@gentoo.org> dibbler-0.6.1.ebuild:
+  Cleanup ebuild and fix building with newer glibc #240916 by Diego E.
+  Pettenò.
 
 *dibbler-0.6.1 (26 Sep 2007)
 
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index c204e5b521f9..360007073b8b 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dibbler-client 465 RMD160 9759e5829ffb125d94e7cfcdeb74941614fbc5b1 SHA1 bd0024eca4b4235ecb284ffdf02e6ff9b5fe674e SHA256 c0df2b8ea3968f1cd9edeeb20db3e65007b99cf52fb63a881308e9bea7849f34
 AUX dibbler-gcc-4.1.patch 3060 RMD160 19f2e33883a25de72a51b8b4ef4ddb39df3550a2 SHA1 8764f2172a8b1345851614709a32e1150b84d672 SHA256 1aa53cfabc920d53595ce33da6d6442bad19497927fa92cd20df758feae31b8e
 AUX dibbler-relay 458 RMD160 58a786468cf2dd2a74a3c3ba45d4263fee375e5d SHA1 2e1d26b5c794cebeb7464713a742726e0ce86b9e SHA256 8776df7bd9a016e6f41f67e89a4ecc44720717f7a3ca0a528550bf3739339a2a
@@ -6,6 +9,13 @@ DIST dibbler-0.4.1-doc.tar.gz 1251723 RMD160 9b9ab0deaf1d39aaac2664df2fc50f4b15b
 DIST dibbler-0.4.1-src.tar.gz 1158094 RMD160 c15e11ce662ec15a5b6415d9d5e4d8442f1e2249 SHA1 eeed627552998c61bb9a0dcf5cf99e89a133ebcc SHA256 2db4ceeab37d2f7c8169cc1eab45b472bf285e0bdff54c71cf019beebe12d872
 DIST dibbler-0.6.1-src.tar.gz 3526327 RMD160 ff26000c565892e4ee1f9c3feaeef90f611c5d1d SHA1 0518c28e9ebe6033312afc4b94fb0d8d0877d372 SHA256 010bef6c96ff65a57887b9cb92c65b173241fece0d10f378f1186b45c3644cab
 EBUILD dibbler-0.4.1.ebuild 1328 RMD160 01a5200fe30941bc188b2a5c5aa361c197fbcd19 SHA1 a14fba7d895c6a5637d68bc187a2debdbfb5706b SHA256 b01f9f977e4e862969ca97b7d0a4ee53e143b0ea8c22d6deec19fbf01a550e7b
-EBUILD dibbler-0.6.1.ebuild 1319 RMD160 eb7aba206867966920d7efa2264e6ce6978a5a7c SHA1 80c7ca2c72750e52baac9e6be91065caec13dd95 SHA256 13597d65de2678906b574f191f751f38f27195c0100c31a2ce57441c24af630b
-MISC ChangeLog 963 RMD160 69393e8bbabaeb1071ce07baf7b34a0cbbedb1a3 SHA1 c123e5035deb5573987ee2f7fba7a6024f4c654d SHA256 6a6ff8ef324dffdab3eae95bebfd0f2195f0f211ee792fd234d77d67ceaf89f1
+EBUILD dibbler-0.6.1.ebuild 1150 RMD160 7baf227f4d83c49365bb91b96a509165c9f85fb2 SHA1 0374fee6da41cd01a12e1be6611c62be879005a6 SHA256 ab35cc37475b3d81bfccdf864f533af6055ab40c4516a7975a3053727be3760a
+MISC ChangeLog 1119 RMD160 a9908cd2d685008ff5ddb3df1106ebe1b87b0f9d SHA1 8bb341148363e401274982822d8c4a83e7ee60b5 SHA256 a4a50136d5d204edb8296324935c2c1dffd9b2de23bcc57d19133050d311ab5e
 MISC metadata.xml 218 RMD160 71a28189c9d3426d276c9ae30660974affed6ee6 SHA1 2b73e2d0c0bd84c1c146065f388f31daad4f78b6 SHA256 b1c948a258ba1e487520fb9c146c905307151f4d18a5f0dea44d504895d0164f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkltcmcACgkQn/5bYzqsSmEpBACdGX4GVAU304KMy7gtRo4FcYDn
+QMUAnRjn9SaKiznv5dVyYjp5I9FKwqWW
+=Sjxn
+-----END PGP SIGNATURE-----
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."
 }