bump to 1.2.5, removed old ~arch version

Package-Manager: portage-2.1.3_rc8

5 files changed, 30 insertions, 33 deletions

diff --git a/app-accessibility/gok/ChangeLog b/app-accessibility/gok/ChangeLog
index 732e5a4ba14a..957c0353fea7 100644
--- a/app-accessibility/gok/ChangeLog
+++ b/app-accessibility/gok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/gok
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.94 2007/07/06 11:00:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.95 2007/07/21 21:27:33 eva Exp $
+
+*gok-1.2.5 (21 Jul 2007)
+
+  21 Jul 2007; Gilles Dartiguelongue <eva@gentoo.org> -gok-1.2.1.ebuild,
+  +gok-1.2.5.ebuild:
+  bump to 1.2.5
+   * updated translations
+   * small bug fixes
 
   06 Jul 2007; Roy Marples <uberlord@gentoo.org> gok-1.2.3.ebuild:
   Keyworded ~x86-fbsd
diff --git a/app-accessibility/gok/Manifest b/app-accessibility/gok/Manifest
index e2df89189c1b..03445fa6849f 100644
--- a/app-accessibility/gok/Manifest
+++ b/app-accessibility/gok/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gok-1.0.10.tar.bz2 1149823 RMD160 dccf53ee33bdf53a5b41e3da9df666aca502f190 SHA1 30f3ef9e04733dd7946e086212f2f053f62f9587 SHA256 35a4e380fd85660567ad54401ae0e52ebbb6f47947ce6a585aad078ef630b824
 DIST gok-1.2.0.tar.bz2 1177907 RMD160 1c9ffcf818d14c4ae4a7711c7fddc4ab6b5dd968 SHA1 913384c603850070b86cb6b75cc3b77e6b1c22c6 SHA256 f6a3fc5081c8dafbdadf05b86b13beb05d1329fda074d217b62f4a1daaedc544
-DIST gok-1.2.1.tar.bz2 1212773 RMD160 53c4e172793d2958656cda4bc273577274ad82e3 SHA1 adeb8ba41fbc7c5cdfe2e62ea1f016856770f4ba SHA256 6230bd5738ab121fe3010fdb4d524598faf4f0869acc644798a9c9ce7be18c24
 DIST gok-1.2.3.tar.bz2 1226183 RMD160 ee333c22a10c43b039ffcfc4006974c6e3cb6416 SHA1 067696d381fe914e641f99b53fe7890101b1281f SHA256 7672b47676a97e3ef134d34858d14fff0d8886f7d58e94bb3f186e1b0dab29ae
+DIST gok-1.2.5.tar.bz2 1229265 RMD160 c2bfeb254b16318c838db7e7a2de78a734a7750d SHA1 95a3079d24c4d02cd6a5c590266cad6a678aef43 SHA256 780dd1e5b13036062f3c843a54b8a30d3759b4136e6d0fbcc025521fd9df7099
 EBUILD gok-1.0.10.ebuild 1353 RMD160 68c264acfe05cb207ab628f34f8d5de1d0a53c41 SHA1 355f588e58f37f2947d3c36f54bfd2a1bae7d95b SHA256 cb284235b15d5443e4357553c44a6297d74a1f899df671a312d0b6a9d9dcdb1a
 MD5 6c36286bcb4432d4632883ef7e52ebcb gok-1.0.10.ebuild 1353
 RMD160 68c264acfe05cb207ab628f34f8d5de1d0a53c41 gok-1.0.10.ebuild 1353
@@ -13,18 +10,18 @@ EBUILD gok-1.2.0.ebuild 1374 RMD160 0b97b06ec01956953b8cf30a111ce0cec20d911c SHA
 MD5 37172f7d1bc1f354a7e17785afa5f42b gok-1.2.0.ebuild 1374
 RMD160 0b97b06ec01956953b8cf30a111ce0cec20d911c gok-1.2.0.ebuild 1374
 SHA256 65b15424cb00b033b2ac37ddf5f050b248583623b46e527afa0a629af25dd817 gok-1.2.0.ebuild 1374
