app-misc/genealogyj-bin - Change LINGUAS handling to something less awful and always install English

svn path=/sunrise/; revision=2216

4 files changed, 26 insertions, 55 deletions

diff --git a/app-misc/genealogyj-bin/ChangeLog b/app-misc/genealogyj-bin/ChangeLog
index 913b2d8da..622d3cb98 100644
--- a/app-misc/genealogyj-bin/ChangeLog
+++ b/app-misc/genealogyj-bin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Dec 2006; Jakub Moc <jakub@gentoo.org> -genealogyj-bin-2.4.2-r2.ebuild,
+  +genealogyj-bin-2.4.2-r3.ebuild:
+  Change LINGUAS handling to something less awful and always install English
+  resources.
+
   24 Oct 2006; Christian Faulhammer (opfer) <gentoo@faulhammer.org>
   genealogyj-bin-2.4.2-r2.ebuild:
   corrected RDEPEND and DEPEND
diff --git a/app-misc/genealogyj-bin/Manifest b/app-misc/genealogyj-bin/Manifest
index 7d9dcd8ee..5cb322d19 100644
--- a/app-misc/genealogyj-bin/Manifest
+++ b/app-misc/genealogyj-bin/Manifest
@@ -13,18 +13,18 @@ DIST genj_lnf-2.0.zip 616350 RMD160 d47d3c98830cbe2750209615515a640eca388514 SHA
 DIST genj_nl-2.4.2.zip 24510 RMD160 c7a740866cd7eec0e71e485a01157882831f2a07 SHA1 4dcc7bc0319ed92966e03b9d074bd04eead0d7d2 SHA256 79524ff24946c1e54821d0f9f1ddf772efb61502419c8e3569c6e47ff62e0860
 DIST genj_pl-2.4.2.zip 19896 RMD160 d4272f1dc4e66a29d0c323a39ad5795e42b75e48 SHA1 db942520fc5d2d5c7197d0a98c21a9466bb9ae14 SHA256 0f0f7d1fc0372e3debed973a7ad49179942c2ba3e2f543acc75a30f31b3e7848
 DIST genj_pt_BR-2.4.2.zip 23684 RMD160 f70a930828fffa33da73eb5fd18493ec08a91e3e SHA1 a29876606c7b8a72ca0b195bfad18478f72d3e4b SHA256 b497dfd3f45fb713cf747f35dd16a693054467873e140f840ee7a63e07efa99b
-EBUILD genealogyj-bin-2.4.2-r2.ebuild 1664 RMD160 9b38d1676d3145a7884caa1450fbcf10cad76bb6 SHA1 8650da6d82a9216ef5be38d08e08d6ef9ce8973c SHA256 5b3bdfda1dff9f0055ef5f8a8cfb532d8cef1fa76285acb38aff31205a2dc126
-MD5 967d7878ea8ea7e6ff9d5123ddbc92f5 genealogyj-bin-2.4.2-r2.ebuild 1664
-RMD160 9b38d1676d3145a7884caa1450fbcf10cad76bb6 genealogyj-bin-2.4.2-r2.ebuild 1664
-SHA256 5b3bdfda1dff9f0055ef5f8a8cfb532d8cef1fa76285acb38aff31205a2dc126 genealogyj-bin-2.4.2-r2.ebuild 1664
-MISC ChangeLog 1106 RMD160 6c09888acdd31038777a5d9594821ac5b17014a9 SHA1 0dbedce2e3e5a3b6954a3d36f843c908c2f2717d SHA256 34fcf6630ee6260ea0f944a896d0f29cdac6fc21f957d7fe0b1b0643e3679279
-MD5 48c9a57a99c9e6a7c1d8efea1a714be2 ChangeLog 1106
-RMD160 6c09888acdd31038777a5d9594821ac5b17014a9 ChangeLog 1106
-SHA256 34fcf6630ee6260ea0f944a896d0f29cdac6fc21f957d7fe0b1b0643e3679279 ChangeLog 1106
+EBUILD genealogyj-bin-2.4.2-r3.ebuild 1588 RMD160 a3de9df434ed18b962dbc3dca6802f93f602f280 SHA1 e056b06e3a4e5f4e4c9470a7b5a6f194d3459197 SHA256 404d574c01f2c9d581e95769d67db5c5e7a6c491e3123fd6c1db96bf8c4a0c60
+MD5 fe3ea73ccc298ee126ddbe399c6555ce genealogyj-bin-2.4.2-r3.ebuild 1588
+RMD160 a3de9df434ed18b962dbc3dca6802f93f602f280 genealogyj-bin-2.4.2-r3.ebuild 1588
+SHA256 404d574c01f2c9d581e95769d67db5c5e7a6c491e3123fd6c1db96bf8c4a0c60 genealogyj-bin-2.4.2-r3.ebuild 1588
+MISC ChangeLog 1309 RMD160 4e1df8576509d0946660b3671794f3a52bc74d1b SHA1 cb50e03409a0ca92c06e21f15c0efe561a4898eb SHA256 3996f3614062e88a8dd3c1758b09ce613ede74301fdfcb7b3fb5c38e51ddea63
+MD5 8bb4471434d59eccce3b03a8afaa31cd ChangeLog 1309
+RMD160 4e1df8576509d0946660b3671794f3a52bc74d1b ChangeLog 1309
+SHA256 3996f3614062e88a8dd3c1758b09ce613ede74301fdfcb7b3fb5c38e51ddea63 ChangeLog 1309
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 ea9bc5d27a0ba2796857eb5f671b4c22 files/digest-genealogyj-bin-2.4.2-r2 2558
-RMD160 5bff0f0f3dc5d954241fd4b88abd2a2a5371df62 files/digest-genealogyj-bin-2.4.2-r2 2558
-SHA256 ead832c5d131e8399de1f05367ea98e07e32c3eccf332bc6b65ab5646dbfe771 files/digest-genealogyj-bin-2.4.2-r2 2558
+MD5 ea9bc5d27a0ba2796857eb5f671b4c22 files/digest-genealogyj-bin-2.4.2-r3 2558
+RMD160 5bff0f0f3dc5d954241fd4b88abd2a2a5371df62 files/digest-genealogyj-bin-2.4.2-r3 2558
+SHA256 ead832c5d131e8399de1f05367ea98e07e32c3eccf332bc6b65ab5646dbfe771 files/digest-genealogyj-bin-2.4.2-r3 2558
diff --git a/app-misc/genealogyj-bin/files/digest-genealogyj-bin-2.4.2-r2 b/app-misc/genealogyj-bin/files/digest-genealogyj-bin-2.4.2-r2
deleted file mode 100644
index 2ed54a0b7..000000000
--- a/app-misc/genealogyj-bin/files/digest-genealogyj-bin-2.4.2-r2
+++ /dev/null
@@ -1,33 +0,0 @@
-MD5 1e1e192d373fff9942b9eda9297a348b genj_app-2.4.2.zip 4911015
-RMD160 6dff5b0e4ad2c1421acc734df550b4eff1cbfe5f genj_app-2.4.2.zip 4911015
-SHA256 188622942c2d7dc36089544f44ef15687f0f5acb57d29a68f2a728baa6b7979a genj_app-2.4.2.zip 4911015
-MD5 cc26d5758fc2c076d0fafc4d28283466 genj_de-2.4.2.zip 633856
-RMD160 19a1d95b74f93fdc0defe7003975e3bb73e9e542 genj_de-2.4.2.zip 633856
-SHA256 552dfe5333695b3c8a526f0f2f82ec6d333c7af1923a9e9416408bbe8c952be5 genj_de-2.4.2.zip 633856
-MD5 9956e2fc17e2fdd9cbfb219cd4464236 genj_en-2.4.2.zip 678931
-RMD160 81c2f931e4393b545f1d8ab8ca7ebf6074247bf9 genj_en-2.4.2.zip 678931
-SHA256 07dc9e984702259aae11d98bdff6af9e680ec27224ae87c63aa449c237c7c72f genj_en-2.4.2.zip 678931
-MD5 475dbcc36442f76eba310b05f54eadaa genj_es-2.4.2.zip 632276
-RMD160 e15f67c346a4519bc86e44f1bc82117115b68e34 genj_es-2.4.2.zip 632276
-SHA256 6b235ae41190ea236d1ce55983833b37222fa9b3ad16324393ebd2d13e5351e0 genj_es-2.4.2.zip 632276
-MD5 dce7169566fbed80f796336f9a924b83 genj_fr-2.4.2.zip 882679
-RMD160 df827786a22fca6d35f14f31eaa6b8c71b9c0dc7 genj_fr-2.4.2.zip 882679
-SHA256 d4b52a5b64366021687c2dde285af06ed74511e531052d6bbe5ea572b0e6c22a genj_fr-2.4.2.zip 882679
-MD5 ea8dd935f4dfaee7a679c4fd03bb785b genj_geo-2.4.2.zip 1587080
-RMD160 09ada2e5ae3dd5799c34f545a4f3b0ed1a1745c3 genj_geo-2.4.2.zip 1587080
-SHA256 c9cc2760cd54b8935d62d65cfc994765df50d99b2b37f5f42130ccfd9a1330f5 genj_geo-2.4.2.zip 1587080
-MD5 78acfe0bba4a7f01673c0b42a8ee1592 genj_hu-2.4.2.zip 22421
-RMD160 69dca621dcbf62663d245757079fcf661653f7be genj_hu-2.4.2.zip 22421
-SHA256 82667c8898e8caf3cedef1c48145ef026425c5ff550e51259951a29c681eb825 genj_hu-2.4.2.zip 22421
-MD5 fcfe3b3981672256b155418f0351b6ef genj_lnf-2.0.zip 616350
-RMD160 d47d3c98830cbe2750209615515a640eca388514 genj_lnf-2.0.zip 616350
-SHA256 96dc89773a9efde2f357867234d7272a41b1977ef624a18cda58f04d18e8e538 genj_lnf-2.0.zip 616350
-MD5 f1aa64a66e396ca743cf86cc28c96a20 genj_nl-2.4.2.zip 24510
-RMD160 c7a740866cd7eec0e71e485a01157882831f2a07 genj_nl-2.4.2.zip 24510
-SHA256 79524ff24946c1e54821d0f9f1ddf772efb61502419c8e3569c6e47ff62e0860 genj_nl-2.4.2.zip 24510
-MD5 e8048cabb43b0647677fd085e6ec62da genj_pl-2.4.2.zip 19896
-RMD160 d4272f1dc4e66a29d0c323a39ad5795e42b75e48 genj_pl-2.4.2.zip 19896
-SHA256 0f0f7d1fc0372e3debed973a7ad49179942c2ba3e2f543acc75a30f31b3e7848 genj_pl-2.4.2.zip 19896
-MD5 62640e7254a854425eff95a599421afb genj_pt_BR-2.4.2.zip 23684
-RMD160 f70a930828fffa33da73eb5fd18493ec08a91e3e genj_pt_BR-2.4.2.zip 23684
-SHA256 b497dfd3f45fb713cf747f35dd16a693054467873e140f840ee7a63e07efa99b genj_pt_BR-2.4.2.zip 23684
diff --git a/app-misc/genealogyj-bin/genealogyj-bin-2.4.2-r2.ebuild b/app-misc/genealogyj-bin/genealogyj-bin-2.4.2-r3.ebuild
index 88a5e9459..d47e062dc 100644
--- a/app-misc/genealogyj-bin/genealogyj-bin-2.4.2-r2.ebuild
+++ b/app-misc/genealogyj-bin/genealogyj-bin-2.4.2-r3.ebuild
@@ -8,31 +8,30 @@ DESCRIPTION="GenealogyJ is a viewer and editor for genealogic data and is writte
 HOMEPAGE="http://genj.sf.net/"
 SRC_URI="mirror://sourceforge/genj/genj_app-${PV}.zip
 	skins? ( mirror://sourceforge/genj/genj_lnf-2.0.zip )
-	geoview? ( mirror://sourceforge/genj/genj_geo-${PV}.zip )"
+	geoview? ( mirror://sourceforge/genj/genj_geo-${PV}.zip )
+	mirror://sourceforge/genj/genj_en-${PV}.zip"
 
 S=${WORKDIR}
-LANGS="de en es fr hu nl pl pt_BR"
+LANGS="de es fr hu nl pl pt_BR"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/genj/genj_${X}-${PV}.zip )"
+done
 
 LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="geoview skins"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/genj/genj_${X}-${PV}.zip )"
-	SRC_MID="${SRC_MID}!linguas_${X}? ( "
-	SRC_END="${SRC_END} )"
-done
-SRC_URI="${SRC_URI} ${SRC_MID}mirror://sourceforge/genj/genj_en-${PV}.zip${SRC_END}"
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 
 pkg_setup() {
 	if [ -z "${LINGUAS}" ]; then
-		ewarn " To install a localized version, set the according LINGUAS variable(s). Default: en "
-		ewarn " Supported localizations: de en es fr hu* nl* pt_BR* pl*"
+		ewarn " To install a localized version, set the according LINGUAS variable(s)."
+		ewarn " Default: en (is always installed) "
+		ewarn " Supported localizations: de es fr hu* nl* pt_BR* pl*"
 		ewarn " (* = Help file in English only. Upstream doesn't have a translation.) "
 	fi
 }