amd64 stable

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 27 insertions, 134 deletions

diff --git a/dev-util/geany/ChangeLog b/dev-util/geany/ChangeLog
index c554cd38c543..1e64b440904a 100644
--- a/dev-util/geany/ChangeLog
+++ b/dev-util/geany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/geany
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.24 2009/05/01 18:04:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.25 2009/05/05 10:19:57 ssuominen Exp $
+
+  05 May 2009; Samuli Suominen <ssuominen@gentoo.org> -geany-0.13.ebuild,
+  -geany-0.15.ebuild, geany-0.16.ebuild:
+  amd64 stable wrt #267981
 
   01 May 2009; Raúl Porcel <armin76@gentoo.org> geany-0.16.ebuild:
   x86 stable wrt #267981
@@ -22,17 +26,13 @@
   20 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> geany-0.15.ebuild:
   stable amd64, bug 251582
 
-  24 Nov 2008; <ssuominen@gentoo.org> metadata.xml, -geany-0.14.ebuild:
-  Rename my old e-mail address drac at gentoo.org to ssuominen at gentoo.org
-  and remove unused version. Try to stabilize 0.15 next.
-
   22 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> geany-0.15.ebuild:
   gnome2_icon_savelist added, per ssuom... The Finnish Guy!s orders
 
 *geany-0.15 (21 Nov 2008)
 
   21 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> +geany-0.15.ebuild:
-  Bump geany to 0.15 for drac. Bug drac about bugs.
+  Bump geany to 0.15 for ssuominen. Bug ssuominen about bugs.
 
   17 Jul 2008; Alexis Ballier <aballier@gentoo.org> geany-0.14.ebuild:
   keyword ~x86-fbsd, thanks to Davide Italiano <dav_it@gentoo.org>, bug
@@ -40,14 +40,14 @@
 
 *geany-0.14 (24 Apr 2008)
 
-  24 Apr 2008; Samuli Suominen <drac@gentoo.org> +geany-0.14.ebuild:
+  24 Apr 2008; Samuli Suominen <ssuominen@gentoo.org> +geany-0.14.ebuild:
   Version bump.
 
   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:
+  20 Apr 2008; Samuli Suominen <ssuominen@gentoo.org> geany-0.13.ebuild:
   amd64 stable wrt #218563, thanks to Víctor Enríquez for testing.
 
   20 Apr 2008; nixnut <nixnut@gentoo.org> geany-0.13.ebuild:
@@ -55,7 +55,7 @@
 
 *geany-0.13 (26 Feb 2008)
 
-  26 Feb 2008; Samuli Suominen <drac@gentoo.org> -geany-0.11.ebuild,
+  26 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> -geany-0.11.ebuild,
   +geany-0.13.ebuild:
   Version bump wrt #211110, thanks to Michele Beltrame for reporting. Stop
   pointing to license directory in portdir wrt #211534, thanks to Bo Ørsted
@@ -64,12 +64,12 @@
   21 Jan 2008; Markus Meier <maekke@gentoo.org> geany-0.12.ebuild:
   x86 stable, bug #206784
 
-  20 Jan 2008; Samuli Suominen <drac@gentoo.org> geany-0.12.ebuild:
+  20 Jan 2008; Samuli Suominen <ssuominen@gentoo.org> geany-0.12.ebuild:
   Fix test suite and mark amd64 stable wrt #206784.
 
 *geany-0.12 (14 Oct 2007)
 
-  14 Oct 2007; Samuli Suominen <drac@gentoo.org> +geany-0.12.ebuild:
+  14 Oct 2007; Samuli Suominen <ssuominen@gentoo.org> +geany-0.12.ebuild:
   Version bump.
 
   02 Sep 2007; nixnut <nixnut@gentoo.org> geany-0.11.ebuild:
@@ -81,12 +81,12 @@
   20 Jun 2007; Christoph Mende <angelos@gentoo.org> geany-0.11.ebuild:
   Added ~amd64 wrt bug 182682
 
-  20 Jun 2007; Samuli Suominen <drac@gentoo.org> metadata.xml:
+  20 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Add longdescription with french translation by Mathieu Bonnet.
 
 *geany-0.11 (19 Jun 2007)
 
-  19 Jun 2007; Samuli Suominen <drac@gentoo.org> +geany-0.11.ebuild:
+  19 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> +geany-0.11.ebuild:
   Initial commit for bug 114815. Thanks to Mathieu Bonnet, Paul Bredbury, Yura
   Semashko, Lucas Chiesa, Steev Klimaszewski, Pacho Ramos and many others.
 
diff --git a/dev-util/geany/geany-0.13.ebuild b/dev-util/geany/geany-0.13.ebuild
deleted file mode 100644
index 8b7088e1b840..000000000000
--- a/dev-util/geany/geany-0.13.ebuild
+++ /dev/null
@@ -1,50 +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.13.ebuild,v 1.6 2008/04/24 17:15:36 drac Exp $
-
-EAPI=1
-
-inherit gnome2-utils
-
-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="+vte"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	vte? ( x11-libs/vte )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Syntax highlighting for Portage.
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" data/filetype_extensions.conf
-}
-
-src_compile() {
-	econf --disable-dependency-tracking --enable-the-force \
-		$(use_enable vte)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" \
-		install || die "emake install failed."
-	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prepalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-0.15.ebuild b/dev-util/geany/geany-0.15.ebuild
deleted file mode 100644
index 4da81b9d6fdc..000000000000
--- a/dev-util/geany/geany-0.15.ebuild
+++ /dev/null
@@ -1,54 +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.15.ebuild,v 1.5 2008/12/20 17:33:55 maekke Exp $
-
-EAPI=1
-
-inherit gnome2-utils
-
-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 ~x86-fbsd"
-IUSE="+vte"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	vte? ( x11-libs/vte )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	# Syntax highlighting for Portage.
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		"${S}"/data/filetype_extensions.conf || die "sed failed."
-}
-
-src_compile() {
-	econf --disable-dependency-tracking --enable-the-force \
-		$(use_enable vte)
-	emake || die "emake failed."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" \
-		install || die "emake install failed."
-	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prepalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-0.16.ebuild b/dev-util/geany/geany-0.16.ebuild
index 38a49436928d..55525aaa9233 100644
--- a/dev-util/geany/geany-0.16.ebuild
+++ b/dev-util/geany/geany-0.16.ebuild
@@ -1,50 +1,47 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.16.ebuild,v 1.3 2009/05/01 18:04:32 armin76 Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.16.ebuild,v 1.4 2009/05/05 10:19:57 ssuominen Exp $
 
+EAPI=2
 inherit gnome2-utils
 
-DESCRIPTION="GTK+ based fast and lightweight IDE."
+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 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="+vte"
 
-RDEPEND=">=x11-libs/gtk+-2.10
+RDEPEND=">=x11-libs/gtk+-2.10:2
 	vte? ( x11-libs/vte )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	# Syntax highlighting for Portage.
+src_prepare() {
+	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		"${S}"/data/filetype_extensions.conf || die "sed failed."
+		data/filetype_extensions.conf || die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf --disable-dependency-tracking --enable-the-force \
 		$(use_enable vte)
-	emake || die "emake failed."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
 }
 
 src_install() {
 	emake DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" \
-		install || die "emake install failed."
+		install || die "emake install failed"
 	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
 	prepalldocs
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 }