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

(Portage version: 2.1.7.1/cvs/Linux x86_64)

5 files changed, 44 insertions, 167 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/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
+}