Version bump, bug 289583, thank Nikita Melnichenko for report. Drop old.

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

6 files changed, 59 insertions, 174 deletions

diff --git a/app-doc/gimp-help/ChangeLog b/app-doc/gimp-help/ChangeLog
index 3450c37b56e8..4214dc6b3afc 100644
--- a/app-doc/gimp-help/ChangeLog
+++ b/app-doc/gimp-help/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/gimp-help
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.58 2009/03/15 14:39:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.59 2009/10/20 13:29:23 pva Exp $
+
+*gimp-help-2.6.0 (20 Oct 2009)
+
+  20 Oct 2009; Peter Volkov <pva@gentoo.org> -gimp-help-0.12.ebuild,
+  -gimp-help-0.13.ebuild, -gimp-help-2.4.1.ebuild, +gimp-help-2.6.0.ebuild:
+  Version bump, bug 289583, thank Nikita Melnichenko for report. Drop old.
 
   15 Mar 2009; Brent Baude <ranger@gentoo.org> gimp-help-2.4.2.ebuild:
   Marking gimp-help-2.4.2 ppc64 for bug 252653
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 52b0325e7603..e37eec386163 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,13 +1,21 @@
 AUX gimp-help-0.13-image-files.patch 458 RMD160 4f9373f15b66ddeb9cc941176ad3b9c320e0ed66 SHA1 f03455d8362ed11c338ab41cfb0fee3c581c40cc SHA256 08a6b583de5c32d11ddc001e702904c42f8b1d9313d9bc398fdbae5cd73c7e53
 AUX gimp-help-2.4.0-quickreference-linguas.patch 1359 RMD160 215d7fe20c55f85cddc9f0342ac672c3b46d2d57 SHA1 2c473b52c517d68e5edd46fd7b51016a7d4e42cf SHA256 900787059de08dafa98c194ca518239123cafa81d09605be4cfb65015aca609f
 AUX gimp-help-2.4.0-skip-linguas-images.patch 1507 RMD160 4fedd8a403ddd7f2a81449131758b6b92df464b7 SHA1 6740716b797693f4852dd94a34c8d7edf3043dbb SHA256 07a008f46574f6ce3b8ac4ebb5d1098b85320fddb6e2ce83f8ca3fdda2ec173f
-DIST gimp-help-2-0.12.tar.gz 59806667 RMD160 739a2d032ee8d8f852888bc41ec8ce10b3acea03 SHA1 f54a574fe50fa6bac121348bd2aaf7e6492f617a SHA256 605617b0ce9142f6762eefeabd427ba33dfe846bd7d8c543f1cdd26baa4a41b4
-DIST gimp-help-2-0.13.tar.gz 74245267 RMD160 311ea605d1b768a7b8d8013e15e58763ea6d0b72 SHA1 a288838d329521503de83f3d71ed418f3298721e SHA256 26608aaea237494c8554d2b77044e3e98a939505e6e218ca8b2dd7b186c8eece
-DIST gimp-help-2.4.1.tar.bz2 44892363 RMD160 c061c94bd48b5a6b2d2c4247c764147410f59fc5 SHA1 d875a73de4afd0fc134cb73b428b90868ddeb32c SHA256 b5cc43de5b92c10dcd53209af1cc10114072be46a884ef4538f7fdc7ae2fc673
 DIST gimp-help-2.4.2.tar.bz2 49365211 RMD160 368c9c75b1a28637091de57edcd26722cf6e199a SHA1 461ac31e8299185d3f16c658c5008090691e45ef SHA256 e66c577aba33b02123f08decac6191f4a2fdbb1a12744fbb6d1275fa8c4c9745
