Fix sed statement to avoid cross-compiling issues, bug #373193 thank Bertrand Jacquin for report and Justin Lecher for investigation. Drop old.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

11 files changed, 21 insertions, 417 deletions

diff --git a/net-misc/l7-protocols/ChangeLog b/net-misc/l7-protocols/ChangeLog
index f4ac46b71722..7de96fcd2554 100644
--- a/net-misc/l7-protocols/ChangeLog
+++ b/net-misc/l7-protocols/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/l7-protocols
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.64 2009/06/05 20:00:05 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.65 2011/06/28 09:31:26 pva Exp $
+
+  28 Jun 2011; Peter Volkov <pva@gentoo.org> -l7-protocols-2008.01.16.ebuild,
+  -l7-protocols-2008.02.20.ebuild, -files/l7-protocols-2008.02.20-gcc4.3.patch,
+  -l7-protocols-2008.04.23.ebuild, -l7-protocols-2008.11.08.ebuild,
+  -l7-protocols-2008.11.23.ebuild, l7-protocols-2008.12.18.ebuild,
+  -l7-protocols-2009.05.10.ebuild, l7-protocols-2009.05.28.ebuild:
+  Fix sed statement to avoid cross-compiling issues, bug #373193 thank Bertrand
+  Jacquin for report and Justin Lecher for investigation. Drop old.
 
 *l7-protocols-2009.05.28 (05 Jun 2009)
 
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
index 1e006f8161d6..33047dfb46bc 100644
--- a/net-misc/l7-protocols/Manifest
+++ b/net-misc/l7-protocols/Manifest
@@ -1,19 +1,6 @@
-AUX l7-protocols-2008.02.20-gcc4.3.patch 307 RMD160 6b479f3a50cb0aa421128fa4a9e66f48108bebfc SHA1 a7a127006a97bea80567f73a695a6816cf74657d SHA256 6a22fa11f1b2b8b334b6658f64e63455c5d740ff8053829e79155a2b1dd0ec6a
-DIST l7-protocols-2008-01-16.tar.gz 126169 RMD160 186bf01f892dd251ce1fd9a6b0aee986f161ce7b SHA1 7f4e45e37cdcacabb482721675c08d94706b316c SHA256 b5b4e08ca0120a734e61b2f34e595c5188335479eedeb845461c4002624b342a
-DIST l7-protocols-2008-02-20.tar.gz 127286 RMD160 e8ce9845063ece9ff089001645124ce325b4bdfb SHA1 aa1dfb9e4a8faf090e92e63a785d8a8c730e0443 SHA256 d5e324b2c23ab2ae52e7ee0e5ca1bc086be112c5add211bbb6ee0c4eb409c779
-DIST l7-protocols-2008-04-23.tar.gz 127674 RMD160 babd3d2a9db9791ba05e7ac234b1f52962b55eed SHA1 c81c395e9a6c1a631cf84251756e99320a337a2c SHA256 a467173d3ddec71967963600d070d0d6ccf83dd46da5639b861da24ec8c84530
-DIST l7-protocols-2008-11-08.tar.gz 128678 RMD160 dc0db581ec483550fb19611bb4e58389c0407d7c SHA1 c89c27af5e531652ef449ca4a9f12fc76466a8d5 SHA256 4c9aa28d33d3be3445ba2d3d995853bd857c906088eed2e16b7823e7a37f0705
-DIST l7-protocols-2008-11-23.tar.gz 129079 RMD160 e4f2cef14fc614fe692c2315243485960970fce1 SHA1 6bd67e82fb7dc3d66ddf7af588de6cfe42285f4c SHA256 5d470aa4c36bb58989e37ac1553edfedebaf4444a0cc78d1b7a6a93d33c60d98
 DIST l7-protocols-2008-12-18.tar.gz 128951 RMD160 571bd2b3160b157fc7b4f560d5de0a04af0c4a5c SHA1 24ff28f7960758b9ec43285fdbc9b9b0e6e8ec33 SHA256 d38f68ad1bf8699b55f9a159d01a8eee1d7eebdd204bee9bd271baf868408d48
-DIST l7-protocols-2009-05-10.tar.gz 143087 RMD160 44a3657a086880fcaaef1542349f1509b707f77c SHA1 08c00babf5781fd31fa08fbb521e7d54f5f1bc18 SHA256 12cc6a8279e4f9ee0cfe59d722115c03f1e54f87597477ee90cd8f913fd0b017
 DIST l7-protocols-2009-05-28.tar.gz 142050 RMD160 91297dfe1d0477ea2532c78b3344bc1a4e75bcf6 SHA1 26ba06905a4a4885d8f1bcb5e4057a798a34c2ac SHA256 d6bf98a69268558543bd32fccea287cb3f14b37521d18c790e2b6f8dcfaa5381
