Version bump. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 11 insertions, 65 deletions

diff --git a/dev-util/geany/ChangeLog b/dev-util/geany/ChangeLog
index ab2b6de232ce..c0caa1ace310 100644
--- a/dev-util/geany/ChangeLog
+++ b/dev-util/geany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/geany
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.77 2014/01/14 21:26:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.78 2014/04/13 21:03:34 polynomial-c Exp $
+
+*geany-1.24 (13 Apr 2014)
+
+  13 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -geany-1.22-r1.ebuild,
+  -geany-1.23.ebuild, +geany-1.24.ebuild:
+  Version bump. Removed old.
 
   14 Jan 2014; Pacho Ramos <pacho@gentoo.org> geany-1.23.1.ebuild:
   ia64 stable, bug #488810 (thanks to Emeric Maschino for testing)
diff --git a/dev-util/geany/geany-1.22-r1.ebuild b/dev-util/geany/geany-1.22-r1.ebuild
deleted file mode 100644
index 0bbe0c0e77c1..000000000000
--- a/dev-util/geany/geany-1.22-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.22-r1.ebuild,v 1.7 2013/02/21 21:46:47 ulm Exp $
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es fi fr gl hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="http://www.geany.org"
-SRC_URI="http://download.geany.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+vte"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
-	>=dev-libs/glib-2.20:2
-	vte? ( x11-libs/vte:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.23.ebuild b/dev-util/geany/geany-1.24.ebuild
index a16e08e16622..773e2bb325e9 100644
--- a/dev-util/geany/geany-1.23.ebuild
+++ b/dev-util/geany/geany-1.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.23.ebuild,v 1.2 2013/03/11 12:57:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.24.ebuild,v 1.1 2014/04/13 21:03:34 polynomial-c Exp $
 
 EAPI=5
 inherit eutils fdo-mime gnome2-utils
@@ -39,11 +39,12 @@ src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--docdir="/usr/share/doc/${PF}" \
+		--disable-gtk3 \
 		$(use_enable vte)
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install || die
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
 	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
 	prune_libtool_files --all
 }