Add changes to build on Gentoo/*BSD (from Kiko, bug #132553) and respect CC/CFLAGS/LDFLAGS.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 61 insertions, 14 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index f8abdaebb2b8..f56dda39039d 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/freenet6
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.9 2005/05/01 17:04:02 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.10 2006/05/09 07:35:49 flameeyes Exp $
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org> freenet6-1.0.0.ebuild:
+  Add changes to build on Gentoo/*BSD (from Kiko, bug #132553) and respect
+  CC/CFLAGS/LDFLAGS.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> freenet6-1.0.0.ebuild:
   Stable on ppc.
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index 34bae1d8598e..7d5f4666d721 100644
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -1,6 +1,34 @@
-MD5 bcbcb93ea1596d6d10d31e6601a19cb7 ChangeLog 1320
-MD5 6e45f87a89a820c0121abfd2eb422915 freenet6-1.0.0.ebuild 1307
-MD5 1dd245fdccb36878ec96ffe243dbc46d files/tspc.rc 432
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gentoo.sh 4568 RMD160 73a809912914a3ae2801ca950721b95a1b97da86 SHA1 f7c35ec479fea7781655ff4594472ad9be789cce SHA256 27368bd036888d455abb9ea89ccf3ccced009892d8304691c6201f1346f46f86 size 4568
 MD5 edc450e3ee1fd520d5e2936ca0f0c949 files/gentoo.sh 4568
+RMD160 73a809912914a3ae2801ca950721b95a1b97da86 files/gentoo.sh 4568
+SHA256 27368bd036888d455abb9ea89ccf3ccced009892d8304691c6201f1346f46f86 files/gentoo.sh 4568
+AUX tspc.conf 1532 RMD160 87fe137a06b90007a84bbe55db6d0640aad2cc2c SHA1 6cc7bd14f05e7a20a2ce34e71e45a8ecd77c3ce9 SHA256 3fab7fad677182c2f4a60012502237e6e7fc5fb7ebd42156363a3cdfad3cf69a size 1532
 MD5 deef1b2bb4a22d01f36dbcddee29fbee files/tspc.conf 1532
-MD5 47d9e3a8dbb68c4d7cbaf06669acbe0b files/digest-freenet6-1.0.0 63
+RMD160 87fe137a06b90007a84bbe55db6d0640aad2cc2c files/tspc.conf 1532
+SHA256 3fab7fad677182c2f4a60012502237e6e7fc5fb7ebd42156363a3cdfad3cf69a files/tspc.conf 1532
+AUX tspc.rc 432 RMD160 916631387a3ed7b2ecca677b187ea2461647247a SHA1 f553d69e0330aec6028b8a7a287b364f245a0deb SHA256 09c03028106d56cbb0be183554dd9be3c1603aac3e7f377f886b45c555fdd526 size 432
+MD5 1dd245fdccb36878ec96ffe243dbc46d files/tspc.rc 432
+RMD160 916631387a3ed7b2ecca677b187ea2461647247a files/tspc.rc 432
+SHA256 09c03028106d56cbb0be183554dd9be3c1603aac3e7f377f886b45c555fdd526 files/tspc.rc 432
+DIST freenet6-1.0.0.tgz 330953 RMD160 28c7cceaaea5ffe4b740d09f7dbd4aed5abac69d SHA256 0d834b55538eff2abc569aa5c7831f24525bea56354727d0f6d5933d0e5f1116 size 330953
+EBUILD freenet6-1.0.0.ebuild 1625 RMD160 4cf63b398ff917d459ab02489b8120888f7ad1d3 SHA1 d54888766e30f0a9abe2f11ddfffab420fcab0ec SHA256 9f4bb875d7b2856d6b9a007a90c5354438ec9f88d795ea17bf9964b61aa56725 size 1625
+MD5 39096b7348715da67ccb21891d3a8c71 freenet6-1.0.0.ebuild 1625
+RMD160 4cf63b398ff917d459ab02489b8120888f7ad1d3 freenet6-1.0.0.ebuild 1625
+SHA256 9f4bb875d7b2856d6b9a007a90c5354438ec9f88d795ea17bf9964b61aa56725 freenet6-1.0.0.ebuild 1625
+MISC ChangeLog 1497 RMD160 381ddf9ba2de73d6e1aa03ea1877b66ed2d1022c SHA1 8eee9def7148d1f298254b2e31e6b649ce69d778 SHA256 7f5fd53390c2ce7d576c88f05bc039378d194030356baa0fba7853e68319cc67 size 1497
+MD5 43d85a26de79d3317c082cbe0cc309fc ChangeLog 1497
+RMD160 381ddf9ba2de73d6e1aa03ea1877b66ed2d1022c ChangeLog 1497
+SHA256 7f5fd53390c2ce7d576c88f05bc039378d194030356baa0fba7853e68319cc67 ChangeLog 1497
+MD5 cb720233d965392b57e29e90e0ca48ce files/digest-freenet6-1.0.0 235
+RMD160 fd997b79c7cff4e98c7349221a65ac8e9d640024 files/digest-freenet6-1.0.0 235
+SHA256 66295a2f3adc16dec752df43490e1be3b5bf94a259e6ec114afa8cd56a8e312c files/digest-freenet6-1.0.0 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEYEZbAiZjviIA2XgRAulHAJ4r4GorwIM5o9FJ6P7Gb4zhQLUvJgCfalXO
+YfVd5pEfooNhvfg0FHvf7cA=
+=NA8Q
+-----END PGP SIGNATURE-----
diff --git a/net-misc/freenet6/files/digest-freenet6-1.0.0 b/net-misc/freenet6/files/digest-freenet6-1.0.0
index aaaf67ec7e47..ac5d872da253 100644
--- a/net-misc/freenet6/files/digest-freenet6-1.0.0
+++ b/net-misc/freenet6/files/digest-freenet6-1.0.0
@@ -1 +1,3 @@
 MD5 a2b4edb1d52b874587533b4cf40de1ba freenet6-1.0.0.tgz 330953
+RMD160 28c7cceaaea5ffe4b740d09f7dbd4aed5abac69d freenet6-1.0.0.tgz 330953
+SHA256 0d834b55538eff2abc569aa5c7831f24525bea56354727d0f6d5933d0e5f1116 freenet6-1.0.0.tgz 330953
diff --git a/net-misc/freenet6/freenet6-1.0.0.ebuild b/net-misc/freenet6/freenet6-1.0.0.ebuild
index a56f2188efc1..64f32747d8ae 100644
--- a/net-misc/freenet6/freenet6-1.0.0.ebuild
+++ b/net-misc/freenet6/freenet6-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-1.0.0.ebuild,v 1.7 2005/05/01 17:04:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-1.0.0.ebuild,v 1.8 2006/05/09 07:35:49 flameeyes Exp $
 
 inherit toolchain-funcs
 
@@ -15,18 +15,31 @@ IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/freenet6-client-1.0
+S="${WORKDIR}/freenet6-client-1.0"
+
+pkg_setup() {
+	case ${CHOST} in
+		*-openbsd*)					OS=openbsd ;;
+		*-freebsd* | *-dragonfly*)	OS=freebsd44 ;;
+		*-netbsd*)					OS=netbsd ;;
+		*-linux*)					OS=linux ;;
+		*)
+			die "Unknown target, please report this error after checking your CHOST."
+			;;
+	esac
+}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:gcc -g -I\$(INC) -Wall:$(tc-getCC) -I\$(INC) ${CFLAGS}:" \
+	cd "${S}"
+
+	sed -i -e 's:\$(CC) -c:$(CC) $(CFLAGS) -c:' \
+		-e 's:\$(CC) \$(OBJDIR):$(CC) $(LDFLAGS) $(OBJDIR):' \
 		src/Makefile
 }
 
 src_compile() {
-	emake all target=linux || die "Build Failed"
+	emake all CC="$(tc-getCC)" target="${OS}" || die "Build Failed"
 }
 
 src_install() {
@@ -36,7 +49,7 @@ src_install() {
 	insinto /etc/freenet6
 	doins ${FILESDIR}/tspc.conf
 	exeinto /etc/freenet6/template
-	doexe template/{linux,checktunnel}.sh
+	doexe template/{${OS},checktunnel}.sh
 	doexe ${FILESDIR}/gentoo.sh
 
 	dodoc CONTRIB.txt LEGAL README