-EBUILD gimp-help-0.12.ebuild 1863 RMD160 9a01f8216dcb77ba02960f819a3b15d5cdb7f639 SHA1 9b35f2f6e7116902b4b482ea9f6f89ef0567b915 SHA256 62dcb816fcd6d1bb2c9b7756ca5f8f4465b36561888072fb38a65e5b7272980d
-EBUILD gimp-help-0.13.ebuild 1959 RMD160 4be91c28d81cd46b09ccce18b827412ba6a90877 SHA1 2a5f07a1df59b276bf8ff23e1c56e0149f88f30e SHA256 89d176fa76c3cb0b159f30dd32152d723f05fbaad654d8d706e8aeaed825a832
-EBUILD gimp-help-2.4.1.ebuild 1294 RMD160 e822a2268f73eb3098684a99fc4d3f7503a87c7e SHA1 5f5b9b815f9af01761e319a5842f9c92e537a2bf SHA256 2cc4aa4a716698d0d08985404a7955d8582a4c9a9b4eb703a6eaa4461c72b367
+DIST gimp-help-2.6.0-html-de.tar.bz2 32871856 RMD160 fa34043f226526fab274c2482db5501fc3310bc9 SHA1 5973372a4bde0c889a1a00504725a42e760a781b SHA256 91a8c7c14d87a0824e82b24511a13c6230a18c0d6ddbcb7551950c0113f36be9
+DIST gimp-help-2.6.0-html-en.tar.bz2 28336871 RMD160 c66b32f75a1af80c4e42988954fa26dc808a0512 SHA1 220f366a941d31c3aa7e548e8e69463f59804474 SHA256 35e9810be04891aeb7d78f7a90de6065636699089d6762dcfd1abee2afecc3b4
+DIST gimp-help-2.6.0-html-es.tar.bz2 29733901 RMD160 2265741561cc9d2fb47e7dc061f69ab7b7c18d42 SHA1 a3db0cc59dfbb2427a112bc87189753d7b39559a SHA256 fab456b6d46fea16263b85d7eb8d1a5cc048b2546b83798ff31803097242639c
+DIST gimp-help-2.6.0-html-fr.tar.bz2 28639062 RMD160 5a9a00bfd6671ead4a23d231afe52f392dc3da63 SHA1 912eb465570570640db970525ce5549ffe6e999b SHA256 d2de47f6a0e452af617fe4582b7537b909c4197eb11c92afb17af28341916182
+DIST gimp-help-2.6.0-html-it.tar.bz2 29470290 RMD160 3e1e1a83ee1494d30ce9fc55ecdc4e55dafcb389 SHA1 11a9b6ec8bdc4b7d8b55fdedaa325bdd49feda5f SHA256 5ac07ea5eeea5c097b9eda1871c9eaee6ae4d452e75331857604b1c92be68f92
+DIST gimp-help-2.6.0-html-ja.tar.bz2 22829226 RMD160 60d9a5b48813059a01004f1b3186209322ff37ae SHA1 4be49e95ec0b9570c19c9f5f85065e4d27eebabe SHA256 ce249297ca22ae6b51a52de61e385bbbcd1d28675752826795c16b09b42c6478
+DIST gimp-help-2.6.0-html-ko.tar.bz2 27890268 RMD160 b9c6e8bab069946a046b08db7fdd2ea035f07f73 SHA1 3b04e56162139411f07bf28a8891068dd3ca1209 SHA256 041ec6c6473471a7299df239d50b9fbab7d548c311b2389d88cf1bde38527ebd
+DIST gimp-help-2.6.0-html-nl.tar.bz2 28470089 RMD160 3c364d8c57525a1d8a4bc6be2e34c12fda9cdeda SHA1 ffc389b973652e33d3bb3c684b896b56eae00244 SHA256 7a12bce9d5898c1b0f528dbbfba72a829b4f9c116fbe5cd266b7868fcc79276a
+DIST gimp-help-2.6.0-html-nn.tar.bz2 30125547 RMD160 6f7ae3c91e54083af6dd89c3cbad5622634fce43 SHA1 3541c9e2292061f46f76466a57b9dd9c403bb27c SHA256 3657f466cb35b61dbe86d6ed2b837b798686b40b7b80dcb0f07c3f4e445c20b1
+DIST gimp-help-2.6.0-html-pl.tar.bz2 28354353 RMD160 9968f2577a2f1425055a37d7e453afb3e3f0f6fc SHA1 338c629543ffdb20787e3f2df57461b0ec804786 SHA256 cf894ded4036ef0882d69f8638223b9a0e2cbd28d8ee52f19084eb1191862f22
+DIST gimp-help-2.6.0-html-ru.tar.bz2 28960430 RMD160 c76300d56e770cfdcb998b3bda51e4b49623772e SHA1 e6a0ca09f0535f6ff633fecda93f54c9a2542f74 SHA256 0d7ac0e3a6c3c4a534eaa3d829ac7a1563a10a730dad74773c91db8ea38949b5
+DIST gimp-help-2.6.0-html-sv.tar.bz2 29049203 RMD160 47c80a6151ae55e626f93342583ea4d2787e27c6 SHA1 077c8240b331ed9fca5f357bfe6313abd2b9ebaf SHA256 afc9ee5bb119544ac329ba272ffef19b2146b086de8aae1bcd13c0e19d43fe7d
+DIST gimp-help-2.6.0-html-zh_CN.tar.bz2 28337962 RMD160 1d606eb0af1aaee220977c8aedc5504decca609f SHA1 e802ec97463c4c8aecc3c6b21647a39fad70e5bc SHA256 69b17056576ea5ddd44caf4a7949569c94947c2140199328ff8214cf2ba2be8e
 EBUILD gimp-help-2.4.2.ebuild 1286 RMD160 839fc6e395556a7862c7af39dcf7dcfa2128f710 SHA1 73f73f5c0523850a62040f14a1893860f5e31268 SHA256 eb005739792985f858b8e634a3986a20b84f92080aff5f5fb4bfb0425ddaf75a
