QA fix and version bump as per bug #69279.

5 files changed, 79 insertions, 10 deletions

diff --git a/net-misc/l7-protocols/ChangeLog b/net-misc/l7-protocols/ChangeLog
index 14d96818c323..9f1c0bc6aac1 100644
--- a/net-misc/l7-protocols/ChangeLog
+++ b/net-misc/l7-protocols/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/l7-protocols
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.3 2004/09/19 00:20:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.4 2004/12/02 10:57:59 dragonheart Exp $
+
+*l7-protocols-2004.11.28 (02 Dec 2004)
+
+  02 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  l7-protocols-2004.09.13.ebuild, +l7-protocols-2004.11.28.ebuild:
+  QA fix and version bump as per bug #69279. ${tc-getCC} and bad nomirror fixes.
+  Thanks Spanky
 
 *l7-protocols-2004.09.13 (19 Sep 2004)
 
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
index ba19893d894d..8e5be77aee32 100644
--- a/net-misc/l7-protocols/Manifest
+++ b/net-misc/l7-protocols/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
-MD5 4b4761ab3744b1baef1c792df9ed48e7 ChangeLog 824
-MD5 d37ed882399834cc88ce0d562719002a l7-protocols-2004.09.13.ebuild 1497
+MD5 5c8c85294b325d2aebabcf746e1306a2 ChangeLog 1082
+MD5 8ea9e9e2c207b1befddc550d7e2d4747 l7-protocols-2004.11.28.ebuild 1508
+MD5 3bd1756f513852327b11b91c6880c392 l7-protocols-2004.09.13.ebuild 1508
 MD5 c259f63137c6b8ea57503b096bea55c1 files/digest-l7-protocols-2004.09.13 74
+MD5 e2e2ce8241adcb9567fc998a42740601 files/digest-l7-protocols-2004.11.28 74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBTNDymdTrptrqvGERAqV0AJ9P38HkCnJXEAHtcmNMlYfF/hOSWACgi5BY
-/irPExh1zUgt8webKEneXRE=
-=nxwV
+iD8DBQFBrvU9mdTrptrqvGERAg2NAJ9ghcXjqMjzJOabaPihzaH9nZrungCfaWOE
+3j1U0h1YSmTHJBA5SPy7GA4=
+=nP71
 -----END PGP SIGNATURE-----
diff --git a/net-misc/l7-protocols/files/digest-l7-protocols-2004.11.28 b/net-misc/l7-protocols/files/digest-l7-protocols-2004.11.28
new file mode 100644
index 000000000000..c93da6b34533
--- /dev/null
+++ b/net-misc/l7-protocols/files/digest-l7-protocols-2004.11.28
@@ -0,0 +1 @@
+MD5 52d21924b1c142c86cb90a69302ed955 l7-protocols-2004_11_28.tar.gz 52911
diff --git a/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild b/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild
index ae597d3d6f59..e29db70fff8b 100644
--- a/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild,v 1.1 2004/09/19 00:20:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2004.09.13.ebuild,v 1.2 2004/12/02 10:57:59 dragonheart Exp $
+
+inherit toolchain-funcs
 
 IUSE=""
 
@@ -10,7 +12,6 @@ DESCRIPTION="Protocol definitions of l7-filter kernel modules"
 HOMEPAGE="http://l7-filter.sourceforge.net/protocols"
 
 SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,7 +22,7 @@ RDEPEND="net-misc/l7-filter"
 
 
 src_compile() {
-	sed -i -e 's/gcc.*-O2/${CC} ${CFLAGS}/g' testing/Makefile
+	sed -i -e "s/gcc.*-O2/$(tc-getCC) ${CFLAGS}/g" testing/Makefile
 	sed -i -e 's/-1/-n 1/g' testing/*.sh
 	emake -C testing
 }
diff --git a/net-misc/l7-protocols/l7-protocols-2004.11.28.ebuild b/net-misc/l7-protocols/l7-protocols-2004.11.28.ebuild
new file mode 100644
index 000000000000..7c230bee4ec2
--- /dev/null
+++ b/net-misc/l7-protocols/l7-protocols-2004.11.28.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2004.11.28.ebuild,v 1.1 2004/12/02 10:57:59 dragonheart Exp $
+
+inherit toolchain-funcs
+
+IUSE=""
+
+MY_P=${PN}-${PV//./_}
+
+DESCRIPTION="Protocol definitions of l7-filter kernel modules"
+HOMEPAGE="http://l7-filter.sourceforge.net/protocols"
+
+SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="net-misc/l7-filter"
+
+
+src_compile() {
+	sed -i -e "s/gcc.*-O2/$(tc-getCC) ${CFLAGS}/g" testing/Makefile
+	sed -i -e 's/-1/-n 1/g' testing/*.sh
+	emake -C testing
+}
+
+# NOTE Testing mechanism is currently broken - it doesn't stop until it fails
+# This is bad when it works.
+
+#src_test() {
+#	cd testing
+#	find ${S} -name \*.pat -print -exec ./test_match.sh {} \; \
+#		-exec ./timeit.sh {} \; || die "failed tests"
+#	einfo "patterns past testing"
+#}
+
+src_install() {
+
+	dodir /usr/share/${PN}
+	cd testing
+	cp -a randprintable randchars test_speed match README *.sh ${D}/usr/share/${PN}
+	cd ${S}
+
+	dodoc README CHANGELOG HOWTO WANTED
+	docinto weakpatterns/README README.weakpatterns
+	docinto extra/README README.extra
+	docinto file_types/README README.file_types
+	docinto malware/README README.malware
+	docinto testing/README README.testing
+
+	rm -rf README CHANGELOG HOWTO LICENSE WANTED */README testing
+
+	make PREFIX=${D} install || die
+	rm ${D}/etc/${PN}/Makefile
+}