-EBUILD l7-protocols-2008.01.16.ebuild 1709 RMD160 efa3b9143e60edc353e634032a86c2eb4330ff59 SHA1 9d71b5f394378fbb698d2fccc47025b530300a50 SHA256 35eaf19ab1b70487f1dd8ca233374aa2415312c3730b5d36f18fb4bc84bc5d74
-EBUILD l7-protocols-2008.02.20.ebuild 1756 RMD160 861c21c425da1569446e85b611d7836ebed250be SHA1 018a797a700aeb8cfce1f77b2a076c6ed08eb7e9 SHA256 77df8bbd2b070a0c1d26c09b5a4b26c843108958ed6aeea50b67b1264a7b797e
-EBUILD l7-protocols-2008.04.23.ebuild 1723 RMD160 8ddc08851f545d060bcc5ad184f0cd2e5ed5fa7f SHA1 87e49216080bcd7ccd1c9d60cfeb7dc967002a7e SHA256 ad85be0bd6c165e60fc0412a45c1dcaa9325114afe54a15346179ee8cb32ba21
-EBUILD l7-protocols-2008.11.08.ebuild 1742 RMD160 44d2cac34acd17b802013970e8d5fbc9dfc7fe9c SHA1 6058614d094e7a0fa964ace6c686845a5be85ebb SHA256 f1f5b5531bc279af90ea51c5db9efe03bd37e0807c9f76cfb72a2bb7dcba5d95
-EBUILD l7-protocols-2008.11.23.ebuild 1742 RMD160 a35f1676e494640f7885ba90dba1f37118fc46f4 SHA1 8a7d9d3db7b740915874e179bcbffd490716d035 SHA256 b4c936c7da72d8b250b3a1f52f2edc081e8f74141a77c850fda56a46e9d795a0
-EBUILD l7-protocols-2008.12.18.ebuild 1742 RMD160 0bb33cf4f19b4faff77ef7764bb7d2322354e627 SHA1 2e5cc7f107e7d49730e7cb0b0b89f754512f2dbd SHA256 8374f88f5eaf23200d78c08336272c96000a5a55aebfe629d51019bc480f1c7b
-EBUILD l7-protocols-2009.05.10.ebuild 1742 RMD160 3dca1a49da10a4793b1f83b341876efcf558f312 SHA1 3335834e793ab2370ca983954ff019eafbf49b16 SHA256 5c01eaa279a4ddb4db1d6f17e4175f35863a1baa99368a56a296773fc2e313ee
-EBUILD l7-protocols-2009.05.28.ebuild 1724 RMD160 c1e4ddca9ffef4a8c4d4a688c0c55e1eb559e992 SHA1 b3331c0ef45a585f78ceb1f0a6dc3f0a806b4229 SHA256 ae3581a3932aff856a5d0c40b82622339457df25acb947c73bd77c68044fff84
-MISC ChangeLog 10947 RMD160 0d235ad0ff193a3173b1a82801c6a62ea939aac8 SHA1 ec97b2d9e1bc345c89ee2c46153545eee7810716 SHA256 a9996d913af73d54b2363751688cf1aaba337b3da2193e7ef719dd8f5658ba6c
+EBUILD l7-protocols-2008.12.18.ebuild 1738 RMD160 ef4ec4505261b9d8aef62cd15f2991ebb99fb6e6 SHA1 4f6fe51ae80ccad4fa69e8e0ac7a49508b9fe43a SHA256 947fe1b42467a1db1e0043d4f083e5576d14b0e7fcf97e0f74ab69952292674c
+EBUILD l7-protocols-2009.05.28.ebuild 1724 RMD160 d995fd4bbfa74b99829600a68829b0df64ff3c80 SHA1 e21395f0897eeae4d986852db4ed7eacef5d4f8d SHA256 fd7713c734d16bb28339d1d2ee56723a0419211ff36e29c02c2c938874477273
+MISC ChangeLog 11456 RMD160 f5521b4ec7bde5f8579f0733152ff40797f3da03 SHA1 737c386ae03222bcdc91d489c61e2d2f14da8a89 SHA256 6c6c8689fe231f10f1daa8efd719e5b35207ea0e44456f6745ee9ca7f38eaba5
 MISC metadata.xml 676 RMD160 81a7041de3780f239a538bb5e9f87bfd66abb556 SHA1 137e1a4ebec3e18ee0de4d165e83726cb4228b86 SHA256 d5aa51b8332d438acd7fcf8262a92ba09ac656477d9ea14016064af8bcb468fe
diff --git a/net-misc/l7-protocols/files/l7-protocols-2008.02.20-gcc4.3.patch b/net-misc/l7-protocols/files/l7-protocols-2008.02.20-gcc4.3.patch
deleted file mode 100644
index 85453978fd56..000000000000
--- a/net-misc/l7-protocols/files/l7-protocols-2008.02.20-gcc4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- testing/test_speed-userspace.cpp.orig	2008-04-21 14:41:58.000000000 +0400
-+++ testing/test_speed-userspace.cpp	2008-04-21 14:42:26.000000000 +0400
-@@ -16,6 +16,7 @@
- #include <fstream>
- #include <iostream>
- #include <sys/types.h>
-+#include <stdlib.h>
- #include "l7-parse-patterns.h"
- 
- #define MAX 1500
diff --git a/net-misc/l7-protocols/l7-protocols-2008.01.16.ebuild b/net-misc/l7-protocols/l7-protocols-2008.01.16.ebuild
deleted file mode 100644
index 3fde2ff0d078..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2008.01.16.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.01.16.ebuild,v 1.5 2008/02/15 13:00:14 fmccor Exp $
-
-inherit fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} -o/g" "${S}"/testing/Makefile
-	ht_fix_file "${S}"/testing/*.sh
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2008.02.20.ebuild b/net-misc/l7-protocols/l7-protocols-2008.02.20.ebuild
deleted file mode 100644
index c8d09dfb9ffe..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2008.02.20.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.02.20.ebuild,v 1.2 2008/04/21 11:09:03 pva Exp $
-
-inherit eutils fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} -o/g" testing/Makefile
-	ht_fix_file testing/*.sh
-
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2008.04.23.ebuild b/net-misc/l7-protocols/l7-protocols-2008.04.23.ebuild
deleted file mode 100644
index f5c2a5c1253f..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2008.04.23.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.04.23.ebuild,v 1.1 2008/05/03 09:26:53 dragonheart Exp $
-
-inherit eutils fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} -o/g" testing/Makefile
-	ht_fix_file testing/*.sh
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2008.11.08.ebuild b/net-misc/l7-protocols/l7-protocols-2008.11.08.ebuild
deleted file mode 100644
index d1a908e73723..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2008.11.08.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.11.08.ebuild,v 1.1 2008/11/14 11:19:29 pva Exp $
-
-inherit eutils fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o/g" \
-			-i testing/Makefile
-	ht_fix_file testing/*.sh
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2008.11.23.ebuild b/net-misc/l7-protocols/l7-protocols-2008.11.23.ebuild
deleted file mode 100644
index bda5ace1e041..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2008.11.23.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.11.23.ebuild,v 1.1 2008/11/29 09:17:02 pva Exp $
-
-inherit eutils fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o/g" \
-			-i testing/Makefile
-	ht_fix_file testing/*.sh
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild b/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild
index 6fd9a012cb0f..27a398deb194 100644
--- a/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild,v 1.5 2009/06/02 16:53:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2008.12.18.ebuild,v 1.6 2011/06/28 09:31:26 pva Exp $
 
 inherit eutils fixheadtails toolchain-funcs
 
@@ -22,8 +22,8 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	sed -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o/g" \
+	sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|g" \
+		-e "s|g++.*\-o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|g" \
 			-i testing/Makefile
 	ht_fix_file testing/*.sh
 }
diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.10.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.10.ebuild
deleted file mode 100644
index d6cde1bd5f57..000000000000
--- a/net-misc/l7-protocols/l7-protocols-2009.05.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2009.05.10.ebuild,v 1.1 2009/05/11 16:14:24 pva Exp $
-
-inherit eutils fixheadtails 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o/g" \
-			-i testing/Makefile
-	ht_fix_file testing/*.sh
-}
-
-src_compile() {
-	emake -C testing || die
-}
-
-# NOTE Testing mechanism is currently broken:
-#  stack smashing attack in function main()
-
-# Is also extraordinarly inefficent getting random data.
-#
-#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}
-	pushd testing > /dev/null
-	cp -pPR randprintable randchars test_speed-{kernel,userspace} README \
-		match_kernel speeds-2007-10-02-450MHz *.sh data "${D}"/usr/share/${PN}
-	popd > /dev/null
-	mv example_traffic "${D}"/usr/share/${PN}
-
-	dodoc README CHANGELOG HOWTO WANTED
-	for dir in extra file_types malware ; do
-		newdoc ${dir}/README README.${dir}
-	done
-	rm -rf README CHANGELOG HOWTO LICENSE Makefile WANTED */README testing
-
-	dodir /etc/l7-protocols
-	cp -R * "${D}"/etc/l7-protocols
-	chown -R root:0 "${D}"
-}
diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
index fea634e4765e..319c6f26cb10 100644
--- a/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild,v 1.1 2009/06/05 20:00:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild,v 1.2 2011/06/28 09:31:26 pva Exp $
 
 inherit eutils fixheadtails toolchain-funcs
 
@@ -22,8 +22,8 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	sed -e "s/gcc.*\-o/$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o/g" \
-		-e "s/g++.*\-o/$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o/g" \
+	sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|g" \
+		-e "s|g++.*\-o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|g" \
 			-i testing/Makefile
 	ht_fix_file testing/*.sh
 }