-MISC ChangeLog 8235 RMD160 daa40ad421d2a1ee271c697f29f727d021807cf5 SHA1 bbfbdcc55ff612728ca2e9b2f8958f59cb6dcf5f SHA256 7a5fd9d2bc98725aa805947d72dc3c03c9ae3e7ca48c6a40d66898be127bcecc
+EBUILD gimp-help-2.6.0.ebuild 1028 RMD160 74256e6dc14edc29c3e1dabc766c862ba3c6ea32 SHA1 d90b2741399c478f46a72afcdbc622dd8f68ee0c SHA256 30c49e439e6412dd4ba3791a3d699ff957eabf52a67dc5fb3eb5823632af0468
+MISC ChangeLog 8485 RMD160 16e475f2c75e9f8d4fcfff9660ea93fe1af6acb3 SHA1 b29f480010c3268b9c8cbff2453684e03c7c2816 SHA256 cba020ccc4a049550f740e8e560894327810c0af492a68992bdf1d3f33dde426
 MISC metadata.xml 391 RMD160 b35843b074c41ec3eb286a74261d97603886a8d8 SHA1 5aa3b018fc81f8ea1873bc40592ad550e4fe9b8c SHA256 c7c816712c3a248fe45b67d6b92048c5f30ec7d7492eebd75890031d6819b960
