stable on x86 irt #60108

6 files changed, 15 insertions, 66 deletions

diff --git a/net-p2p/sancho-bin/ChangeLog b/net-p2p/sancho-bin/ChangeLog
index 639927d15525..274a4b9d0b00 100644
--- a/net-p2p/sancho-bin/ChangeLog
+++ b/net-p2p/sancho-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2004/08/11 17:05:05 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/ChangeLog,v 1.12 2004/08/13 00:15:57 squinky86 Exp $
+
+  12 Aug 2004; Jon Hood <squinky86@gentoo.org> -sancho-bin-0.9.4.5-r1.ebuild,
+  sancho-bin-0.9.4.7.ebuild, sancho-bin-0.9.4.9.ebuild:
+  Stable on x86 irt #60108 and removing non-working version.
 
 *sancho-bin-0.9.4.9 (11 Aug 2004)
 
diff --git a/net-p2p/sancho-bin/Manifest b/net-p2p/sancho-bin/Manifest
index 953ae0eb19bc..f2e4490b5750 100644
--- a/net-p2p/sancho-bin/Manifest
+++ b/net-p2p/sancho-bin/Manifest
@@ -1,11 +1,9 @@
 MD5 3f2f50ff19666b678ce7cd1165cd2305 sancho-bin-0.9.4.8.ebuild 1287
-MD5 16f96c72e2be5feefb5006cf72ad29c7 sancho-bin-0.9.4.5-r1.ebuild 1309
-MD5 77118a62d46b4231a948196f2b7688e7 sancho-bin-0.9.4.7.ebuild 1287
-MD5 8898de5ab632fc341ed8fc2a4e797bed sancho-bin-0.9.4.9.ebuild 1287
-MD5 5c25bdd0951eb8ab351b957ce25b3895 ChangeLog 1842
+MD5 3a9deee4449945ada740fcce5db955aa sancho-bin-0.9.4.7.ebuild 1286
+MD5 284b2534520e3a5f8be00b5051f547a0 sancho-bin-0.9.4.9.ebuild 1459
+MD5 4e82b4ac57be442837035fde4905cb60 ChangeLog 2038
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 9c8935033c3fe62be83d6ad6e80d5f4e files/sancho.sh 260
-MD5 94095fc16619d56b11b9ef972c422043 files/digest-sancho-bin-0.9.4.5-r1 156
 MD5 f264a1342a6e98c198fa05c3c1c39b91 files/digest-sancho-bin-0.9.4.7 156
 MD5 12281da16f34f3a4693efbc0b7b233d3 files/digest-sancho-bin-0.9.4.8 156
 MD5 a2ae84d56946ee97066eaa975014c4c3 files/digest-sancho-bin-0.9.4.9 156
diff --git a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.5-r1 b/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.5-r1
deleted file mode 100644
index d463324bc338..000000000000
--- a/net-p2p/sancho-bin/files/digest-sancho-bin-0.9.4.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b3ff8e6dfff3631ed0ab8e5df4ff1f3a sancho-0.9.4-5-linux-gtk.tar.bz2 4831347
-MD5 7ed5b82ab7fdcc8507ab9658fd64af0e sancho-0.9.4-5-linux-fox.tar.bz2 5085770
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.5-r1.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.5-r1.ebuild
deleted file mode 100644
index bd73178ddcad..000000000000
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.5-r1.ebuild
+++ /dev/null
@@ -1,55 +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.5-r1.ebuild,v 1.5 2004/08/10 02:33:48 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"
-RESTRICT="nomirror"
-
-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
-}
diff --git a/net-p2p/sancho-bin/sancho-bin-0.9.4.7.ebuild b/net-p2p/sancho-bin/sancho-bin-0.9.4.7.ebuild
index 41d92523e4c1..a3e2f94cc181 100644
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.7.ebuild
+++ b/net-p2p/sancho-bin/sancho-bin-0.9.4.7.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.7.ebuild,v 1.2 2004/08/10 02:33:48 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.7.ebuild,v 1.3 2004/08/13 00:15:57 squinky86 Exp $
 
 IUSE="gtk"
 
@@ -15,7 +15,7 @@ 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"
 
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
index 077961a76ad4..3736d35c2f0d 100644
--- a/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild
+++ b/net-p2p/sancho-bin/sancho-bin-0.9.4.9.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.9.ebuild,v 1.1 2004/08/11 17:05:05 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/sancho-bin/sancho-bin-0.9.4.9.ebuild,v 1.2 2004/08/13 00:15:57 squinky86 Exp $
 
 IUSE="gtk"
 
@@ -51,4 +51,8 @@ pkg_postinst() {
 	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
 }