x86 stable and remove old, bug #218563

(Portage version: 2.1.5_rc6)

3 files changed, 7 insertions, 61 deletions

diff --git a/dev-util/geany/ChangeLog b/dev-util/geany/ChangeLog
index 215a4c0dd5c4..eca90b8e9fce 100644
--- a/dev-util/geany/ChangeLog
+++ b/dev-util/geany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/geany
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.12 2008/04/20 17:06:50 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.13 2008/04/23 21:30:21 maekke Exp $
+
+  23 Apr 2008; Markus Meier <maekke@gentoo.org> -geany-0.12.ebuild,
+  geany-0.13.ebuild:
+  x86 stable and remove old, bug #218563
 
   20 Apr 2008; Samuli Suominen <drac@gentoo.org> geany-0.13.ebuild:
   amd64 stable wrt #218563, thanks to Víctor Enríquez for testing.
diff --git a/dev-util/geany/geany-0.12.ebuild b/dev-util/geany/geany-0.12.ebuild
deleted file mode 100644
index 1760046cd45d..000000000000
--- a/dev-util/geany/geany-0.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.12.ebuild,v 1.3 2008/01/21 22:16:06 maekke Exp $
-
-DESCRIPTION="GTK+ based fast and lightweight IDE."
-HOMEPAGE="http://geany.uvena.de"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	http://files.uvena.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 Scintilla"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc minimal"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	!minimal? ( x11-libs/vte )"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix test suite.
-	echo geany.desktop.in.in >> po/POTFILES.skip
-	echo geany.glade >> po/POTFILES.skip
-	echo plugins/demoplugin.c >> po/POTFILES.skip
-	echo geany.desktop.in.in >> po/POTFILES.skip
-	echo geany.glade >> po/POTFILES.skip
-	echo plugins/demoplugin.c >> po/POTFILES.skip
-
-	# Add syntax highlighting for Portage.
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" data/filetype_extensions.conf
-
-	# Change license references.
-	local licdir="${PORTDIR}/licenses"
-	local lic="${licdir}/GPL-2"
-	sed -i -e "s:@GEANY_DATA_DIR@/GPL-2:${lic}:" doc/geany.1.in
-	sed -i -e "s:\"GPL-2\", app->datadir:\"GPL-2\", \"${licdir}\":" src/about.c
-}
-
-src_compile() {
-	econf $(use_enable !minimal vte) \
-		--disable-dependency-tracking --enable-the-force
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO THANKS
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/usr/share/${PN}/GPL-2
-
-	if use doc; then
-		dohtml -r doc/geany.css doc/html/*
-		newdoc doc/geany.txt manual.txt
-	fi
-}
diff --git a/dev-util/geany/geany-0.13.ebuild b/dev-util/geany/geany-0.13.ebuild
index f30719d7facb..9ca19e45787b 100644
--- a/dev-util/geany/geany-0.13.ebuild
+++ b/dev-util/geany/geany-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.13.ebuild,v 1.3 2008/04/20 17:06:50 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.13.ebuild,v 1.4 2008/04/23 21:30:21 maekke Exp $
 
 EAPI=1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 Scintilla"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+vte"
 
 RDEPEND=">=x11-libs/gtk+-2.6