diff --git a/app-doc/gimp-help/gimp-help-0.12.ebuild b/app-doc/gimp-help/gimp-help-0.12.ebuild
deleted file mode 100644
index 195565f2b3d5..000000000000
--- a/app-doc/gimp-help/gimp-help-0.12.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/app-doc/gimp-help/gimp-help-0.12.ebuild,v 1.12 2008/04/18 10:12:48 pva Exp $
-
-MY_P=${P/gimp-help/gimp-help-2}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="http://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${MY_P}.tar.gz"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="webinstall linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_hr linguas_it linguas_ko linguas_nl linguas_no linguas_ru linguas_sv linguas_zh_CN"
-DEPEND="=app-text/docbook-xml-dtd-4.3*
-		dev-libs/libxml2
-		dev-libs/libxslt
-		webinstall? ( media-gfx/imagemagick )"
-RDEPEND="!<media-gfx/gimp-2.2.12"
-
-src_compile() {
-	local ALL_LINGUAS=""
-
-	use linguas_cs && ALL_LINGUAS="${ALL_LINGUAS} cs"
-	use linguas_de && ALL_LINGUAS="${ALL_LINGUAS} de"
-	use linguas_en && ALL_LINGUAS="${ALL_LINGUAS} en"
-	use linguas_es && ALL_LINGUAS="${ALL_LINGUAS} es"
-	use linguas_fr && ALL_LINGUAS="${ALL_LINGUAS} fr"
-	use linguas_hr && ALL_LINGUAS="${ALL_LINGUAS} hr"
-	use linguas_it && ALL_LINGUAS="${ALL_LINGUAS} it"
-	use linguas_ko && ALL_LINGUAS="${ALL_LINGUAS} ko"
-	use linguas_nl && ALL_LINGUAS="${ALL_LINGUAS} nl"
-	use linguas_no && ALL_LINGUAS="${ALL_LINGUAS} no"
-	use linguas_ru && ALL_LINGUAS="${ALL_LINGUAS} ru"
-	use linguas_sv && ALL_LINGUAS="${ALL_LINGUAS} sv"
-	use linguas_zh_CN && ALL_LINGUAS="${ALL_LINGUAS} zh_CN"
-
-	ALL_LINGUAS=${ALL_LINGUAS} \
-		econf \
-		--without-gimp \
-		$(use_enable webinstall convert) \
-		|| die "econf failed"
-
-	# not parallel make safe (#137192)
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TERMINOLOGY TODO
-}
diff --git a/app-doc/gimp-help/gimp-help-0.13.ebuild b/app-doc/gimp-help/gimp-help-0.13.ebuild
deleted file mode 100644
index cd9c0db80f91..000000000000
--- a/app-doc/gimp-help/gimp-help-0.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-0.13.ebuild,v 1.2 2007/09/29 11:32:39 ulm Exp $
-
-inherit eutils
-
-MY_P=${P/gimp-help/gimp-help-2}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="http://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${MY_P}.tar.gz"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="webinstall linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_hr linguas_it linguas_ko linguas_nl linguas_no linguas_ru linguas_sv linguas_zh_CN"
-DEPEND="=app-text/docbook-xml-dtd-4.3*
-		dev-libs/libxml2
-		dev-libs/libxslt
-		webinstall? ( media-gfx/imagemagick )"
-RDEPEND="!<media-gfx/gimp-2.2.12"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-image-files.patch"
-}
-
-src_compile() {
-	local ALL_LINGUAS=""
-
-	use linguas_cs && ALL_LINGUAS="${ALL_LINGUAS} cs"
-	use linguas_de && ALL_LINGUAS="${ALL_LINGUAS} de"
-	use linguas_en && ALL_LINGUAS="${ALL_LINGUAS} en"
-	use linguas_es && ALL_LINGUAS="${ALL_LINGUAS} es"
-	use linguas_fr && ALL_LINGUAS="${ALL_LINGUAS} fr"
-	use linguas_hr && ALL_LINGUAS="${ALL_LINGUAS} hr"
-	use linguas_it && ALL_LINGUAS="${ALL_LINGUAS} it"
-	use linguas_ko && ALL_LINGUAS="${ALL_LINGUAS} ko"
-	use linguas_nl && ALL_LINGUAS="${ALL_LINGUAS} nl"
-	use linguas_no && ALL_LINGUAS="${ALL_LINGUAS} no"
-	use linguas_ru && ALL_LINGUAS="${ALL_LINGUAS} ru"
-	use linguas_sv && ALL_LINGUAS="${ALL_LINGUAS} sv"
-	use linguas_zh_CN && ALL_LINGUAS="${ALL_LINGUAS} zh_CN"
-
-	ALL_LINGUAS=${ALL_LINGUAS} \
-		econf \
-		--without-gimp \
-		$(use_enable webinstall convert) \
-		|| die "econf failed"
-
-	# not parallel make safe (#137192)
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TERMINOLOGY
-}
diff --git a/app-doc/gimp-help/gimp-help-2.4.1.ebuild b/app-doc/gimp-help/gimp-help-2.4.1.ebuild
deleted file mode 100644
index 8a698d773487..000000000000
--- a/app-doc/gimp-help/gimp-help-2.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-2.4.1.ebuild,v 1.8 2008/06/07 20:55:31 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="http://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${P}.tar.bz2"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE=""
-
-# Only *not* outdated translations (see, configure.ac) are listed.
-# On update do not forgive to check quickreference/Makefile.am for
-# QUICKREFERENCE_ALL_LINGUAS. LANGS should include that langs too.
-LANGS="de en es fr it ko nl no pl ru sv"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-DEPEND="=app-text/docbook-xml-dtd-4.3*
-		dev-libs/libxml2
-		dev-libs/libxslt"
-RDEPEND="=media-gfx/gimp-2.4*"
-
-src_compile() {
-	local ALL_LINGUAS=""
-
-	for X in ${LANGS} ; do
-		use linguas_${X} && ALL_LINGUAS="${ALL_LINGUAS} ${X}"
-	done
-
-	ALL_LINGUAS=${ALL_LINGUAS} \
-		econf \
-		--without-gimp \
-		--disable-network \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TERMINOLOGY
-}
diff --git a/app-doc/gimp-help/gimp-help-2.6.0.ebuild b/app-doc/gimp-help/gimp-help-2.6.0.ebuild
new file mode 100644
index 000000000000..9a7d791d9bbb
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-2.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-2.6.0.ebuild,v 1.1 2009/10/20 13:29:23 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="GNU Image Manipulation Program help files"
+HOMEPAGE="http://docs.gimp.org/"
+
+LICENSE="FDL-1.2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+# Only *not* outdated translations (see, configure.ac) are listed.
+# On update do not forgive to check quickreference/Makefile.am for
+# QUICKREFERENCE_ALL_LINGUAS. LANGS should include that langs too.
+LANGS="de en es fr it ja ko nl nn pl ru sv zh_CN"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://gimp/help/${P}-html-${X}.tar.bz2 )"
+done
+
+DEPEND=""
+RDEPEND=">=media-gfx/gimp-2.4"
+
+S=${WORKDIR}/gimp-help-2/
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/gimp/2.0/help
+	doins -r html/*
+	dodoc AUTHORS HACKING MAINTAINERS README
+}