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

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 37 insertions, 67 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/Manifest b/dev-util/geany/Manifest
index ed545fd96ebe..719fe5cfb1c3 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST geany-0.21.tar.bz2 3109890 SHA256 cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c SHA512 c9e964279ebd84f4fe1dffa73b4771483df011f7a521758a154f1ea1a3ee56d487427d45c6d59c1de3f6267187d2a21aaa08a83b416b32f9fd04e9d7ceff5582 WHIRLPOOL e8584cd5b33cf67c4762aa1f8e36c4caaf971d168947348e93a69b6a6da20a9deeb5f634a50cd4384052b0fdbc0712eb60e8666637810cd937520b994beb4127
 DIST geany-1.22.tar.bz2 3198289 SHA256 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e SHA512 59c411dc8df9f92fd26dc1c4ba65d18c92a2a9e84ae4413153d697ccd90f00d1d437ce63700e3198869dc11dcb8c81920df57a75b5a95cebeb88a364418869cc WHIRLPOOL 8c63308feecf1abb730671c077efc97ee788ac2bed90d0400b7480946eeb9c84e16a3c7b38a46f356eb6f51d68972c8b7b4c0c62b37a3ab95ff003a712a494d0
-EBUILD geany-0.21-r1.ebuild 1434 SHA256 30821618b96c2376c86d1163de579112a6310303906ba120bb8fcf4456bb7eb1 SHA512 20e9edf69283a747833a90dd7f585346387072413e2516dcd9b1a2493547ef655ef46159dfe9806101be249e9da362c004ac9ece51df728477ad8f89b997b4a3 WHIRLPOOL 938e664da59358886256eeec816d27235cadebd00b479a2ec02e13498892b71f771b43c2d58ea87d1dc601d270a186602989569065e792c09f4c03b050a667e9
-EBUILD geany-1.22.ebuild 1454 SHA256 cab7759fb8e5daf6174d8fe64c37da0968d28086546ac404cbd403f667e84cf3 SHA512 ec528de2fd9fb5290b7d838e472164f3d6428bfd4f49705d67e0f46a2b2e5874e3a819834f95805f931804416998c919cfaf9343e03a97ad13dca3dd7eeabf24 WHIRLPOOL 780eaa8003e4a492e53f2ad606251e77faeb29332365a904383429f7434a5d6883ba0f9eb9d21436a726f4fd43f4e439b642eb2dcf50a2ddf10cb47cc97f5516
-MISC ChangeLog 7472 SHA256 c0725b5382b455b1dd3f9f465efb7d98d01158c0032646babb9250b7e2603c1a SHA512 ec419e9f80c20b4eaec48bdda87092c804258eafa8bb517079dbac148bb239cc86fcac12ab9acc3203ec9f694fab732546588cb4ad5e1d00223aed34891db378 WHIRLPOOL cfe9ffc62c290ba436122502332577b6f83ca6dfd0756cce6b56e2125891ec1a0e5de9c3eacde9693042419c41e52113c2149d5ff501ea9899ea62beb2986792
+EBUILD geany-1.22-r1.ebuild 1524 SHA256 9b2e24c220647e5c80447ff483c110a6b0db519a97570647fbecd8d108906982 SHA512 6f9e710555f10c922d321c2235e1bf54e824e488863509a66d14557aa6384fa6842f8c26ed6756532edba5b15aeedb1f3f4ac1aa3b5425a6e8c3a49b6ab0a0bb WHIRLPOOL 6c57dbc429b2fc34e7582f50f8bf1c709e70b735b3474e4d78539d0b8b5465940dcd869d34232ead608b9ba492fc4b3f7e2b10563ff3042c66074a602fdbafaa
+MISC ChangeLog 7745 SHA256 ee1d138cea8e11aba880340c9e8cf5f7e65afd32e6a3ccdcd367bd27e9171210 SHA512 54f9c509777d8864ef78dcd3c166d672e970e3bfbd0767b71bac527459c5656422d145f297f04975b9581a873304ac72f52d6b54add33ea17cba5fabaa424fbe WHIRLPOOL c86c356dff71948fae6fc7d54038449eca4133b9ed0bb4400cf857da0f66eb9f1b16325ea7e93f1b6afcf1a9478ec9b1308e27dc715a5d7a4540cb76cc75f92d
 MISC metadata.xml 1922 SHA256 2a7ea9ffd1605dbce99497564a98bbb49d20c2d62f11fed8c1d39ce7988645d4 SHA512 8d54c284469f12733610b66947c75e055bb46f41213573ce811e8fd2d48b3a90e822c753118d0a213e0f1262dd513681dede592fd27ef814b6455725ab186e57 WHIRLPOOL 041975002890b1fd0d28adb1823ec38da865efbd307666777fb1839c5e9f82d465c497f8e846845fa692cacff221e6eb0eb53083c0b8867fefb7e3d23d5e1441
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBjmR4ACgkQl5yvQNBFVTV8aQCffKr17MSjb8h+vJ37x76Q6JwF
-XQMAnRRXj7DmoLz1kWgcl2oo+3DHjh9A
-=2A53
+iQIcBAEBCAAGBQJQufTFAAoJEPiazRVxLXTFVdgP/iK5YCjn15T7PoJ6RnUzQWZE
+6Is8KU8FgiJ5+JawArbTfVZWMaSfkWOp7rNsInUn3w6yo7EazPzKV1XR3qv9HuZV
+INNjEf9Ty5Sb3Ajan0MLRqn6gBtYE+ZhoWAvNUq1Jn0oonEPXhBZ5vHnXGnjWLp1
+P2VyXP4pYztRrZyAu78JapEk0Q2xSbfoJBmGMuOTEgfzDcH9ISwCCKuT6rfLolPR
+frHl3syi10Q+cOzbmyVTwolI0PnP7BRRFcaN8Z22Bu490wRTxtT1u2Chu6qHj3jP
+oGMrNK7fJWbBUHYGG+NkkpzVDvj5qeWBkiU997aHV2me6fnOjOAFddBl+VjoGtI7
+LzbhCpWXHqZPV9yv+JQcQEhGaa12jCnzW3iVhdR3gqfQEe5LYWznLpNkK0rXPQ87
+XCU4G5UiN4NGpzgVLJpkvzULEsNFdflcOPxgWfqIMfZd0CW+zbd3dEfAr8g5p/g3
+8coj81UFuk4r+1enC0jzOSJrRdUdOx1LdxWAABqHFbHSzlJ7TerDlac0X9w/KFO9
+yAZf0Gwx9rLgwui8zyC+ebVOlX67LnVSuPiAK+ipzhD5Ukmn7IBgwHoATvHdP/ea
+zOJk4qWBtz5pBc0kX1noKSiY/hoGmUgtAd7WRbNVKcpDZSqrsfe56vb8eL9czXB6
+dZsBDCz61+wkKuiLLfaz
+=9Uh1
 -----END PGP SIGNATURE-----
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
+}