app-cdr/isomaster: Respect ${LINGUAS} (bug #402679)

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

4 files changed, 23 insertions, 68 deletions

diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index bbe723582fb6..d9e388f02360 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/isomaster
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.22 2012/01/21 21:22:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.23 2012/02/17 17:13:15 sping Exp $
+
+  17 Feb 2012; Sebastian Pipping <sping@gentoo.org> -isomaster-1.3.9.ebuild,
+  isomaster-1.3.9-r1.ebuild:
+  Respect ${LINGUAS} (bug #402679), remove old revision
 
   21 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   isomaster-1.3.9-r1.ebuild:
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 7eaaf0a530b6..feb107114d7b 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -7,18 +7,13 @@ AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 RMD160 b6814ffd4d50e1a1b8ecf551c46
 DIST isomaster-1.3.5.tar.bz2 196042 RMD160 813c729b5308e725cbcfea688de343260bae63c5 SHA1 76adcae894a169365e43eaac30f4a7c3926fa78c SHA256 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597
 DIST isomaster-1.3.9.tar.bz2 223514 RMD160 d237784666ead7c7a296008df4ee8abbcaa5abbb SHA1 5214f4e9b309adb1d3fb53d0617f142ef2dbbbf8 SHA256 2bf798a19af43113391144c4a3f2f3b33366f640c5695d356c151e83c49dc853
 EBUILD isomaster-1.3.5.ebuild 881 RMD160 2532408437e6172688b208e74b177afb1d9df990 SHA1 e4acd2dce48c14987cc790154f22fb1034b7d089 SHA256 5bb0dfcb18a2d69969413616f0d92792e01d6eb8a46473f83d1f777a247489fb
-EBUILD isomaster-1.3.9-r1.ebuild 1295 RMD160 f209b54b7445631c6f0a67207e7ea4885a41ac3f SHA1 9f748d3cca746b5875d77c59465ca1e1960277d3 SHA256 90ab6525fac4a652688978aeab1718414596c74b2a14b08560b4dfad2100e0e4
-EBUILD isomaster-1.3.9.ebuild 1231 RMD160 05010c178302d865007c3c7716b7a78e21596355 SHA1 6f51ab2776f30f00c347dec05f55c60fd4020256 SHA256 797cf5b6be9194bad9e6dd8637096ffe33c851f89bf4b128d21af9937285ee3b
-MISC ChangeLog 4059 RMD160 313391b225f17eadc96c64eb6fcea59e1e4b36d3 SHA1 75208c5932b1be835923ea75107f4da4b4db14b3 SHA256 32cd01529346e5b547101408d889be4e71d511fa359161dff4785a57d2c129f2
+EBUILD isomaster-1.3.9-r1.ebuild 1614 RMD160 1d802c0bae4cba0263000899219be2425a9c51f3 SHA1 36ae260c1f7ec90d671560e4b525ccec4f19e741 SHA256 b74ecb5b2ad6079f509499b777f278f605d9159246ed004841cd43a4d9baf39f
+MISC ChangeLog 4218 RMD160 9e78880119f82c7f7e0f73f92e8985586bad8e4f SHA1 ba2d32352d175f33ae7a636907271c4a96ad7a66 SHA256 ee2b59fe83fbbdead76ea9b3ff3dc987409d431e3917bf11931ac244ff126d02
 MISC metadata.xml 263 RMD160 23ac63910e182a037747a2e728cd360aea8931f3 SHA1 284748c7bbc9927feb894853669ca84a001651db SHA256 96a4922aeb9ae48b6e2725364ebc5016efe37a26e53b265c3bd693975eb737c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPGyv/AAoJEEdUh39IaPFN7qAH/iqMo7AXPnyrhkM85l/9hOJ+
-6nhueeBt0NfNLYh4wm/M7hQJG4JtjRtCnrllgSb/eMUBgI6Vp+PuHHdWmAsJoOCN
-gGhexnvXPalBuwtoPan/k0IpKm0hbm+bPR/ksSfoe4nPgkTVoSNQTL9/EEvniM8U
-Yo0o+p1y78WqZlU/UPIM6ypK15p7NAwTM8pQGSwaYMkh+tCFysYT8/+L+1Q92ra2
-IotSBgkTuYmhhYc2Oh1qDIU+9IXyYsXjHtFYAo/ew2K1wW+bSfIpJcnVI8inkDgA
-9XqQt6RtPqkYsd2oUsKeKBXRvKP1fWDv5Wl1h5+B+9m+u1smE4DxVEfVVeOxKXI=
-=ccPV
+iEYEARECAAYFAk8+ipYACgkQsAvGakAaFgALHgCfV3LvS6gZCtp5sjP0s/JMmyqz
+n9UAnir73tDP8udqDVJ7v/mfiAPKKg9k
+=Qkya
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
index 4953ee4f313a..dc11a22f9b6b 100644
--- a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.9-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/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild,v 1.2 2012/01/21 21:22:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild,v 1.3 2012/02/17 17:13:15 sping Exp $
 
 EAPI=4
 inherit eutils fdo-mime toolchain-funcs
@@ -44,9 +44,21 @@ src_compile() {
 	emake "${myisoconf[@]}"
 }
 
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale || die
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
 src_install() {
 	emake "${myisoconf[@]}" DESTDIR="${D}" install
 	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	_apply_linguas  # bug 402679
 }
 
 pkg_postinst() {
diff --git a/app-cdr/isomaster/isomaster-1.3.9.ebuild b/app-cdr/isomaster/isomaster-1.3.9.ebuild
deleted file mode 100644
index f72145cc1392..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.9.ebuild,v 1.3 2012/01/21 19:31:34 ssuominen Exp $
-
-EAPI=4
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls"
-
-#dev-libs/iniparser, see pkg_setup() and bug 399629
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		#USE_SYSTEM_INIPARSER=1
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_configure() { :; } #274361
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}