-EBUILD gok-1.2.1.ebuild 1477 RMD160 c5c0c7e91a704bcc78a3486cc1a9d09b0c04d0c2 SHA1 11fa1d30432a72faec3bc04999b91d309d41646b SHA256 5c014dd48d2ccdc3e5851f2091368b397587046b02cca822976b99ab1cd35ab9
-MD5 b1e12c6bf28d5710fd4eefbfec91c0cf gok-1.2.1.ebuild 1477
-RMD160 c5c0c7e91a704bcc78a3486cc1a9d09b0c04d0c2 gok-1.2.1.ebuild 1477
-SHA256 5c014dd48d2ccdc3e5851f2091368b397587046b02cca822976b99ab1cd35ab9 gok-1.2.1.ebuild 1477
 EBUILD gok-1.2.3.ebuild 1563 RMD160 c16cf0afcc022c7013c07c1f5578122a48decbcb SHA1 97d9ed4272759cf1fb3f21a5fd572c9b2deb6382 SHA256 45a88828a791e0869885ef9f11ee57fbfb47222a9a38b8821825175b41332914
 MD5 7d594ff80fdcebd1c2e21e7edb0a04ae gok-1.2.3.ebuild 1563
 RMD160 c16cf0afcc022c7013c07c1f5578122a48decbcb gok-1.2.3.ebuild 1563
 SHA256 45a88828a791e0869885ef9f11ee57fbfb47222a9a38b8821825175b41332914 gok-1.2.3.ebuild 1563
-MISC ChangeLog 11426 RMD160 36ff6656975b7ff3979e5b5215e6055636078cfe SHA1 c26e2a03e56b6f7d8babdaba7b10de111c2c9205 SHA256 75d4213fd9634fd89306cac95488f9ce9c6b316bebab7095391531ab88d7a720
-MD5 221ad6f56cf603c4e87e004c1468e5cb ChangeLog 11426
-RMD160 36ff6656975b7ff3979e5b5215e6055636078cfe ChangeLog 11426
-SHA256 75d4213fd9634fd89306cac95488f9ce9c6b316bebab7095391531ab88d7a720 ChangeLog 11426
+EBUILD gok-1.2.5.ebuild 1492 RMD160 dc0620324c870452e7837eeed7e6fdb905b6c718 SHA1 ad8d28f2921d8e68c9141bb2a4a1d6b76b738831 SHA256 154af6b85aa63c0529bd7b210ee58f5a0293c5460f27e5daeeb76a84cb7d287d
+MD5 47eb31cc0781a3ba4bcb7c7be4d221fe gok-1.2.5.ebuild 1492
+RMD160 dc0620324c870452e7837eeed7e6fdb905b6c718 gok-1.2.5.ebuild 1492
+SHA256 154af6b85aa63c0529bd7b210ee58f5a0293c5460f27e5daeeb76a84cb7d287d gok-1.2.5.ebuild 1492
+MISC ChangeLog 11605 RMD160 605f9fc2c0e9a7bbd844549c4a58038f6131da62 SHA1 8274798b8fd0f8513959363ad2af386d844b86e8 SHA256 109c3f751cbd03eaacac122909fc389e74d53fcf2ecb04b79396d52adfce4ddf
+MD5 068e1d42d29d01057433ba729fb6cff1 ChangeLog 11605
+RMD160 605f9fc2c0e9a7bbd844549c4a58038f6131da62 ChangeLog 11605
+SHA256 109c3f751cbd03eaacac122909fc389e74d53fcf2ecb04b79396d52adfce4ddf ChangeLog 11605
 MISC metadata.xml 472 RMD160 ef145582d5ef0f85a47d6e2db5b37c26a2b88813 SHA1 0039e506951b498af55a9b29956f70fc10f1343a SHA256 fad5224bcc445bf938dddc6617a0bc5386e2aaa8572361cbe45137eed4a4dd4f
 MD5 d213a9003c11bcd3849f289e4806deff metadata.xml 472
 RMD160 ef145582d5ef0f85a47d6e2db5b37c26a2b88813 metadata.xml 472
@@ -35,16 +32,9 @@ SHA256 1f18c7c8ec2fb69218a241ac5d7fb8ecc5419eb05ec6c0a834f1d91ce1be156e files/di
 MD5 5be80cc096cc3f424b00e7ef21eaa4c1 files/digest-gok-1.2.0 235
 RMD160 73ffdf2bd5e3ca2aa2c9964419d454f876f38e8c files/digest-gok-1.2.0 235
 SHA256 497ce0d777f982a9f0629aecb157235935e4a66039e6693eed52d6160ac595a8 files/digest-gok-1.2.0 235
