5 files changed, 15 insertions, 84 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/Manifest b/app-misc/towitoko/Manifest
index ff2eec04f186..dc7ba45d2be8 100644
--- a/app-misc/towitoko/Manifest
+++ b/app-misc/towitoko/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST towitoko-2.0.7.tar.gz 280177 RMD160 217e77848f91d19da007ef8035eb96dd71b22928 SHA1 11d32a5577a91366663a6d56136eed0ae1bb5152 SHA256 28f36954b5225dbb1729728fadaa723f49e141c5a4b77dc75d9558d787c8e660
-EBUILD towitoko-2.0.7-r1.ebuild 997 RMD160 6a0ce711f503cfc14d16b360c79a96817f2d8c53 SHA1 f93f3020ef90ba1cedff4215eb7c464571c32623 SHA256 66c153452f86c4e721b8ae2b9efb4616d541fd652c469d39b59e76d6b356567e
-EBUILD towitoko-2.0.7-r2.ebuild 990 RMD160 b7f7acebb8d1acef833e4947303f3d3c560c79c7 SHA1 59f517c13b31ecd7aabe8b0fe6fa40799afa7d80 SHA256 bd01104d34380ea18027233f95170673529cb704853260ed96e730247a55b512
-EBUILD towitoko-2.0.7.ebuild 675 RMD160 ab6cc80e018e4153eea5f75e2af64bc51a8f389f SHA1 6ca752191f7c3098e989992e0ef75bab35cfaf0d SHA256 2f4eb4fbb959c61d9bca3de64dcc196cf2eca9491715d0ae0700798829cbad43
-MISC ChangeLog 1736 RMD160 9b61e62458eb9f6b46a274476a8a2e4f25611e44 SHA1 16262fe12b996a2e87a4cdfb1bbb3b1c71f52bd3 SHA256 4823f3aa9f27dd3dd6b74cd4d176a8847fb2202c6c4ee5ff3190225c46d4db97
+EBUILD towitoko-2.0.7-r2.ebuild 927 RMD160 4e86c35171e87c6ac7fe44a4feae69d263db5f7c SHA1 a18a4f44a14a5ecfc33da2ff7449bb4b638de472 SHA256 e6db5f631df831eb26be92c4ce49d01e59dee300290c59ec7473fb7dd0a9d8ac
+MISC ChangeLog 1999 RMD160 1f64b2378fcfaf6055579e35e468faccecabd994 SHA1 208f15dafb9a350fae3e87bf3ac23f8b37e025de SHA256 c3cb4e069261ee9f12b09c564988cf7dbdb6274d5aa8f4d9c0e94ea439820b25
 MISC metadata.xml 345 RMD160 e86db3e63912dc8c0d71b2a794311fc06108aceb SHA1 27b23535b0bf6ab5b86e94d183f43c94a4d7b91b SHA256 6d76101102aa7ccb7840d952a31bbbb064acaa78b9b408d8920827117f002ede
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm6uz4ACgkQr2QksT29OyBOeQCeJPKNp6OFAZpslToIJCwqpaSI
-H4EAnjobVckSi+D32zBRjdTVVlQUdG8R
-=PF6d
------END PGP SIGNATURE-----
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
-}