Remove duplicate dependencies and unnecessary tcltk useflag (#117963).

Package-Manager: portage-2.0.53

4 files changed, 25 insertions, 27 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 6ca144481a96..ff11b7a9debb 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/rp-pppoe
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.62 2005/12/25 15:08:08 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.63 2006/01/06 09:56:38 mrness Exp $
+
+  06 Jan 2006; Alin Nastac <mrness@gentoo.org> rp-pppoe-3.5-r11.ebuild,
+  rp-pppoe-3.6.ebuild:
+  Remove duplicate dependencies and unnecessary tcltk useflag (#117963).
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> rp-pppoe-3.6.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 0bc2814e8fa3..132577230ebb 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 25aaed920df2940900e5d2ce49659737 ChangeLog 9362
+MD5 b01df1e0e352d02697af3e132041691c ChangeLog 9528
 MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r11 125
 MD5 084f86d12b06314440de4fce0eee3c5c files/digest-rp-pppoe-3.6 125
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
@@ -13,12 +13,12 @@ MD5 adcd7cb58c9366ef245cc00bb9c598f4 files/rp-pppoe-3.6-on-demand-with-plugin.pa
 MD5 f1c5a33429cf0b27398d3527b2103bd2 files/rp-pppoe-3.6-plugin-options.patch 563
 MD5 f2caeab7f4873474a04c98ab57b6c92a files/rp-pppoe-3.6-username-charset.patch 1946
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 bce4b6caf1dc2ebea4c6ba75f0194526 rp-pppoe-3.5-r11.ebuild 2478
-MD5 b7d644b46ec65f6c2da9cd0112ad529f rp-pppoe-3.6.ebuild 2595
+MD5 d728978d28ed0d7042bac5857e5f62ff rp-pppoe-3.5-r11.ebuild 2404
+MD5 70014f440ee102624727f6d9cda99d5e rp-pppoe-3.6.ebuild 2518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDrrXkAiZjviIA2XgRAk64AKCfu8iY9sIOyNIVizmG8BFN6JKMqQCgzdZC
-LcFdTlwTPK/2xjwitTDkK8s=
-=nR3C
+iD8DBQFDvj7pjG8pv1lIUX4RAtMCAJsGJf3zNYX7xn8hSIlp5dntVOjnQQCgz3em
+TSrieNRsidrOyV/KDBYYamg=
+=nx18
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
index 0f7bea17dc5b..2075221dd4cf 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.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-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild,v 1.4 2005/06/23 13:51:35 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild,v 1.5 2006/01/06 09:56:38 mrness Exp $
 
 inherit eutils
 
@@ -12,13 +12,10 @@ SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa mips ppc sparc x86 ~ppc64"
-IUSE="X tcltk"
+IUSE="X"
 
 DEPEND="net-dialup/ppp
-	X? ( tcltk? (
-		virtual/x11
-		dev-lang/tcl
-		dev-lang/tk ) )"
+	X? ( dev-lang/tk )"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack"
@@ -47,7 +44,7 @@ src_compile() {
 	econf --enable-plugin=../../ppp-2.4.3 || die "econf failed"
 	emake || die "emake failed"
 
-	if use X && use tcltk; then
+	if use X; then
 		make -C ${S}/gui || die "gui make failed"
 	fi
 }
@@ -68,7 +65,7 @@ src_install () {
 
 	prepalldocs
 
-	if use X && use tcltk; then
+	if use X; then
 		make -C ${S}/gui install RPM_INSTALL_ROOT=${D} \
 		datadir=/usr/share/doc/${PF}/ || die "gui install failed"
 		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild
index 6d0ec7bc5952..2ed3b405be95 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.6.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-dialup/rp-pppoe/rp-pppoe-3.6.ebuild,v 1.2 2005/12/25 15:08:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild,v 1.3 2006/01/06 09:56:38 mrness Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,13 +12,10 @@ SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcltk"
+IUSE="X"
 
 DEPEND="net-dialup/ppp
-	X? ( tcltk? (
-		virtual/x11
-		dev-lang/tcl
-		dev-lang/tk ) )"
+	X? ( dev-lang/tk )"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack"
@@ -46,7 +43,7 @@ src_compile() {
 	econf --enable-plugin=../../ppp-2.4.3 || die "econf failed"
 	emake || die "emake failed"
 
-	if use X && use tcltk; then
+	if use X; then
 		make -C ${S}/gui || die "gui make failed"
 	fi
 }
@@ -67,7 +64,7 @@ src_install () {
 
 	prepalldocs
 
-	if use X && use tcltk; then
+	if use X; then
 		make -C ${S}/gui install RPM_INSTALL_ROOT=${D} \
 		datadir=/usr/share/doc/${PF}/ || die "gui install failed"
 		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe