bumps to fix #64221

9 files changed, 30 insertions, 134 deletions

diff --git a/net-p2p/sancho-bin/ChangeLog b/net-p2p/sancho-bin/ChangeLog
index 4ab94b7e9b64..6911a577985a 100644
--- a/net-p2p/sancho-bin/ChangeLog
+++ b/net-p2p/sancho-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/sancho-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/ChangeLog,v 1.16 2004/09/15 18:00:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/ChangeLog,v 1.17 2004/09/16 23:55:48 squinky86 Exp $
+
+*sancho-bin-0.9.4.14-r1 (16 Sep 2004)
+
+  16 Sep 2004; Jon Hood <squinky86@gentoo.org> -sancho-bin-0.9.4.10.ebuild,
+  sancho-bin-0.9.4.11.ebuild, +sancho-bin-0.9.4.14-r1.ebuild,
+  -sancho-bin-0.9.4.14.ebuild, -sancho-bin-0.9.4.9.ebuild:
+  x86 and ~x86 version bumps to fix #64221, thanks to Francisco Javier
+  <ffelix@sshinf.com>.
 
 *sancho-bin-0.9.4.14 (15 Sep 2004)
 
diff --git a/net-p2p/sancho-bin/Manifest b/net-p2p/sancho-bin/Manifest
index 93fbfea80a24..b0db681c59a9 100644
--- a/net-p2p/sancho-bin/Manifest
+++ b/net-p2p/sancho-bin/Manifest
@@ -1,11 +1,17 @@
-MD5 99bb047655b36fad2f0a65a6517cb008 sancho-bin-0.9.4.11.ebuild 1460
-MD5 cbb033de586890f56a1405f1514d7aee sancho-bin-0.9.4.10.ebuild 1459
-MD5 e4ae6a246522d1871a90bcb9b3b538de sancho-bin-0.9.4.9.ebuild 1458
-MD5 07183358784174f3d0f290a21c73a4ec sancho-bin-0.9.4.14.ebuild 1460
-MD5 5efd682098021b98b3712651733d9a64 ChangeLog 2704
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab1f5207e9b467a706472c84e293cc18 sancho-bin-0.9.4.11.ebuild 1483
+MD5 74a1eeba942992914ce8ea6d3b8fb534 sancho-bin-0.9.4.14-r1.ebuild 1487
+MD5 64ac5948f566492f6c84361787b28160 ChangeLog 3035
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 9c8935033c3fe62be83d6ad6e80d5f4e files/sancho.sh 260
-MD5 c99f4fa91b58b629111ed97d48d53dc0 files/digest-sancho-bin-0.9.4.10 158
+MD5 735c747877cd42821c7db531e9bc3f6b files/digest-sancho-bin-0.9.4.14-r1 158
 MD5 af6526c79837318f013013109469c41a files/digest-sancho-bin-0.9.4.11 158
-MD5 735c747877cd42821c7db531e9bc3f6b files/digest-sancho-bin-0.9.4.14 158
-MD5 a2ae84d56946ee97066eaa975014c4c3 files/digest-sancho-bin-0.9.4.9 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBSigNcAgAdbxYsnERAkgxAJwMwMzfgd3lp1oMG+stpB4zN9xBvQCdHbV7
+kIVgjCt0jTz4wi5yfFQkhgo=
+=ahT7
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.10 b/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.10
deleted file mode 100644
index 4037461f9dd0..000000000000
--- a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 de8de4330930c3ea1b772895474842f0 sancho-0.9.4-10-linux-gtk.tar.bz2 3921643
-MD5 9bda8d7b8451ad7b75f857df8b7e5210 sancho-0.9.4-10-linux-fox.tar.bz2 4152600
diff --git a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.14 b/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.14-r1
index 859da0e00584..859da0e00584 100644
--- a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.14
+++ b/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.14-r1
diff --git a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.9 b/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.9
deleted file mode 100644
index 641cf0740c20..000000000000
--- a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a8109172e2861309a23085329adfc85c sancho-0.9.4-9-linux-gtk.tar.bz2 3915779
-MD5 dc3860b20af8d0d5bd86df60164c2757 sancho-0.9.4-9-linux-fox.tar.bz2 4148090
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.10.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.10.ebuild
deleted file mode 100644
index a1404697912a..000000000000
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.10.ebuild,v 1.2 2004/09/15 18:00:27 squinky86 Exp $
-
-IUSE="gtk"
-
-MY_P=${P/-bin/}
-MY_P=${MY_P%.*}-${MY_P##*.}
-
-use gtk && TOOLKIT="gtk" || TOOLKIT="fox"
-
-DESCRIPTION="a powerful frontend for mldonkey"
-HOMEPAGE="http://sancho-gui.sourceforge.net/"
-SRC_URI="http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-${TOOLKIT}.tar.bz2"
-SRC_URI="gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-gtk.tar.bz2 )
-	!gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-fox.tar.bz2 )"
-
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="CPL-1.0 LGPL-2.1"
-
-DEPEND="virtual/libc
-	virtual/x11
-	gtk? ( >=x11-libs/gtk+-2 )"
-
-S="${WORKDIR}/${MY_P}-linux-${TOOLKIT}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	dodir /opt/sancho
-	dodir /opt/bin
-
-	cd ${S}
-	cp -dpR sancho distrib lib ${D}/opt/sancho
-
-	exeinto /opt/sancho
-	doexe sancho-bin
-
-	exeinto /opt/bin
-	newexe ${FILESDIR}/sancho.sh sancho
-
-	dodir /etc/env.d
-	echo -e "PATH=/opt/sancho\n" > ${D}/etc/env.d/20sancho
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Sancho requires the presence of a p2p core, like"
-	einfo "net-p2p/mldonkey, in order to operate."
-	einfo
-	einfo "Note also that previous versions of sancho-bin"
-	einfo "had the gtk2 USE flag by mistake. This has now"
-	einfo "been changed to \"gtk\" for those affected."
-	einfo
-}
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.11.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.11.ebuild
index 632a831e5ff9..56bc500f7337 100644
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.11.ebuild
+++ b/net-p2p/sancho-bin/sancho-bin-0.9.4.11.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-p2p/sancho-bin/sancho-bin-0.9.4.11.ebuild,v 1.1 2004/08/23 00:55:54 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.11.ebuild,v 1.2 2004/09/16 23:55:48 squinky86 Exp $
 
 IUSE="gtk"
 
@@ -15,13 +15,14 @@ SRC_URI="http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-${TOOLKIT}.tar.bz2"
 SRC_URI="gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-gtk.tar.bz2 )
 	!gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-fox.tar.bz2 )"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="CPL-1.0 LGPL-2.1"
 
 DEPEND="virtual/libc
 	virtual/x11
-	gtk? ( >=x11-libs/gtk+-2 )"
+	gtk? ( >=x11-libs/gtk+-2
+		>=net-libs/linc-1.0.3 )"
 
 S="${WORKDIR}/${MY_P}-linux-${TOOLKIT}"
 
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.14.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.14-r1.ebuild
index 4e9e719d0134..91b698b64fc6 100644
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.14.ebuild
+++ b/net-p2p/sancho-bin/sancho-bin-0.9.4.14-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-p2p/sancho-bin/sancho-bin-0.9.4.14.ebuild,v 1.1 2004/09/15 18:00:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.14-r1.ebuild,v 1.1 2004/09/16 23:55:48 squinky86 Exp $
 
 IUSE="gtk"
 
@@ -21,7 +21,8 @@ LICENSE="CPL-1.0 LGPL-2.1"
 
 DEPEND="virtual/libc
 	virtual/x11
-	gtk? ( >=x11-libs/gtk+-2 )"
+	gtk? ( >=x11-libs/gtk+-2
+		>=net-libs/linc-1.0.3 )"
 
 S="${WORKDIR}/${MY_P}-linux-${TOOLKIT}"
 
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild
deleted file mode 100644
index 326a5756b708..000000000000
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild,v 1.3 2004/09/11 16:10:27 squinky86 Exp $
-
-IUSE="gtk"
-
-MY_P=${P/-bin/}
-MY_P=${MY_P%.*}-${MY_P##*.}
-
-use gtk && TOOLKIT="gtk" || TOOLKIT="fox"
-
-DESCRIPTION="a powerful frontend for mldonkey"
-HOMEPAGE="http://sancho-gui.sourceforge.net/"
-SRC_URI="http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-${TOOLKIT}.tar.bz2"
-SRC_URI="gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-gtk.tar.bz2 )
-	!gtk? ( http://sancho-gui.sourceforge.net/tmp/${MY_P}-linux-fox.tar.bz2 )"
-
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="CPL-1.0 LGPL-2.1"
-
-DEPEND="virtual/libc
-	virtual/x11
-	gtk? ( >=x11-libs/gtk+-2 )"
-
-S="${WORKDIR}/${MY_P}-linux-${TOOLKIT}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	dodir /opt/sancho
-	dodir /opt/bin
-
-	cd ${S}
-	cp -dpR sancho distrib lib ${D}/opt/sancho
-
-	exeinto /opt/sancho
-	doexe sancho-bin
-
-	exeinto /opt/bin
-	newexe ${FILESDIR}/sancho.sh sancho
-
-	dodir /etc/env.d
-	echo -e "PATH=/opt/sancho\n" > ${D}/etc/env.d/20sancho
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Sancho requires the presence of a p2p core, like"
-	einfo "net-p2p/mldonkey, in order to operate."
-	einfo
-	einfo "Note also that previous versions of sancho-bin"
-	einfo "had the gtk2 USE flag by mistake. This has now"
-	einfo "been changed to \"gtk\" for those affected."
-	einfo
-}