bug 93768

(Portage version: 2.0.51.22-r2)

6 files changed, 61 insertions, 120 deletions

diff --git a/app-text/sword-modules/ChangeLog b/app-text/sword-modules/ChangeLog
index 4c9b7117e98d..22fa0de4c65d 100644
--- a/app-text/sword-modules/ChangeLog
+++ b/app-text/sword-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/sword-modules
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/ChangeLog,v 1.13 2005/04/24 11:43:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/ChangeLog,v 1.14 2005/07/27 03:22:09 vanquirius Exp $
+
+  27 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  sword-modules-20040503.ebuild, sword-modules-20041209.ebuild:
+  Removed offensive USE flag and files related to it, since they are no longer
+  available on our mirrors. Also, redigested ebuilds. Should fix bug 93768.
+  Thanks to Aarcane <aarcane@gmail.com>, Francisco Jose Canizares Santofimia
+  <telefrancisco@lycos.es> and others.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   sword-modules-20040503.ebuild:
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 31edb5ed2c84..e43b97863f36 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2b14e4262646efdfbe4339c991c1bf4e sword-modules-20040503.ebuild 4248
+MD5 6c61bffb835365e3b694da8fc6a729fd sword-modules-20040503.ebuild 3444
 MD5 4f25b837ef47f983862e708112c27efd ChangeLog 1543
 MD5 810fb492095a91860bd82cc642bbacb7 metadata.xml 384
