Simple docdir fix (bug #419745). Bumped straight to stable. Removed old versions

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 32 insertions, 57 deletions

diff --git a/dev-util/geany/ChangeLog b/dev-util/geany/ChangeLog
index d3f2ad046f1a..95d65a0e291d 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.51 2012/05/04 17:51:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/ChangeLog,v 1.52 2012/06/06 13:24:05 polynomial-c Exp $
+
+*geany-0.21-r1 (06 Jun 2012)
+
+  06 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> -geany-0.20.ebuild,
+  -geany-0.21.ebuild, +geany-0.21-r1.ebuild:
+  Simple docdir fix (bug #419745). Bumped straight to stable. Removed old
+  versions.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> geany-0.19.2.ebuild,
   geany-0.20.ebuild, geany-0.21.ebuild:
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 2078aee8bde6..4515c5eeb534 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST geany-0.19.2.tar.bz2 2909452 RMD160 7207d0efab669ae598832ac3e7618723a44446f7 SHA1 97d948344bc6b79df0b796c7c23de23c7fa27649 SHA256 99fc2ae4c04723d1b4d466c6b546fa74ec1d4c285b8a13f65037ea2a3a24fe79
-DIST geany-0.20.tar.bz2 3010953 RMD160 85f4c33711449942fab021c2b8c2396dcedf426c SHA1 eb8dd15faf8281b346d06ea3231af379c8a758e0 SHA256 59ae065c5ab007eea7dd3f2df6ca0cde61b326ce2d6aa2d5b44f5554fd2895bd
 DIST geany-0.21.tar.bz2 3109890 RMD160 bf73c88709a36a76ffc14e13d38dc08083abe71b SHA1 696da324ac71621e95ce597cceaf695539798ffc SHA256 cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c
 EBUILD geany-0.19.2.ebuild 1328 RMD160 a46d56f4a77cb3c66c3020659f74cbf91ea9b6db SHA1 1f8eb1f17458d7b531daf421e28800b73ed7e9f3 SHA256 91714d7f16cb9d00d6c4e150887debfec31972824bec95346701708e5566c2f8
-EBUILD geany-0.20.ebuild 1332 RMD160 79ad33da1697432821e4c95edd3b81c6ba332112 SHA1 ab15dffa8db89539756e242a372c80292b6f5b4f SHA256 f2a6e62075251aa7a72542d466650abce19f6770d914021e60d9e89e27cbb21a
-EBUILD geany-0.21.ebuild 1399 RMD160 72126009a5b8920f9f999c8468603594a21e6ca7 SHA1 22aa97689bcc7cc2c1597bad6f4695b16464eb59 SHA256 8877a5e830954d7a6c31c8d46e7be42026a3ebd60ed00c18ab494b3333b0c90a
-MISC ChangeLog 6567 RMD160 47a9aa1adca8ffc93336e882238b824188a0470d SHA1 f1dc151ee55224f287e393a35b466f7c671b3afe SHA256 d9a97804b9ef99fe1c99ac8170340f01602f48c441c8af4bf9ee9752b4f7a545
+EBUILD geany-0.21-r1.ebuild 1444 RMD160 630d31b4998cf3bddbf7d6e53eef3a58e729e551 SHA1 dc2973f7abd0277e7640e55936708000b79710dc SHA256 815e5f9f94e385ff0aed403571b0853888ca264ed02a2dd2f392a3a70036498d
+MISC ChangeLog 6809 RMD160 fab308e99a75b662b78ae87b39ddaa7ad9acae0f SHA1 a2bfc1a9954b7eec56823dcccf135af8b93f92d2 SHA256 279663dcf1d0c138a1ce9524e3b5ebdb8748a7386b76a5f8528cd81405958749
 MISC metadata.xml 1922 RMD160 700b0d1a3c02fd8933246d1386ef05ce06f6aabc SHA1 20cc85484ea136e6641c5749c262795646a4e380 SHA256 2a7ea9ffd1605dbce99497564a98bbb49d20c2d62f11fed8c1d39ce7988645d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPz1n6AAoJEPiazRVxLXTFIoIP/0bTXamBj6pzcxlzDihVMc/O
+Wc+apMXN/Lt0m3kCvq1fO5Kjv1ok6PpfiuHVfuf2XxiZNJxG65ydzflzVSt75Ry9
+5btKge7mOL87mYeextCMYrxZ+jNn+M8qJTccIpOEo2/0o8eH6sc3fokbiG2CmddI
+Jp2r/9eaCcOxklUmZPwz5hEWlPcuN5DGSmyKUB1TWCWaBjy/cr0CKYgXDAr44hIm
+268hVtcDhrXN2XTt5dYUofSJu074YXSR66PNvX91Gl8unrkRjJr9APOnQ69BgiQQ
+/e6uhrdFW7ucdnPGkLLAiMu49X4LlDDb+ZTxTFIGDbIkuGBKrUog9ah9Scqvb0/Z
+bcse5qMIcRUS8ev7WMpVMZdpqY9lCbarVt16iGQEZLoT6aDrqo3Hc1HK0AN+7SHx
+mQOjM3IzBK1HPCP+sRKlFSv5UsmDtMHh88Ocoh1kNjgEnsj8OJljOoLpxfbYTBYO
+HiafYC72zHgl19x0/DfIdKpKxwVKiX2ZquHz2cJMJOFIkdu95KY+1CKJvSoSxvd+
+T3vjwGiRdfUpmau8PLsXtdQTtEv/zUDVBWIIbItCOc/FOvxvpNp1hV3AyVui3hT8
+nEeuzDBdwHgf+s6awJZwvZsQwLX/SegjX22GgqOurilYg72Kj+8Uf8rsMXegbTkA
+DD3lZc0qA9gaZ4uP5I01
+=0qA0
+-----END PGP SIGNATURE-----
diff --git a/dev-util/geany/geany-0.20.ebuild b/dev-util/geany/geany-0.20.ebuild
deleted file mode 100644
index 82a0f1655526..000000000000
--- a/dev-util/geany/geany-0.20.ebuild
+++ /dev/null
@@ -1,51 +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.20.ebuild,v 1.6 2012/05/04 17:51:43 jdhore 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"
-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 \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install || die
-	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/geany/geany-0.21.ebuild b/dev-util/geany/geany-0.21-r1.ebuild
index 2a86f4297487..c4564fadc449 100644
--- a/dev-util/geany/geany-0.21.ebuild
+++ b/dev-util/geany/geany-0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.7 2012/05/04 17:51:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-0.21-r1.ebuild,v 1.1 2012/06/06 13:24:05 polynomial-c Exp $
 
 EAPI=4
 inherit eutils gnome2-utils
@@ -38,6 +38,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
 		$(use_enable vte)
 }