Because only change to -r1 was disabling devfs, mark it stable for ppc/x86. Remove USE static, which was misused. Remove geocities from HOMEPAGE and SRC_URI wrt #297028.

(Portage version: 2.2_rc59/cvs/Linux x86_64)

4 files changed, 13 insertions, 70 deletions

diff --git a/app-misc/towitoko/ChangeLog b/app-misc/towitoko/ChangeLog
index 0233771bbf1e..84ce0de2b155 100644
--- a/app-misc/towitoko/ChangeLog
+++ b/app-misc/towitoko/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/towitoko
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/ChangeLog,v 1.15 2009/03/13 19:59:54 hanno Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/ChangeLog,v 1.16 2009/12/15 16:49:30 ssuominen Exp $
+
+  15 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  towitoko-2.0.7-r2.ebuild:
+  Because only change to -r1 was disabling devfs, mark it stable for
+  ppc/x86. Remove USE static, which was misused. Remove geocities from
+  HOMEPAGE and SRC_URI wrt #297028.
 
 *towitoko-2.0.7-r2 (13 Mar 2009)
 
diff --git a/app-misc/towitoko/towitoko-2.0.7-r1.ebuild b/app-misc/towitoko/towitoko-2.0.7-r1.ebuild
deleted file mode 100644
index 78f05b839b09..000000000000
--- a/app-misc/towitoko/towitoko-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/towitoko-2.0.7-r1.ebuild,v 1.6 2007/03/12 18:34:28 armin76 Exp $
-
-IUSE="static moneyplex"
-
-DESCRIPTION="This library provides a driver for using Towitoko smartcard readers under UNIX environment."
-SRC_URI="http://www.geocities.com/cprados/files/${P}.tar.gz"
-HOMEPAGE="http://www.geocities.com/cprados/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc x86"
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-devfs"
-	use moneyplex && myconf="${myconf} --disable-atr-check"
-
-	econf \
-		`use_enable static` \
-		`use_enable moneyplex win32-com` \
-		${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
-
-pkg_postinst() {
-	if ! use moneyplex
-	then
-		elog "If you want to use the moneyplex home banking software from"
-		elog "http://www.matrica.de"
-		elog "then please re-emerge this package with 'moneyplex' in USE"
-	fi
-}
diff --git a/app-misc/towitoko/towitoko-2.0.7-r2.ebuild b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
index b4ade1b745c1..735819903c84 100644
--- a/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
+++ b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/towitoko-2.0.7-r2.ebuild,v 1.1 2009/03/13 19:59:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/towitoko-2.0.7-r2.ebuild,v 1.2 2009/12/15 16:49:30 ssuominen Exp $
 
-IUSE="static moneyplex"
+IUSE="moneyplex"
 
 DESCRIPTION="This library provides a driver for using Towitoko smartcard readers under UNIX environment."
-SRC_URI="http://www.geocities.com/cprados/files/${P}.tar.gz"
-HOMEPAGE="http://www.geocities.com/cprados/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
 src_compile() {
 	local myconf
@@ -19,7 +19,6 @@ src_compile() {
 	use moneyplex && myconf="${myconf} --disable-atr-check"
 
 	econf \
-		`use_enable static` \
 		`use_enable moneyplex win32-com` \
 		${myconf} || die "econf failed"
 	emake || die
diff --git a/app-misc/towitoko/towitoko-2.0.7.ebuild b/app-misc/towitoko/towitoko-2.0.7.ebuild
deleted file mode 100644
index b35e9782e300..000000000000
--- a/app-misc/towitoko/towitoko-2.0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/towitoko/towitoko-2.0.7.ebuild,v 1.8 2005/01/01 15:26:59 eradicator Exp $
-
-DESCRIPTION="This library provides a driver for using Towitoko smartcard readers under UNIX environment."
-SRC_URI="http://www.geocities.com/cprados/files/${P}.tar.gz"
-HOMEPAGE="http://www.geocities.com/cprados/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="static"
-
-src_compile() {
-	local myconf="--enable-devfs"
-	use static && myconf="${myconf} --enable-static"
-	econf ${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall
-}