Remove the internal hesiod support and use the ebuild instead.

Package-Manager: portage-2.1.3.16

3 files changed, 25 insertions, 11 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 831a2cc5ed57..73c0310e0866 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.57 2007/10/23 12:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.58 2007/11/03 02:24:26 uberlord Exp $
+
+  03 Nov 2007; Roy Marples <uberlord@gentoo.org> freebsd-lib-6.2-r3.ebuild:
+  Remove the internal hesiod support and use the ebuild instead.
+
+  03 Nov 2007; Roy Marples <uberlord@gentoo.org> freebsd-lib-6.2-r3.ebuild:
+  Remove the internal hesiod support and use the ebuild instead.
 
 *freebsd-lib-6.2-r3 (23 Oct 2007)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 27fbaf616ce5..30ad57a58de6 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -62,14 +62,14 @@ EBUILD freebsd-lib-6.2-r2.ebuild 8616 RMD160 de6bb6b7ef38810680cef1519fa40b8e294
 MD5 319b49c3f494ecd4e85efdae3b23a959 freebsd-lib-6.2-r2.ebuild 8616
 RMD160 de6bb6b7ef38810680cef1519fa40b8e2945509e freebsd-lib-6.2-r2.ebuild 8616
 SHA256 0daec66251c195bfe5eeb4ab959335900790e026cb185691b555df37644135b1 freebsd-lib-6.2-r2.ebuild 8616
-EBUILD freebsd-lib-6.2-r3.ebuild 9086 RMD160 da5c09eac5a042098cfbca78a89593d6c8b8d368 SHA1 a655706482caa59780a4072c5870230f67d24f6f SHA256 eed310c23b7f88532217b4f727e3094353ec9d21f036a68f4e719408bb5bd0d1
-MD5 6d1cf0c20e5f34e91e84a7750d8d8a70 freebsd-lib-6.2-r3.ebuild 9086
-RMD160 da5c09eac5a042098cfbca78a89593d6c8b8d368 freebsd-lib-6.2-r3.ebuild 9086
-SHA256 eed310c23b7f88532217b4f727e3094353ec9d21f036a68f4e719408bb5bd0d1 freebsd-lib-6.2-r3.ebuild 9086
-MISC ChangeLog 15128 RMD160 1255fd799f12cc3b756074ee300e01da2f23ce94 SHA1 fc4bd957d9ae3f233c56e23787f93abaa0afaace SHA256 7ac19ff51d8b253b63cf45b689912ffc7d63873d32f54e243f577deae40d9878
-MD5 bf56e76e9e94265ccc96e4446da40c25 ChangeLog 15128
-RMD160 1255fd799f12cc3b756074ee300e01da2f23ce94 ChangeLog 15128
-SHA256 7ac19ff51d8b253b63cf45b689912ffc7d63873d32f54e243f577deae40d9878 ChangeLog 15128
+EBUILD freebsd-lib-6.2-r3.ebuild 9434 RMD160 d11640d976717e1f50157e6285b0d85dddf89f72 SHA1 08102d2ca2e3b572aad17987922676cb3e441ff7 SHA256 d514348023cf49851e235f3317f0c6e122d39f89e1079f2347468a9caffd5e43
+MD5 c0d1f05c5708a126e783b63a13a63353 freebsd-lib-6.2-r3.ebuild 9434
+RMD160 d11640d976717e1f50157e6285b0d85dddf89f72 freebsd-lib-6.2-r3.ebuild 9434
+SHA256 d514348023cf49851e235f3317f0c6e122d39f89e1079f2347468a9caffd5e43 freebsd-lib-6.2-r3.ebuild 9434
+MISC ChangeLog 15412 RMD160 b50b2c50964dea0c83b1562a4254e56514870c73 SHA1 eed54d07f6f815953bbcbd43e31cf111bf1b2c5f SHA256 d8c9b46a755f3dc9437a4b6d92e3b5701dc617a166172599a520a9663f3e0069
+MD5 1d56af8455317af178e3c3a4978fb409 ChangeLog 15412
+RMD160 b50b2c50964dea0c83b1562a4254e56514870c73 ChangeLog 15412
+SHA256 d8c9b46a755f3dc9437a4b6d92e3b5701dc617a166172599a520a9663f3e0069 ChangeLog 15412
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
index 6eb6111fa85c..69effa620184 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild,v 1.1 2007/10/23 12:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild,v 1.2 2007/11/03 02:24:26 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="6.0"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
@@ -25,6 +25,7 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
 		kerberos? ( virtual/krb5 )
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
@@ -60,6 +61,7 @@ pkg_setup() {
 
 	use atm || mymakeopts="${mymakeopts} NO_ATM= "
 	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= "
 	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
 	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
 	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
@@ -126,6 +128,12 @@ src_unpack() {
 		rm "${x}".bak
 	done
 
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
 	# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
 	# from catalyst, then don't do anything else
 	if use build; then