Switched to EAPI-5 for verbose build (bug #445388) and update desktop mimedatabase (bug #438224)

(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

3 files changed, 22 insertions, 60 deletions

diff --git a/dev-util/geany/ChangeLog b/dev-util/geany/ChangeLog
index ec46d06635b0..c46e0edfdf40 100644
--- a/dev-util/geany/ChangeLog
+++ b/dev-util/geany/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/geany
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.58 2012/09/27 00:08:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.59 2012/12/01 12:15:00 polynomial-c Exp $
+
+*geany-1.22-r1 (01 Dec 2012)
+
+  01 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> -geany-0.21-r1.ebuild,
+  -geany-1.22.ebuild, +geany-1.22-r1.ebuild:
+  Switched to EAPI-5 for verbose build (bug #445388) and update desktop mime
+  database (bug #438224). Removed old.
 
   27 Sep 2012; Anthony G. Basile <blueness@gentoo.org> geany-1.22.ebuild:
   stable ppc, bug #429056
diff --git a/dev-util/geany/geany-0.21-r1.ebuild b/dev-util/geany/geany-0.21-r1.ebuild
deleted file mode 100644
index 9938009b1613..000000000000
--- a/dev-util/geany/geany-0.21-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.21-r1.ebuild,v 1.2 2012/06/14 17:54:41 xmw Exp $
-
-EAPI=4
-inherit eutils gnome2-utils
-
-LANGS="ast be bg ca cs de el en_GB es fi fr gl hu it ja kk ko lb nl pl pt pt_BR ro ru 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 Scintilla"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+vte"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=dev-libs/glib-2.16: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}
-	find "${ED}" -type f -name '*.la' -delete
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/geany/geany-1.22.ebuild b/dev-util/geany/geany-1.22-r1.ebuild
index 33f3259823cc..b6fce5a6e03a 100644
--- a/dev-util/geany/geany-1.22.ebuild
+++ b/dev-util/geany/geany-1.22-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.22.ebuild,v 1.5 2012/09/27 00:08:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.22-r1.ebuild,v 1.1 2012/12/01 12:15:00 polynomial-c Exp $
 
-EAPI=4
-inherit eutils gnome2-utils
+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"
@@ -45,9 +45,17 @@ src_configure() {
 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}
-	find "${ED}" -type f -name '*.la' -delete
+	prune_libtool_files --all
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}