-MD5 5f78df4f425ba9ddb50fce6fa60ca596 sword-modules-20041209.ebuild 3727
-MD5 beb67616df5fa1afc0babd6f2222db2e files/digest-sword-modules-20040503 1286
-MD5 8962a51996d04c4450e7f4fcf20c31b2 files/digest-sword-modules-20041209 1569
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqES1I1lqEGTUzyQRAgDUAJ9T66UzBgh9XQVjIc0rODvgLcTHhACdGH/P
-9BaSlzg4vfEjLCcBQ6NRw1Y=
-=A6np
------END PGP SIGNATURE-----
+MD5 a1fe70ac9b9e95fdbb143fd85cb8c7fa sword-modules-20041209.ebuild 2923
+MD5 00040b9f01af53ea1931334b6b94f9ac files/digest-sword-modules-20040503 1124
+MD5 d7110219d400db21bb885c37f49cc75b files/digest-sword-modules-20041209 1407
diff --git a/app-text/sword-modules/files/digest-sword-modules-20040503 b/app-text/sword-modules/files/digest-sword-modules-20040503
index 13751ccc401a..ed5f458d5ade 100644
--- a/app-text/sword-modules/files/digest-sword-modules-20040503
+++ b/app-text/sword-modules/files/digest-sword-modules-20040503
@@ -1,23 +1,20 @@
-MD5 facbf1e42d7e09463ded99e58ca997e4 KJV.zip 3673399
-MD5 30b4fdd17976feac1d36350be09f21ed StrongsGreek.zip 356388
-MD5 8f61a3b3dd3e22f6bf52239cc73da74f StrongsHebrew.zip 532334
-MD5 96871dc2f4e1a0ed3459d587cba69282 ASV.zip 1513889
-MD5 a3878f7656b780792c69b58f2cde1dc1 AKJV.zip 1402891
-MD5 8a07ae856856082d73626fa3e2fac902 ISBE.zip 8941721
-MD5 4030d87ee45ae5cd1f8ba2b1eb1538a5 ISV.zip 532596
-MD5 900d09185f5d500d5858875526d8f7be WebstersDict.zip 14486512
-MD5 72c53b401316c23a57406eb0bbc500b4 KJVD.zip 102883
-MD5 b01b877ddaf64cbf3fd2870cf149ce52 SME.zip 549747
-MD5 95c043c2381df5c2e54be1aaa3740b81 Robinson.zip 13732
-MD5 8a4c8f4e8d12592341150916c8849d91 WEB.zip 1376884
-MD5 488fec2a1ff5522b88e7f381f2fee41d Packard.zip 27867
-MD5 f54a00df25be565014888e2db3e2f79b Vulgate.zip 1265719
-MD5 620f12703162c4ae8d6b2addc61d48ad Josephus.zip 1633119
-MD5 45133447ee9ca076932a47cc0a190951 BoM.zip 497900
-MD5 d7d5342361e0d4e923f34b7f43900b74 Jasher.zip 279826
-MD5 a60a52017bb1b65f7d5ddec22582726b Quran.zip 1048560
-MD5 d03ea4bc85eff2fcfaa754ece5a05757 GerElb.zip 1648182
-MD5 22dbb48b70bafdbf98208079ec100e16 GerElb1871.zip 1733515
-MD5 cd87ca52596a0dd0d7c0fc3770a1303a GerLut.zip 2565787
-MD5 34f29130cbc9bd2a6558b60f3c35ee7a GerLut1545.zip 1463149
-MD5 27adf4589b2ad26a006f572d6b32badb GerSch.zip 1508923
+MD5 d4f1112addf895aadb058926f73046d6 KJV.zip 3673399
+MD5 5c1948097b520a80466e7919e76e5fae StrongsGreek.zip 356388
+MD5 55e01c59a31bc7fda23cfd4a348e7c5b StrongsHebrew.zip 532334
+MD5 623432b00baec629cbb527ffb587d7c1 ASV.zip 1513889
+MD5 22baebb760f8b2f4bdf7ca783575aa4e AKJV.zip 1402891
+MD5 72a7a4822252826c4b0e7fd49d6e8bcd ISBE.zip 8941721
+MD5 710c341081324ee5f5bea6bf21f258be ISV.zip 532601
+MD5 b015018180ca984b2977558667067204 WebstersDict.zip 14486508
+MD5 53b988d482956439524b7289082d5b08 KJVD.zip 102875
+MD5 c2177381701ce4eb3ae4167454164904 SME.zip 549747
+MD5 6b7edcf7bd25ee35a05ba40d5abab9de Robinson.zip 13732
+MD5 d93623921faf0fcaedda03cc71ad3f21 WEB.zip 1376884
+MD5 3a3fa2d0e3dae6a2f7aef5cbad5a735b Packard.zip 27867
+MD5 322b15e9774deb1b4ec003327264b872 Vulgate.zip 1265719
+MD5 afb5ea7c546037cf54cf125debbd61f0 Josephus.zip 1633119
+MD5 62280e5dadca39d4618949b9c7d1e515 GerElb.zip 1648170
+MD5 9c32bf0bbbcc2237d1f0d405473a03de GerElb1871.zip 1733514
+MD5 fcf4d46854168e740ed1cf60ad2bf778 GerLut.zip 2565787
+MD5 8c70c1ee31570dbbd5c052e00b0bd0fa GerLut1545.zip 1463152
+MD5 29461c79111af1f36032bfceb49361f9 GerSch.zip 1508923
diff --git a/app-text/sword-modules/files/digest-sword-modules-20041209 b/app-text/sword-modules/files/digest-sword-modules-20041209
index 15a869216002..d72f5561eae2 100644
--- a/app-text/sword-modules/files/digest-sword-modules-20041209
+++ b/app-text/sword-modules/files/digest-sword-modules-20041209
@@ -1,28 +1,25 @@
-MD5 facbf1e42d7e09463ded99e58ca997e4 KJV.zip 3673399
-MD5 30b4fdd17976feac1d36350be09f21ed StrongsGreek.zip 356388
-MD5 8f61a3b3dd3e22f6bf52239cc73da74f StrongsHebrew.zip 532334
-MD5 96871dc2f4e1a0ed3459d587cba69282 ASV.zip 1513889
-MD5 a3878f7656b780792c69b58f2cde1dc1 AKJV.zip 1402891
-MD5 8a07ae856856082d73626fa3e2fac902 ISBE.zip 8941721
-MD5 4030d87ee45ae5cd1f8ba2b1eb1538a5 ISV.zip 532596
-MD5 900d09185f5d500d5858875526d8f7be WebstersDict.zip 14486512
-MD5 72c53b401316c23a57406eb0bbc500b4 KJVD.zip 102883
-MD5 b01b877ddaf64cbf3fd2870cf149ce52 SME.zip 549747
-MD5 95c043c2381df5c2e54be1aaa3740b81 Robinson.zip 13732
-MD5 8a4c8f4e8d12592341150916c8849d91 WEB.zip 1376884
-MD5 488fec2a1ff5522b88e7f381f2fee41d Packard.zip 27867
-MD5 f54a00df25be565014888e2db3e2f79b Vulgate.zip 1265719
-MD5 620f12703162c4ae8d6b2addc61d48ad Josephus.zip 1633119
-MD5 55a9178faaef05699e3311505a4be95a Jubilee2000.zip 1457797
-MD5 0d3fcd6e470e5154c6dc9415406614ef MHC.zip 15828741
-MD5 45133447ee9ca076932a47cc0a190951 BoM.zip 497900
-MD5 d7d5342361e0d4e923f34b7f43900b74 Jasher.zip 279826
-MD5 a60a52017bb1b65f7d5ddec22582726b Quran.zip 1048560
-MD5 d03ea4bc85eff2fcfaa754ece5a05757 GerElb.zip 1648182
-MD5 22dbb48b70bafdbf98208079ec100e16 GerElb1871.zip 1733515
-MD5 cd87ca52596a0dd0d7c0fc3770a1303a GerLut.zip 2565787
-MD5 34f29130cbc9bd2a6558b60f3c35ee7a GerLut1545.zip 1463149
-MD5 27adf4589b2ad26a006f572d6b32badb GerSch.zip 1508923
-MD5 ada497cfc71b0a5916b6ac891424c1fd SpaRV.zip 1368116
-MD5 600e0b563c86ea81c5c49e2fd9ce8ce4 FreLSG.zip 2239243
-MD5 640c27308cdc1bb4a8dc824dcdf2b9ba ItaRive.zip 1528624
+MD5 d4f1112addf895aadb058926f73046d6 KJV.zip 3673399
+MD5 5c1948097b520a80466e7919e76e5fae StrongsGreek.zip 356388
+MD5 55e01c59a31bc7fda23cfd4a348e7c5b StrongsHebrew.zip 532334
+MD5 623432b00baec629cbb527ffb587d7c1 ASV.zip 1513889
+MD5 22baebb760f8b2f4bdf7ca783575aa4e AKJV.zip 1402891
+MD5 72a7a4822252826c4b0e7fd49d6e8bcd ISBE.zip 8941721
+MD5 710c341081324ee5f5bea6bf21f258be ISV.zip 532601
+MD5 b015018180ca984b2977558667067204 WebstersDict.zip 14486508
+MD5 53b988d482956439524b7289082d5b08 KJVD.zip 102875
+MD5 c2177381701ce4eb3ae4167454164904 SME.zip 549747
+MD5 6b7edcf7bd25ee35a05ba40d5abab9de Robinson.zip 13732
+MD5 d93623921faf0fcaedda03cc71ad3f21 WEB.zip 1376884
+MD5 3a3fa2d0e3dae6a2f7aef5cbad5a735b Packard.zip 27867
+MD5 322b15e9774deb1b4ec003327264b872 Vulgate.zip 1265719
+MD5 afb5ea7c546037cf54cf125debbd61f0 Josephus.zip 1633119
+MD5 fa27e52c529164e01ed5daae89251d6c Jubilee2000.zip 1457798
+MD5 6d1bf70737e6c699392f1ff05c1b1c66 MHC.zip 15828741
+MD5 62280e5dadca39d4618949b9c7d1e515 GerElb.zip 1648170
+MD5 9c32bf0bbbcc2237d1f0d405473a03de GerElb1871.zip 1733514
+MD5 fcf4d46854168e740ed1cf60ad2bf778 GerLut.zip 2565787
+MD5 8c70c1ee31570dbbd5c052e00b0bd0fa GerLut1545.zip 1463152
+MD5 29461c79111af1f36032bfceb49361f9 GerSch.zip 1508923
+MD5 796b12373b619a167e46a5beb507f6b1 SpaRV.zip 1368116
+MD5 be4a3ed692e7cf4fdaaf46e4aa2cb331 FreLSG.zip 2239243
+MD5 b1f49edcc291e6cf510ff6241dd93b7f ItaRive.zip 1528624
diff --git a/app-text/sword-modules/sword-modules-20040503.ebuild b/app-text/sword-modules/sword-modules-20040503.ebuild
index bc2a667b4ffd..61f32f6ae6c1 100644
--- a/app-text/sword-modules/sword-modules-20040503.ebuild
+++ b/app-text/sword-modules/sword-modules-20040503.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040503.ebuild,v 1.11 2005/06/09 13:31:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040503.ebuild,v 1.12 2005/07/27 03:22:09 vanquirius Exp $
 
 DESCRIPTION="a collection of modules for the sword project"
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -19,9 +19,6 @@ SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip
 	http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/Packard.zip
 	http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/Vulgate.zip
 	http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/Josephus.zip
