Fixed issues on Mac OS. Always install en (fallback) images.

(Portage version: 2.1.1-r2)

4 files changed, 103 insertions, 31 deletions

diff --git a/app-doc/gimp-help/ChangeLog b/app-doc/gimp-help/ChangeLog
index f846c62e1406..d88f3b74abc3 100644
--- a/app-doc/gimp-help/ChangeLog
+++ b/app-doc/gimp-help/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/gimp-help
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.25 2007/01/22 14:22:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.26 2007/01/27 08:41:31 pva Exp $
+
+*gimp-help-0.11-r2 (27 Jan 2007)
+
+  27 Jan 2007; <pva@gentoo.org>
+  files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch,
+  -gimp-help-0.11-r1.ebuild, +gimp-help-0.11-r2.ebuild:
+  Fixed issues on Mac OS. Always install en (fallback) images.
 
   22 Jan 2007; <pva@gentoo.org>
   files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch:
diff --git a/app-doc/gimp-help/files/digest-gimp-help-0.11-r2 b/app-doc/gimp-help/files/digest-gimp-help-0.11-r2
new file mode 100644
index 000000000000..a742112cb5fc
--- /dev/null
+++ b/app-doc/gimp-help/files/digest-gimp-help-0.11-r2
@@ -0,0 +1,3 @@
+MD5 1becf4914fe51d8f0ce4142202c8cb92 gimp-help-2-0.11.tar.gz 52058316
+RMD160 edfa32797ed6c93048e510b2c4f39f4738468b49 gimp-help-2-0.11.tar.gz 52058316
+SHA256 ad1238962ac3eea36b2d07f210e7716f4892b46b49efb313de03c3b71499f9e6 gimp-help-2-0.11.tar.gz 52058316
diff --git a/app-doc/gimp-help/files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch b/app-doc/gimp-help/files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch
index 4ea966cacc0a..7cdb9b6cc7c9 100644
--- a/app-doc/gimp-help/files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch
+++ b/app-doc/gimp-help/files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2007-01-22 17:04:25.000000000 +0300
-+++ Makefile.am	2007-01-22 17:04:47.000000000 +0300
+--- Makefile.am.orig	2006-12-02 14:23:01.000000000 +0300
++++ Makefile.am	2007-01-27 10:34:19.000000000 +0300
 @@ -3,17 +3,19 @@
  STAMP_DIR = stamps
  
@@ -24,51 +24,49 @@
  
  IMAGE_FILES = \
  	$(wildcard $(top_srcdir)/images/*.png)		\
-@@ -93,9 +95,21 @@
+@@ -93,9 +95,20 @@
  	@echo '*** Creating directories ***'
  
      # we care only for HTML here
 -	@for name in `find $(top_srcdir)/images/ -name "*.png" -o -name "*.jpg"`;\
 -		do $(mkinstalldirs) `dirname html/$$name`; \
++    # I suppose IMAGE_DIRS to be updated each time whenever you add new image directory
++    # and it should not list empty directories
++	@echo 'Creating base image dirrectories.'; \
++	for dir in $(IMAGE_DIRS); do \
++	  $(mkinstalldirs) html/images/$$dir; \
++	done
++
 +	@for lang in $(ALL_LINGUAS); do \
-+	  echo 'Language: '$$lang; \
-+	  if test $$lang = "en"; then \
-+	    for dir in $(IMAGE_DIRS); do \
-+	      for file in `echo $(top_srcdir)/images/$$dir/*.png` `echo $(top_srcdir)/images/$$dir/*.jpg`; do \
-+		$(mkinstalldirs) `dirname html/$$file`; \
-+	      done; \
-+	    done; \
-+	  else \
-+	    for file in `find images/ -wholename "*/$$lang/*.png" -o -wholename "*/$$lang/*.jpg"`; do \
-+	      $(mkinstalldirs) `dirname html/$$file`; \
-+	    done; \
-+	  fi; \
++	  echo 'Creating image dirrectories for language: '$$lang; \
++	  for file in `find images/ -name "*.png" -o -name "*.jpg" | grep "/$$lang/"`; do \
++	    $(mkinstalldirs) `dirname html/$$file`; \
++	  done; \
  	done;
 +
    # only create a link in the PDF directory, because image files are
    # included in the PDF anyways
  	@echo '*** Creating link in PDF directory to images ***'
-@@ -133,8 +147,21 @@
+@@ -133,8 +146,20 @@
  	@echo '*** Copying images ***'
  
    # copy the image files to html directory
 -	@for name in `find $(top_srcdir)/images/ -name "*.png" -o -name "*.jpg"`;\
 -    do cp $$name html/$$name; \
++	@echo 'Copying common images.'; \
++	for dir in $(IMAGE_DIRS); do \
++	  for file in `echo $(top_srcdir)/images/$$dir/*.png` `echo $(top_srcdir)/images/$$dir/*.jpg`; do \
++	    if test -f $$file ; then \
++	      cp $$file html/$$file || exit $$?; \
++	    fi; \
++	  done; \
++	done;
++
 +	@for lang in $(ALL_LINGUAS); do \
-+	  echo 'Language: '$$lang; \
-+	  if test $$lang = "en"; then \
-+	    for dir in $(IMAGE_DIRS); do \
-+	      for file in `echo $(top_srcdir)/images/$$dir/*.png` `echo $(top_srcdir)/images/$$dir/*.jpg`; do \
-+	        if test -f $$file ; then \
-+	          cp $$file html/$$file; \
-+	        fi; \
-+	      done; \
-+	    done; \
-+	  else \
-+	    for file in `find images/ -wholename "*/$$lang/*.png" -o -wholename "*/$$lang/*.jpg"`; do \
-+	      cp $$file html/$$file; \
-+	    done; \
-+	  fi; \
++	  echo 'Copying images for '$$lang ; \
++	  for file in `find images/ -name "*.png" -o -name "*.jpg" | grep "/$$lang/"`; do \
++	    cp $$file html/$$file || exit $$?; \
++	  done; \
  	done;
  
  	@touch $@
diff --git a/app-doc/gimp-help/gimp-help-0.11-r2.ebuild b/app-doc/gimp-help/gimp-help-0.11-r2.ebuild
new file mode 100644
index 000000000000..0ba92aee3389
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-0.11-r2.ebuild
@@ -0,0 +1,64 @@
+# 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.11-r2.ebuild,v 1.1 2007/01/27 08:41:31 pva Exp $
+
+inherit autotools
+
+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"
+
+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}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch
+	eautomake
+}
+
+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
+}