amd64 stable, bug 259482

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 13 insertions, 61 deletions

diff --git a/app-editors/joe/ChangeLog b/app-editors/joe/ChangeLog
index 9cd55e425adf..a8fc6bb4f0a9 100644
--- a/app-editors/joe/ChangeLog
+++ b/app-editors/joe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/joe
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.68 2010/01/16 22:39:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/ChangeLog,v 1.69 2010/03/05 18:57:22 pacho Exp $
+
+  05 Mar 2010; Pacho Ramos <pacho@gentoo.org> -joe-3.7.ebuild,
+  joe-3.7-r1.ebuild:
+  amd64 stable, bug 259482 . Also remove old testing and broken version
 
 *joe-3.7-r1 (16 Jan 2010)
 
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 3fda910d6582..ba90d70c7338 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -5,14 +5,13 @@ AUX joe-3.7-segfault-fix.patch 562 RMD160 2e8e889006dbd460e2d473c31f9f3659565dca
 DIST joe-3.5.tar.gz 613815 RMD160 c58d2bdd4882bf698722d5a8e840f3d7a0221fc6 SHA1 aeee6bb71ed1e9b9c9a2a64d8e078a06245957e5 SHA256 a295f1c5e0cb0f0ae0446c419a248517cb04ae1881f982964a7a7595cde9f2e6
 DIST joe-3.7.tar.gz 696036 RMD160 7e2c72a750c6aac4732cf4369bceee5333460f15 SHA1 54398578886d4a3d325aece52c308a939d31101d SHA256 cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f
 EBUILD joe-3.5.ebuild 1495 RMD160 4feadcebe2cc2b93026856975e1728e93b816e3a SHA1 25625c3f5107938ea16a0e75949b7e043c7d9438 SHA256 174fbedb86a85f37cfbe3edd0045643d94a600772aaefac5b507705f1c35f647
-EBUILD joe-3.7-r1.ebuild 1543 RMD160 eb1c9cc2ceb67f8ac67489dfde0f83d8068832f2 SHA1 eb8ac1c9ac730fbb3fa23e7ca537d85f3828852e SHA256 87dfe2d57eadfc00e1513bcba4be5d2e183de87d93653b86390e7af01ec3fa27
-EBUILD joe-3.7.ebuild 1460 RMD160 543e45b738f2e568f3dde8351e60d59f2d263993 SHA1 6f474d5861466e0b87c8cbc582006430f15ee566 SHA256 0790c7aa05e00b09a30b7c6eabce898f72f71d705f49b92a8963d1a00c55aa2e
-MISC ChangeLog 8512 RMD160 2c908387b95abf52a70afccd702db92919e62cfd SHA1 3291b54ba0ef3a09dd6c2f77ee35ca75d604788b SHA256 1b8a65d77c336a83229fbb8d14d30a3338e0ba4da4b8fddb00707bd39c80aedf
+EBUILD joe-3.7-r1.ebuild 1542 RMD160 e939acc20f99d4982a64fdca1d4d37fb264a0d90 SHA1 26deef02a7e3f9bacf8b765d7a5d6ca3c5cc0ca3 SHA256 7fb444e6ecd797268576b5ae98b3f3d11bff1fb7cfd42fb49bb68c2dacfbc0cf
+MISC ChangeLog 8669 RMD160 956e346ae5364c26225ad0754412c640f92d141d SHA1 5ab0e12b8aeeafda55e9f144a0f95c03b581cb82 SHA256 331202f1b9d39b7b2aeb0fccab20c6c2675fd4e11b985f2afb4f758038f33039
 MISC metadata.xml 744 RMD160 57ae49e0dbd2ccfdbb994d1d43ea1b4167ce5637 SHA1 a7f6a18d6ab448a54c88621687d8eb6701ac016e SHA256 a0af8fa4bccf2a9372d5b4d08e3b1745edd2b2a2cc8bfb9ef2ba9dff66d608e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktSQDUACgkQCaWpQKGI+9TGkwCgg1/MD/Sh2/q5bEUO9MTCvSlv
-XNMAnipSqD5ZwkclA4Q592Za1m7jimwK
-=xyJK
+iEYEARECAAYFAkuRVBgACgkQCaWpQKGI+9R15QCfV9g4oPdDH7ARWcrTpGq48OL6
+Aw8AoIRFJFgCmRI3uN3Qi8Vo2gSeH3TI
+=CLJ5
 -----END PGP SIGNATURE-----
diff --git a/app-editors/joe/joe-3.7-r1.ebuild b/app-editors/joe/joe-3.7-r1.ebuild
index ae37e2429f92..62420ffadbb5 100644
--- a/app-editors/joe/joe-3.7-r1.ebuild
+++ b/app-editors/joe/joe-3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r1.ebuild,v 1.1 2010/01/16 22:39:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r1.ebuild,v 1.2 2010/03/05 18:57:22 pacho Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/app-editors/joe/joe-3.7.ebuild b/app-editors/joe/joe-3.7.ebuild
deleted file mode 100644
index 7f188649f28d..000000000000
--- a/app-editors/joe/joe-3.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7.ebuild,v 1.6 2009/11/15 19:26:48 armin76 Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/rc
-
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
-		done
-	fi
-}
-
-src_compile() {
-	# Bug 34609 (joe 2.9.8 editor seg-faults on 'find and replace' when compiled with -Os)
-	replace-flags "-Os" "-O2"
-
-	econf --docdir=/usr/share/doc/${PF} || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc ChangeLog HACKING HINTS LIST NEWS README TODO
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}