-	offensive? ( mirror://gentoo/BoM.zip
-		mirror://gentoo/Jasher.zip
-		mirror://gentoo/Quran.zip )
 	intl? ( http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb.zip
 		http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb1871.zip
 		http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLut.zip
@@ -34,7 +31,7 @@ RESTRICT="nomirror"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
-IUSE="offensive intl"
+IUSE="intl"
 
 S=${WORKDIR}
 
@@ -67,16 +64,6 @@ src_unpack() {
 		unpack GerLut1545.zip > /dev/null
 		unpack GerSch.zip > /dev/null
 	fi
-
-	if use offensive; then
-		unpack BoM.zip > /dev/null
-		unpack Jasher.zip > /dev/null
-		# uh oh, the quran is only availabe for windows; extract the data
-		unpack Quran.zip > /dev/null
-		unzip ${S}/data.zip > /dev/null
-#		unpack QuranShakir.zip > /dev/null
-#		unzip ${S}/data.zip > /dev/null
-	fi
 }
 
 src_compile() {
@@ -88,12 +75,6 @@ src_install () {
 	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/ || die
 	dodir /usr/share/sword/mods.d || die
 	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/ || die
-
-	# there are windows-only modules in the offensive flag that put
-	# config files into /newmods instead of /mods.d
-	if use offensive; then
-		cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/ || die
-	fi
 }
 
 pkg_postinst() {
@@ -101,12 +82,6 @@ pkg_postinst() {
 	einfo "You should now have modules for The SWORD Project."
 	einfo "You can download more modules from the SWORD homepage:"
 	einfo "  http://www.crosswire.org/sword/"
-	if ! use offensive; then
-		echo
-		einfo "You do not have the offensive USE flag enabled."
-		einfo "Questionable texts were not installed. To install them,"
-		einfo "USE=\"offensive\" emerge ${PN}"
-	fi
 	if ! use intl; then
 		echo
 		einfo "To enable different languages of selected texts contained"
diff --git a/app-text/sword-modules/sword-modules-20041209.ebuild b/app-text/sword-modules/sword-modules-20041209.ebuild
index 2ad958cdf06e..884318a7b025 100644
--- a/app-text/sword-modules/sword-modules-20041209.ebuild
+++ b/app-text/sword-modules/sword-modules-20041209.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20041209.ebuild,v 1.3 2005/06/09 13:31:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20041209.ebuild,v 1.4 2005/07/27 03:22:09 vanquirius Exp $
 
 CROSSWIREFTP="http://www.crosswire.org/ftpmirror/pub/sword/packages/rawzip"
 DESCRIPTION="a collection of modules for the sword project"
@@ -22,9 +22,6 @@ SRC_URI="${CROSSWIREFTP}/KJV.zip
 	${CROSSWIREFTP}/Josephus.zip
 	${CROSSWIREFTP}/Jubilee2000.zip
 	${CROSSWIREFTP}/MHC.zip
-	offensive? ( mirror://gentoo/BoM.zip
-		mirror://gentoo/Jasher.zip
-		mirror://gentoo/Quran.zip )
 	intl? ( ${CROSSWIREFTP}/GerElb.zip
 		${CROSSWIREFTP}/GerElb1871.zip
 		${CROSSWIREFTP}/GerLut.zip
@@ -40,7 +37,7 @@ RESTRICT="nomirror"
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="offensive intl"
+IUSE="intl"
 
 S=${WORKDIR}
 
@@ -78,16 +75,6 @@ src_unpack() {
 		unpack FreLSG.zip > /dev/null
 		unpack ItaRive > /dev/null
 	fi
-
-	if use offensive; then
-		unpack BoM.zip > /dev/null
-		unpack Jasher.zip > /dev/null
-		# uh oh, the quran is only availabe for windows; extract the data
-		unpack Quran.zip > /dev/null
-		unzip ${S}/data.zip > /dev/null
-#		unpack QuranShakir.zip > /dev/null
-#		unzip ${S}/data.zip > /dev/null
-	fi
 }
 
 src_compile() {
@@ -99,12 +86,6 @@ src_install () {
 	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/ || die
 	dodir /usr/share/sword/mods.d || die
 	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/ || die
-
-	# there are windows-only modules in the offensive flag that put
-	# config files into /newmods instead of /mods.d
-	if use offensive; then
-		cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/ || die
-	fi
 }
 
 pkg_postinst() {
@@ -112,12 +93,6 @@ pkg_postinst() {
 	einfo "You should now have modules for The SWORD Project."
 	einfo "You can download more modules from the SWORD homepage:"
 	einfo "  http://www.crosswire.org/sword/"
-	if ! use offensive; then
-		echo
-		einfo "You do not have the offensive USE flag enabled."
-		einfo "Questionable texts were not installed. To install them,"
-		einfo "USE=\"offensive\" emerge ${PN}"
-	fi
 	if ! use intl; then
 		echo
 		einfo "To enable different languages of selected texts contained"