Fix installation with USE=-nls, #395125

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 38 insertions, 8 deletions

diff --git a/sci-chemistry/gperiodic/ChangeLog b/sci-chemistry/gperiodic/ChangeLog
index 8dfbbe15e1d5..55e708e6925d 100644
--- a/sci-chemistry/gperiodic/ChangeLog
+++ b/sci-chemistry/gperiodic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gperiodic
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.18 2011/12/13 23:34:34 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/ChangeLog,v 1.19 2012/01/26 19:17:33 jlec Exp $
+
+  26 Jan 2012; Justin Lecher <jlec@gentoo.org> gperiodic-2.0.10-r2.ebuild,
+  +files/gperiodic-2.0.10-nls.patch, metadata.xml:
+  Fix installation with USE=-nls, #395125
 
   13 Dec 2011; Agostino Sarubbo <ago@gentoo.org> gperiodic-2.0.10-r2.ebuild:
   Stable for AMD64, wrt bug #392791
diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch
new file mode 100644
index 000000000000..de0bea04dc14
--- /dev/null
+++ b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch
@@ -0,0 +1,20 @@
+ po/Makefile |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/po/Makefile b/po/Makefile
+index d7d7d78..179dad6 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -26,10 +26,12 @@ endif
+ 
+ install: 
+ 	$(MAKE) all
++ifeq ($(enable_nls),1)
+ 	for f in $(FILES_MO) ; do \
+ 		mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+ 		install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \
+ 	done
++endif
+ 
+ uninstall:
+ 	for f in $(FILES_MO) ; do \
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
index 3cf2b8a00162..b525e26ad231 100644
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.3 2011/12/13 23:34:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild,v 1.4 2012/01/26 19:17:33 jlec Exp $
 
 EAPI="2"
 
@@ -24,15 +24,21 @@ DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
 src_prepare() {
-	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-nls.patch
 }
 
 src_compile() {
+	local myopts
+	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
 	emake CC=$(tc-getCC) ${myopts} || die
 }
 
 src_install() {
+	local myopts
+	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
 	emake DESTDIR="${D}" ${myopts} install || die
 	dodoc AUTHORS ChangeLog README NEWS || die
+	newdoc po/README README.translation || die
 }
diff --git a/sci-chemistry/gperiodic/metadata.xml b/sci-chemistry/gperiodic/metadata.xml
index 4b6a11a4996d..e87a8759836d 100644
--- a/sci-chemistry/gperiodic/metadata.xml
+++ b/sci-chemistry/gperiodic/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <longdescription>
+	<herd>sci-chemistry</herd>
+	<longdescription>
     GPeriodic is a program for looking up various data about elements from the
     periodic table, based on the GTK2 toolkit. It also features a command line
     interface.