-MD5 5470c2c1fa149c11ddb216328a13dfc9 files/digest-gok-1.2.1 235
-RMD160 8359fe79e589516ac1581d3a39678d187bfff99b files/digest-gok-1.2.1 235
-SHA256 a88c986239979474f39a623acb4ff4b7fa51480266f4f14ea696b70ab7099d2d files/digest-gok-1.2.1 235
 MD5 64bb14dd13f7ff786b025e7d4ca9192f files/digest-gok-1.2.3 235
 RMD160 c87cb5ad44d7dd09a6a6cf1e6092f45d8d10e3d2 files/digest-gok-1.2.3 235
 SHA256 b8688e44c71942e6848f4e24f7cc40ba4294c91dbb391e4950f71ed258a4a4b5 files/digest-gok-1.2.3 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGlEGGkeYb6olFHJcRAtJNAKDJVdSfuMX+fsfjsh8LTLUnfeyfJQCgz/Oj
-V1Sir8+WCq+fB3s9WjeplYI=
-=e3fL
------END PGP SIGNATURE-----
+MD5 dd9579d802d2039607e96d3d4ceb7933 files/digest-gok-1.2.5 235
+RMD160 fe4e365ec85f293bbec1aae93aaed935ddeb510a files/digest-gok-1.2.5 235
+SHA256 f6404c06568ddfbb4a27414d948abf0d15f506aac37d48081dc15832596f38c5 files/digest-gok-1.2.5 235
diff --git a/app-accessibility/gok/files/digest-gok-1.2.1 b/app-accessibility/gok/files/digest-gok-1.2.1
deleted file mode 100644
index daba94cef179..000000000000
--- a/app-accessibility/gok/files/digest-gok-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cba5eef61ed1a8f6a83fa18015781721 gok-1.2.1.tar.bz2 1212773
-RMD160 53c4e172793d2958656cda4bc273577274ad82e3 gok-1.2.1.tar.bz2 1212773
-SHA256 6230bd5738ab121fe3010fdb4d524598faf4f0869acc644798a9c9ce7be18c24 gok-1.2.1.tar.bz2 1212773
diff --git a/app-accessibility/gok/files/digest-gok-1.2.5 b/app-accessibility/gok/files/digest-gok-1.2.5
new file mode 100644
index 000000000000..a3515418301e
--- /dev/null
+++ b/app-accessibility/gok/files/digest-gok-1.2.5
@@ -0,0 +1,3 @@
+MD5 2ef1f171385a37f93408dbca7ecfdf11 gok-1.2.5.tar.bz2 1229265
+RMD160 c2bfeb254b16318c838db7e7a2de78a734a7750d gok-1.2.5.tar.bz2 1229265
+SHA256 780dd1e5b13036062f3c843a54b8a30d3759b4136e6d0fbcc025521fd9df7099 gok-1.2.5.tar.bz2 1229265
diff --git a/app-accessibility/gok/gok-1.2.1.ebuild b/app-accessibility/gok/gok-1.2.5.ebuild
index 66de2da1c3d1..44b1d815e181 100644
--- a/app-accessibility/gok/gok-1.2.1.ebuild
+++ b/app-accessibility/gok/gok-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-1.2.1.ebuild,v 1.2 2007/07/11 02:34:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-1.2.5.ebuild,v 1.1 2007/07/21 21:27:33 eva Exp $
 
 inherit virtualx gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gok.ca/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc usb"
 
 RDEPEND=">=dev-libs/glib-2.11
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.11
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
 	>=gnome-base/orbit-2
-	usb? ( dev-libs/libusb )
+	usb? ( >=dev-libs/libusb-0.1.11 )
 
 	x11-libs/libXi
 	x11-libs/libX11
@@ -49,14 +49,13 @@ DOCS="AUTHORS ChangeLog NEWS README"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-	# Don't use 'use_enable' for now, because of a bug in gok's configure.in.
-	use usb && G2CONF="--enable-libusb-input"
+	G2CONF="$(use_enable usb libusb-input)"
 }
 
 src_test() {
-	# Remove missing file from the Makefile to fix tests (bug #140265)
+	# Remove missing file from the Makefile to fix tests (bug #140265), and POTFILES.in
 	sed -i -e '/char-frequency.xml.in/d' ${S}/po/Makefile
-
+	sed -i -e '/char-frequency.xml.in/d' ${S}/po/POTFILES.in
 	addwrite "/root/.gnome2_private"
 	Xmake check || die
 }