fix tcltk useflag, bug #53986; remove old version

4 files changed, 11 insertions, 52 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 5e0d3b413a3f..dbcc3a091ed9 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.27 2004/09/24 00:40:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.28 2004/09/27 10:24:02 lanius Exp $
+
+  27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> rp-pppoe-3.5-r1.ebuild,
+  -rp-pppoe-3.5.ebuild:
+  fix tcltk useflag, bug #53986; remove old version
 
   24 Sep 2004; Daniel Black <dragonheart@gentoo.org> files/rp-pppoe.rc:
   files/rp-pppoe.rc changed from need net to provide net as per bug #46906.
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5
deleted file mode 100644
index f73d1dfb1b55..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild
index 8098d1e54c18..ce48afa634f7 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.3 2004/08/28 03:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild,v 1.4 2004/09/27 10:24:02 lanius Exp $
 
 inherit eutils
 
@@ -14,7 +14,9 @@ KEYWORDS="alpha amd64 arm hppa mips ppc sparc x86"
 IUSE="X"
 
 DEPEND=">=net-dialup/ppp-2.4.1
-	X? ( virtual/x11 )"
+	X? ( tcltk? ( 	virtual/x11
+			dev-lang/tcl
+			dev-lang/tk ))"
 
 src_unpack() {
 	unpack ${A} || die
@@ -34,7 +36,7 @@ src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
 
-	if use X; then
+	if use X && use tcltk; then
 		make -C ${S}/gui || die "gui make failed"
 	fi
 }
@@ -45,7 +47,7 @@ src_install () {
 		|| die "install failed"
 	prepalldocs
 
-	if use X; then
+	if use X && use tcltk; 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.5.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5.ebuild
deleted file mode 100644
index 4c505c8feec0..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.19 2004/06/24 22:32:20 agriffis Exp $
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
-HOMEPAGE="http://www.roaringpenguin.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86 mips"
-IUSE="X"
-
-DEPEND=">=net-dialup/ppp-2.4.1
-	X? ( virtual/x11 )"
-
-S=${WORKDIR}/${P}/src
-
-src_compile() {
-	addpredict /dev/ppp
-	# sanbdox violation workaround
-	sed -i -e 's/modprobe/#modprobe/' configure
-	econf || die
-	emake || die "Failed to compile"
-
-	if use X; then
-		cd ../gui ; make || die "Failed to compile the GUI"
-	fi
-}
-
-src_install () {
-	make RPM_INSTALL_ROOT=${D} docdir=/usr/share/doc/${PF} install || die "Failed to install"
-	prepalldocs
-
-	if use X; then
-		cd ../gui ; make RPM_INSTALL_ROOT=${D} \
-		datadir=/usr/share/doc/${PF}/ install || die "Failed to install the GUI"
-		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/rp-pppoe.rc rp-pppoe
-}
-
-pkg_postinst() {
-	einfo "Use adsl-setup to configure your dialup connection"
-}