clean up old ebuilds and fixed CC usage to use new toolchain-funcs.eclass. bug 69275

9 files changed, 21 insertions, 136 deletions

diff --git a/net-misc/vconfig/ChangeLog b/net-misc/vconfig/ChangeLog
index d732dc8e27f5..ca9551aab3e8 100644
--- a/net-misc/vconfig/ChangeLog
+++ b/net-misc/vconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vconfig
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/ChangeLog,v 1.11 2004/07/13 03:06:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/ChangeLog,v 1.12 2004/10/28 20:19:55 solar Exp $
+
+  28 Oct 2004; <solar@gentoo.org> -vconfig-1.7-r1.ebuild,
+  -vconfig-1.7-r2.ebuild, -vconfig-1.7.ebuild, vconfig-1.8.ebuild:
+  fixed CC usage to use new toolchain-funcs.eclass. bug 69275
 
   12 Jul 2004; <solar@gentoo.org> vconfig-1.7-r1.ebuild,
   vconfig-1.7-r2.ebuild, vconfig-1.7.ebuild, vconfig-1.8.ebuild:
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index fc725ef27ea9..f9024822c5cb 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,10 +1,14 @@
-MD5 e54ad75ecc907ad36f90073e6d861a8e vconfig-1.8.ebuild 1430
-MD5 7a15ac1dc2c128d9cae26d4788d3e0b3 vconfig-1.7-r1.ebuild 1255
-MD5 83477bb978ec1a75ef7ba70bf55dc5cc vconfig-1.7.ebuild 904
-MD5 c6bf4416be4273349147bc3ff0e49b11 vconfig-1.7-r2.ebuild 1378
-MD5 e8d099ab785d3cac7ac7794b046f187f ChangeLog 1844
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 26679e22cb346f96b1bb1984e04a3664 vconfig-1.8.ebuild 1460
+MD5 2cbb14f8edbab361c21053e9734c0bad ChangeLog 2032
 MD5 da7c34aae19ef948be141f51591982e0 metadata.xml 497
-MD5 f2bc7516c2dfe6d1722ef5cc7c546488 files/digest-vconfig-1.7 59
 MD5 4522407c3158529f4f2c56dce0c498b5 files/digest-vconfig-1.8 60
-MD5 f2bc7516c2dfe6d1722ef5cc7c546488 files/digest-vconfig-1.7-r1 59
-MD5 cab63a6609b92c352b8b8e657587b778 files/digest-vconfig-1.7-r2 135
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBgVQO94CCfB4KcwwRAlJtAJ4jLhRM605CVUbNLrAvuN9hJaNJdACgtI2a
+w1IlmLsPSI8A6pcSH6SQF+U=
+=dkIB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vconfig/files/digest-vconfig-1.7 b/net-misc/vconfig/files/digest-vconfig-1.7
deleted file mode 100644
index aa2b9ea445e4..000000000000
--- a/net-misc/vconfig/files/digest-vconfig-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c32d84f290162322e16097ff50865bb vlan.1.7.tar.gz 90041
diff --git a/net-misc/vconfig/files/digest-vconfig-1.7-r1 b/net-misc/vconfig/files/digest-vconfig-1.7-r1
deleted file mode 100644
index aa2b9ea445e4..000000000000
--- a/net-misc/vconfig/files/digest-vconfig-1.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c32d84f290162322e16097ff50865bb vlan.1.7.tar.gz 90041
diff --git a/net-misc/vconfig/files/digest-vconfig-1.7-r2 b/net-misc/vconfig/files/digest-vconfig-1.7-r2
deleted file mode 100644
index 5eb4b457386b..000000000000
--- a/net-misc/vconfig/files/digest-vconfig-1.7-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c32d84f290162322e16097ff50865bb vlan.1.7.tar.gz 90041
-MD5 d7c76b704a110225e05e90bdc4883955 vconfig-1.7-gcc33-multiline.patch 3102
diff --git a/net-misc/vconfig/vconfig-1.7-r1.ebuild b/net-misc/vconfig/vconfig-1.7-r1.ebuild
deleted file mode 100644
index 057dadb07cd0..000000000000
--- a/net-misc/vconfig/vconfig-1.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.7-r1.ebuild,v 1.7 2004/07/13 03:06:04 solar Exp $
-
-MY_PN="vlan"
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="802.1Q vlan control utility"
-HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
-SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc "
-IUSE="static"
-DEPEND="virtual/os-headers"
-
-src_compile() {
-	use static && LDFLAGS="${LDFLAGS} -static"
-	emake CC="gcc" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	into /
-	dosbin vconfig || die "dosbin error"
-
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:" \
-		< vlan_test.pl > vlan_test.pl~ && \
-		mv vlan_test.pl~ vlan_test.pl
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:" \
-		< vlan_test2.pl > vlan_test2.pl~ && \
-		mv vlan_test2.pl~ vlan_test2.pl
-
-	doman vconfig.8 || die "doman error"
-	dohtml howto.html vlan.html || die "dohtml error"
-	dodoc CHANGELOG README vlan_test*.pl || die "dodoc error"
-
-}
-
-pkg_postinst() {
-	einfo "802.1Q VLAN support is now in the linux kernel as of 2.4.14."
-	ewarn "But MTU problems exist for many ethernet drivers"
-}
diff --git a/net-misc/vconfig/vconfig-1.7-r2.ebuild b/net-misc/vconfig/vconfig-1.7-r2.ebuild
deleted file mode 100644
index f92a8bb483a5..000000000000
--- a/net-misc/vconfig/vconfig-1.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.7-r2.ebuild,v 1.5 2004/07/13 03:06:04 solar Exp $
-
-inherit eutils
-
-MY_PN="vlan"
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="802.1Q vlan control utility"
-HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
-SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz
-mirror://gentoo/vconfig-1.7-gcc33-multiline.patch"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc "
-IUSE="static"
-DEPEND="virtual/os-headers"
-
-src_unpack() {
-	unpack ${MY_PN}.${PV}.tar.gz
-	epatch ${DISTDIR}/vconfig-1.7-gcc33-multiline.patch
-}
-
-src_compile() {
-	use static && LDFLAGS="${LDFLAGS} -static"
-	emake CC="${CC}" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	into /
-	dosbin vconfig || die "dosbin error"
-
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test.pl
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test2.pl
-
-	doman vconfig.8 || die "doman error"
-	dohtml howto.html vlan.html || die "dohtml error"
-	dodoc CHANGELOG README vlan_test*.pl || die "dodoc error"
-}
-
-pkg_postinst() {
-	einfo "802.1Q VLAN support is now in the linux kernel as of 2.4.14."
-	ewarn "MTU problems exist for many ethernet drivers."
-	ewarn "Reduce the MTU on the interface to 1496 to work around them."
-
-}
diff --git a/net-misc/vconfig/vconfig-1.7.ebuild b/net-misc/vconfig/vconfig-1.7.ebuild
deleted file mode 100644
index c207780a2f49..000000000000
--- a/net-misc/vconfig/vconfig-1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.7.ebuild,v 1.6 2004/07/13 03:06:04 solar Exp $
-
-MY_PN="vlan"
-DESCRIPTION="802.1Q vlan control utility"
-HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
-SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc "
-IUSE="static"
-DEPEND="virtual/os-headers"
-S=${WORKDIR}/${MY_PN}
-
-src_compile() {
-	use static && LDFLAGS="${LDFLAGS} -static"
-	emake CC="gcc" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dosbin vconfig || die "dosbin error"
-	doman vconfig.8 || die "doman error"
-	dodoc CHANGELOG README || die "dodoc error"
-	dohtml howto.html vlan.html || die "dohtml error"
-}
-
-pkg_postinst() {
-	ewarn "MTU problems exist for many ethernet drivers"
-}
diff --git a/net-misc/vconfig/vconfig-1.8.ebuild b/net-misc/vconfig/vconfig-1.8.ebuild
index c976038c4d81..68dffe79b916 100644
--- a/net-misc/vconfig/vconfig-1.8.ebuild
+++ b/net-misc/vconfig/vconfig-1.8.ebuild
@@ -1,8 +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/vconfig/vconfig-1.8.ebuild,v 1.7 2004/07/13 03:06:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.8.ebuild,v 1.8 2004/10/28 20:19:55 solar Exp $
 
-inherit eutils
+inherit eutils flag-o-matic toolchain-funcs
 
 MY_PN="vlan"
 S=${WORKDIR}/${MY_PN}
@@ -24,8 +24,8 @@ src_unpack() {
 }
 
 src_compile() {
-	use static && LDFLAGS="${LDFLAGS} -static"
-	emake CC="${CC}" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	use static && appened-ldflags -static
+	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {