[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2023-12-28 Thread Sam James 
commit: b855024ce51fe4ce5588f14cc07a9434c8992921
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 29 01:14:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 29 01:14:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b855024c

app-text/sword: Keyword 1.9.0-r1 arm64, #920865

Signed-off-by: Sam James  gentoo.org>

 app-text/sword/sword-1.9.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sword/sword-1.9.0-r1.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
index 861c4f49af05..13eb01ab413e 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~loong ~ppc ~riscv x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc ~riscv x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2023-02-28 Thread Marek Szuba 
commit: 33d5ac7263a00dea3e5ac9a0fb026294850e1acb
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Feb 28 13:02:58 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Feb 28 13:12:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d5ac72

app-text/sword-modules: treeclean

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/metadata.xml |  12 -
 app-text/sword-modules/sword-modules-2.6.ebuild | 583 
 2 files changed, 595 deletions(-)

diff --git a/app-text/sword-modules/metadata.xml 
b/app-text/sword-modules/metadata.xml
deleted file mode 100644
index 0f90da8d9af7..
--- a/app-text/sword-modules/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   mare...@gentoo.org
-   Marek Szuba
-   
-   
-   
-   Install modules with no linguistic 
content, in unknown languages etc.
-   
-

diff --git a/app-text/sword-modules/sword-modules-2.6.ebuild 
b/app-text/sword-modules/sword-modules-2.6.ebuild
deleted file mode 100644
index 85a4aa416131..
--- a/app-text/sword-modules/sword-modules-2.6.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
-HOMEPAGE="https://www.crosswire.org/sword/modules/;
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et 
eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu 
la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml 
sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
-IUSE="esoteric ${LANGS// / l10n_}"
-
-RDEPEND="
-   || ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
-   app-dicts/sword-Personal
-   esoteric? (
-   app-dicts/sword-Phaistos
-   app-dicts/sword-Sentiment
-   )
-   l10n_af? (
-   app-dicts/sword-Afr1953
-   )
-   l10n_ar? (
-   app-dicts/sword-AraNAV
-   app-dicts/sword-AraSVD
-   app-dicts/sword-alzat
-   )
-   l10n_az? (
-   app-dicts/sword-Azeri
-   app-dicts/sword-NorthernAzeri
-   )
-   l10n_be? (
-   app-dicts/sword-Bela
-   )
-   l10n_bea? (
-   app-dicts/sword-BeaMRK
-   )
-   l10n_bg? (
-   app-dicts/sword-BulCarigradNT
-   app-dicts/sword-BulVeren
-   )
-   l10n_br? (
-   app-dicts/sword-BretonNT
-   app-dicts/sword-br_en
-   )
-   l10n_ceb? (
-   app-dicts/sword-CebPinadayag
-   )
-   l10n_ch? (
-   app-dicts/sword-Chamorro
-   )
-   l10n_chr? (
-   app-dicts/sword-Che1860
-   )
-   l10n_ckb? (
-   app-dicts/sword-Sorani
-   )
-   l10n_cop? (
-   app-dicts/sword-CopNT
-   app-dicts/sword-CopSahBible2
-   app-dicts/sword-CopSahHorner
-   app-dicts/sword-CopSahidicMSS
-   app-dicts/sword-CopSahidica
-   app-dicts/sword-SahidicBible
-   )
-   l10n_cs? (
-   app-dicts/sword-CzeB21
-   app-dicts/sword-CzeBKR
-   app-dicts/sword-CzeCEP
-   app-dicts/sword-CzeCSP
-   )
-   l10n_cu? (
-   app-dicts/sword-CSlElizabeth
-   )
-   l10n_cy? (
-   app-dicts/sword-WelBeiblNet
-   )
-   l10n_da? (
-   app-dicts/sword-DaNT1819
-   app-dicts/sword-DaOT1871NT1907
-   app-dicts/sword-DaOT1931NT1907
-   )
-   l10n_de? (
-   app-dicts/sword-GerAlbrecht
-   app-dicts/sword-GerAugustinus
-   app-dicts/sword-GerBoLut
-   app-dicts/sword-GerElb1871
-   app-dicts/sword-GerElb1905
-   app-dicts/sword-GerGruenewald
-   app-dicts/sword-GerKingComm
-   app-dicts/sword-GerLeoNA28
-   app-dicts/sword-GerLeoRP18
-   app-dicts/sword-GerLutherpredigten
-   app-dicts/sword-GerMenge
-   app-dicts/sword-GerNeUe
-   app-dicts/sword-GerOffBiSt
-   app-dicts/sword-GerReinhardt
-   app-dicts/sword-GerSch
-   app-dicts/sword-GerTafel
-   app-dicts/sword-GerTextbibel
-   app-dicts/sword-GerZurcher
-   app-dicts/sword-MAK
-   app-dicts/sword-Rieger
-   )
-   l10n_el? (
-   app-dicts/sword-GreVamvas
-   )
-   l10n_en? (
-   app-dicts/sword-2BabDict
-   app-dicts/sword-AB
-

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2022-05-24 Thread Marek Szuba 
commit: e4fdf1c63740d42b6e34bd4c6c64e4f32b2ea6de
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue May 24 08:32:20 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue May 24 08:55:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fdf1c6

app-text/sword-modules: add 2.6, drop 2.5

Signed-off-by: Marek Szuba  gentoo.org>

 .../{sword-modules-2.5.ebuild => sword-modules-2.6.ebuild} | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-2.5.ebuild 
b/app-text/sword-modules/sword-modules-2.6.ebuild
similarity index 98%
rename from app-text/sword-modules/sword-modules-2.5.ebuild
rename to app-text/sword-modules/sword-modules-2.6.ebuild
index 072c374759c2..57af8e0bf793 100644
--- a/app-text/sword-modules/sword-modules-2.5.ebuild
+++ b/app-text/sword-modules/sword-modules-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.crosswire.org/sword/modules/;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
 
 LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et 
eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu 
la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml 
sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
 IUSE="esoteric ${LANGS// / l10n_}"
@@ -39,6 +39,7 @@ RDEPEND="
app-dicts/sword-BeaMRK
)
l10n_bg? (
+   app-dicts/sword-BulCarigradNT
app-dicts/sword-BulVeren
)
l10n_br? (
@@ -274,11 +275,13 @@ RDEPEND="
app-dicts/sword-FinSTLK2017
)
l10n_fr? (
+   app-dicts/sword-FreAug
app-dicts/sword-FreBBB
app-dicts/sword-FreBDM1707
app-dicts/sword-FreBDM1744
app-dicts/sword-FreBailly
app-dicts/sword-FreCJE
+   app-dicts/sword-FreChry
app-dicts/sword-FreCrampon
app-dicts/sword-FreDAW
app-dicts/sword-FreGBM

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2022-05-19 Thread WANG Xuerui 
commit: f0e9eadf6d784125f49e150136247f113b5a7a7d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 06:56:59 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 19 07:17:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e9eadf

app-text/sword: keyword 1.9.0-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 app-text/sword/sword-1.9.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sword/sword-1.9.0-r1.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
index 60349d5cfaf7..861c4f49af05 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~ppc-macos"
+KEYWORDS="amd64 ~loong ~ppc ~riscv x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2021-09-10 Thread Marek Szuba 
commit: 1305fd7c91b35bc3902210818fd0c6c8110914cc
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Sep 10 20:59:22 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Sep 10 21:12:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1305fd7c

app-text/sword-modules: update module list, EAPI 7 -> 8

Signed-off-by: Marek Szuba  gentoo.org>

 .../{sword-modules-2.4.ebuild => sword-modules-2.5.ebuild}  | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-2.4.ebuild 
b/app-text/sword-modules/sword-modules-2.5.ebuild
similarity index 98%
rename from app-text/sword-modules/sword-modules-2.4.ebuild
rename to app-text/sword-modules/sword-modules-2.5.ebuild
index e2691353a33..072c374759c 100644
--- a/app-text/sword-modules/sword-modules-2.4.ebuild
+++ b/app-text/sword-modules/sword-modules-2.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
 HOMEPAGE="https://www.crosswire.org/sword/modules/;
@@ -10,7 +10,7 @@ LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
-LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et 
eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu 
la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml 
sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
+LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et 
eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu 
la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml 
sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
 IUSE="esoteric ${LANGS// / l10n_}"
 
 RDEPEND="
@@ -41,13 +41,13 @@ RDEPEND="
l10n_bg? (
app-dicts/sword-BulVeren
)
-   l10n_bla? (
-   app-dicts/sword-BlaMat
-   )
l10n_br? (
app-dicts/sword-BretonNT
app-dicts/sword-br_en
)
+   l10n_ceb? (
+   app-dicts/sword-CebPinadayag
+   )
l10n_ch? (
app-dicts/sword-Chamorro
)
@@ -92,7 +92,6 @@ RDEPEND="
app-dicts/sword-GerKingComm
app-dicts/sword-GerLeoNA28
app-dicts/sword-GerLeoRP18
-   app-dicts/sword-GerLut1545
app-dicts/sword-GerLutherpredigten
app-dicts/sword-GerMenge
app-dicts/sword-GerNeUe
@@ -124,6 +123,7 @@ RDEPEND="
app-dicts/sword-BBE
app-dicts/sword-BDBGlosses_Strongs
app-dicts/sword-BWE
+   app-dicts/sword-BaptistConfession1646
app-dicts/sword-BaptistConfession1689
app-dicts/sword-Barnes
app-dicts/sword-Burkitt
@@ -354,6 +354,7 @@ RDEPEND="
app-dicts/sword-HunIMIT
app-dicts/sword-HunKNB
app-dicts/sword-HunKar
+   app-dicts/sword-HunRUF
app-dicts/sword-HunUj
)
l10n_hy? (

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2021-09-09 Thread Marek Szuba 
commit: 5a3d826576a2a9b8681786159e4d6464f3b65469
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  9 10:20:00 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  9 10:45:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3d8265

app-text/sword: keyword 1.9.0-r1 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/sword-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword/sword-1.9.0-r1.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
index e07a0369156..60349d5cfaf 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2021-09-09 Thread Marek Szuba 
commit: 72609e0efe6362b4649e60cbdeffa1f0a7237bc4
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  9 10:22:41 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  9 10:45:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72609e0e

app-text/sword-modules: keyword 2.4 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword-modules/sword-modules-2.4.ebuild 
b/app-text/sword-modules/sword-modules-2.4.ebuild
index 63f79eb5b4d..e2691353a33 100644
--- a/app-text/sword-modules/sword-modules-2.4.ebuild
+++ b/app-text/sword-modules/sword-modules-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.crosswire.org/sword/modules/;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et 
eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu 
la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml 
sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
 IUSE="esoteric ${LANGS// / l10n_}"

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2021-06-16 Thread Marek Szuba 
commit: b341161859628a2db64602e16545044dadda9307
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 16 13:24:10 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 16 13:24:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3411618

app-text/sword-modules: update the list of modules

Signed-off-by: Marek Szuba  gentoo.org>

 .../sword-modules/{sword-modules-2.3.ebuild => sword-modules-2.4.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/sword-modules/sword-modules-2.3.ebuild 
b/app-text/sword-modules/sword-modules-2.4.ebuild
similarity index 99%
rename from app-text/sword-modules/sword-modules-2.3.ebuild
rename to app-text/sword-modules/sword-modules-2.4.ebuild
index a010666f590..63f79eb5b4d 100644
--- a/app-text/sword-modules/sword-modules-2.3.ebuild
+++ b/app-text/sword-modules/sword-modules-2.4.ebuild
@@ -174,6 +174,7 @@ RDEPEND="
app-dicts/sword-KJV
app-dicts/sword-KJVA
app-dicts/sword-KJVPCE
+   app-dicts/sword-KingComm
app-dicts/sword-LEB
app-dicts/sword-LITV
app-dicts/sword-LO

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2021-04-25 Thread Marek Szuba 
commit: b298b0eac77fd74d317623cb7be91e5e5cab5dc8
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Apr 25 14:23:57 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Apr 25 14:25:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b298b0ea

app-text/sword-modules: update for latest module additions and removals

Signed-off-by: Marek Szuba  gentoo.org>

 .../{sword-modules-2.2.ebuild => sword-modules-2.3.ebuild} | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-2.2.ebuild 
b/app-text/sword-modules/sword-modules-2.3.ebuild
similarity index 97%
rename from app-text/sword-modules/sword-modules-2.2.ebuild
rename to app-text/sword-modules/sword-modules-2.3.ebuild
index 3c794d64215..c6977434687 100644
--- a/app-text/sword-modules/sword-modules-2.2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -85,18 +85,23 @@ RDEPEND="
l10n_de? (
app-dicts/sword-GerAlbrecht
app-dicts/sword-GerAugustinus
+   app-dicts/sword-GerBoLut
app-dicts/sword-GerElb1871
app-dicts/sword-GerElb1905
app-dicts/sword-GerGruenewald
+   app-dicts/sword-GerKingComm
app-dicts/sword-GerLeoNA28
app-dicts/sword-GerLeoRP18
app-dicts/sword-GerLut1545
app-dicts/sword-GerLutherpredigten
+   app-dicts/sword-GerMenge
app-dicts/sword-GerNeUe
+   app-dicts/sword-GerOffBiSt
app-dicts/sword-GerReinhardt
app-dicts/sword-GerSch
app-dicts/sword-GerTafel
app-dicts/sword-GerTextbibel
+   app-dicts/sword-GerZurcher
app-dicts/sword-MAK
app-dicts/sword-Rieger
)
@@ -240,6 +245,7 @@ RDEPEND="
app-dicts/sword-Esperanto
)
l10n_es? (
+   app-dicts/sword-SpaPlatense
app-dicts/sword-SpaRV
app-dicts/sword-SpaRV1865
app-dicts/sword-SpaRV1909
@@ -344,6 +350,8 @@ RDEPEND="
app-dicts/sword-Haitian
)
l10n_hu? (
+   app-dicts/sword-HunIMIT
+   app-dicts/sword-HunKNB
app-dicts/sword-HunKar
app-dicts/sword-HunUj
)
@@ -428,7 +436,9 @@ RDEPEND="
)
l10n_nl? (
app-dicts/sword-DutKant
+   app-dicts/sword-DutKingComm
app-dicts/sword-DutSVV
+   app-dicts/sword-DutSVVA
app-dicts/sword-NlCanisius1939
)
l10n_nn? (
@@ -479,7 +489,6 @@ RDEPEND="
)
l10n_sl? (
app-dicts/sword-SloKJV
-   app-dicts/sword-SloKJVA
app-dicts/sword-SloOjacano
app-dicts/sword-SloStritar
)
@@ -558,6 +567,7 @@ RDEPEND="
l10n_zh? (
app-dicts/sword-ChiNCVs
app-dicts/sword-ChiNCVt
+   app-dicts/sword-ChiSB
app-dicts/sword-ChiUn
app-dicts/sword-ChiUnL
app-dicts/sword-ChiUns

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2021-03-11 Thread Marek Szuba 
commit: bfc023152006b41a096fdd55df2df2745ab179ba
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 11 14:17:08 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 11 14:17:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc02315

app-text/sword-modules: tag as ALLARCH in metadata

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/sword-modules/metadata.xml 
b/app-text/sword-modules/metadata.xml
index f24236186ef..49ef5f0ab29 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -5,6 +5,7 @@
mare...@gentoo.org
Marek Szuba

+   

Install modules with no linguistic 
content, in unknown languages etc.

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/

2021-02-15 Thread Marek Szuba 
commit: a9f0d29be439918dd782fe4c2da932703453dddc
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb 15 12:21:01 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb 15 12:21:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f0d29b

app-text/sword: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/Manifest  |   1 -
 app-text/sword/files/sword-1.7.4-configure.patch |  23 
 app-text/sword/files/sword-1.8.1-icu61.diff  | 138 ---
 app-text/sword/sword-1.8.1-r1.ebuild |  76 -
 4 files changed, 238 deletions(-)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b34d6dd958a..663e7a3de61 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1 @@
-DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 
4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d
 SHA512 
5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
 DIST sword-1.9.0.tar.gz 2606652 BLAKE2B 
cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236
 SHA512 
9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f

diff --git a/app-text/sword/files/sword-1.7.4-configure.patch 
b/app-text/sword/files/sword-1.7.4-configure.patch
deleted file mode 100644
index a098addcd0d..000
--- a/app-text/sword/files/sword-1.7.4-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 a/configure
-+++ b/configure
-@@ -16893,7 +16895,7 @@
- # -
- 
- # NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds 
that clucene is not multilib-save and places some include files in /usr/lib[64]/
-+if test "x$with_clucene" != "xno"; then
--with_clucene=no
- if test "x$CLUCENE2_LIBS" != x; then
-echo "clucene 2.x found - lucene searching options available"
-AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 
-I$libdir"
-@@ -16914,6 +16912,11 @@
-echo "lucene searching options not available"
- fi
- fi
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
-+$as_echo "clucene manually disabled - excluding support" >&6; }
-+with_clucene="no"
-+fi
- 
- for ac_func in vsnprintf
- do :

diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff 
b/app-text/sword/files/sword-1.8.1-icu61.diff
deleted file mode 100644
index 2129f279ddc..000
--- a/app-text/sword/files/sword-1.8.1-icu61.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cbd06a..1d3a2d2 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
--# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken 
from another CMake system
--#   limit pkg-config version to >= 0.14, demo, utilities, doc, tests
-+# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
- #   use BUILD_SHARED_LIBS
- #   convince perl swig bindings to build properly
- #
-@@ -13,7 +12,7 @@
- # all posterity and eternity, wherever such transfer is possible.  Where it is
- # not, then this file is released under the GPLv2 by myself.
- PROJECT(libsword CXX C)
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
- SET(SWORD_VERSION 1.8.1)
- 
- # Make sure it's an out-of-stream build
-@@ -56,7 +55,8 @@ IF(MSVC)
- ELSE(MSVC)
-   FIND_PACKAGE(BZIP2 QUIET)
-   FIND_PACKAGE(XZ QUIET)
--  FIND_PACKAGE(ICU QUIET)
-+  FIND_PACKAGE(ICU
-+  COMPONENTS data i18n io uc)
-   FIND_PACKAGE(CURL QUIET)
- ENDIF(MSVC)
- FIND_PACKAGE(CLucene QUIET)
-@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
- IF(WITH_ICU)
-   INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
-   ADD_DEFINITIONS(${ICU_DEFINITIONS})
--  SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} 
${ICU_I18N_LIBRARIES})
-+  MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
-+  IF("${ICU_VERSION}" VERSION_GREATER "61")
-+  ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
-+  ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
-+  SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
- ENDIF(WITH_ICU)
- IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
-   SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
-diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
-deleted file mode 100644
-index 451c2f3..000
 a/cmake/FindICU.cmake
-+++ /dev/null
-@@ -1,68 +0,0 @@
--# Finds the International Components for Unicode (ICU) Library
--#
--#  ICU_FOUND  - True if ICU found.
--#  ICU_I18N_FOUND - True if ICU's internationalization library found.
--#  ICU_INCLUDE_DIRS   - Directory to include to get

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2021-01-24 Thread Agostino Sarubbo 
commit: c8b76e6fb8065dc00c12dbe652fd8e900d30eabb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 24 12:08:41 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 24 12:08:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b76e6f

app-text/sword: x86 stable wrt bug #766519

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/sword/sword-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword/sword-1.9.0-r1.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
index 2b00098f030..e07a0369156 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2021-01-22 Thread Agostino Sarubbo 
commit: 76a3bacd8dec3f9e5012258327aa11bb0143f9b5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jan 22 16:52:40 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jan 22 16:52:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a3bacd

app-text/sword: amd64 stable wrt bug #766519

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/sword/sword-1.9.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sword/sword-1.9.0-r1.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
index edd796fc48f..2b00098f030 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2020-12-13 Thread Marek Szuba 
commit: dcfab2f6b9d7220d97871f94ad68d5f6fcd7d11b
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 13 12:26:17 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 13 12:26:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfab2f6

app-text/sword-1.9.0: drop USE=static-libs support

No idea why we needed it in this package to begin with.

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/{sword-1.9.0.ebuild => sword-1.9.0-r1.ebuild} | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-text/sword/sword-1.9.0.ebuild 
b/app-text/sword/sword-1.9.0-r1.ebuild
similarity index 88%
rename from app-text/sword/sword-1.9.0.ebuild
rename to app-text/sword/sword-1.9.0-r1.ebuild
index b53e698cb50..edd796fc48f 100644
--- a/app-text/sword/sword-1.9.0.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
+IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib
curl? ( net-misc/curl )
@@ -26,16 +26,17 @@ DOCS=( AUTHORS CODINGSTYLE ChangeLog README )
 src_configure() {
use doc && DOCS+=( examples/ samples/ )
 
+   # Upstream default is to build both the shared and the static library,
+   # make sure we only build the shared one.
local mycmakeargs=(
-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+   -DLIBSWORD_LIBRARY_TYPE="Shared"
-DWITH_CLUCENE=$(usex clucene)
-DWITH_CURL=$(usex curl)
-DWITH_ICU=$(usex icu)
-DWITH_ZLIB=1
)
-   # Upstream default is to build both the shared and the static library
-   use static-libs || mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE="Shared" )
 
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2020-12-09 Thread Marek Szuba 
commit: 9c398750240b1319d538dfbcebc8af0e73701d40
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec  9 11:08:56 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec  9 11:08:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c398750

app-text/sword: bump to 1.9.0 and EAPI 7

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/Manifest   |  1 +
 app-text/sword/sword-1.9.0.ebuild | 41 +++
 2 files changed, 42 insertions(+)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index dc9b0729842..b34d6dd958a 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1 +1,2 @@
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 
4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d
 SHA512 
5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
+DIST sword-1.9.0.tar.gz 2606652 BLAKE2B 
cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236
 SHA512 
9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f

diff --git a/app-text/sword/sword-1.9.0.ebuild 
b/app-text/sword/sword-1.9.0.ebuild
new file mode 100644
index 000..b53e698cb50
--- /dev/null
+++ b/app-text/sword/sword-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="https://www.crosswire.org/sword/;
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+   curl? ( net-misc/curl )
+   icu? ( dev-libs/icu:= )
+   clucene? ( dev-cpp/clucene )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS CODINGSTYLE ChangeLog README )
+
+src_configure() {
+   use doc && DOCS+=( examples/ samples/ )
+
+   local mycmakeargs=(
+   -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+   -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+   -DWITH_CLUCENE=$(usex clucene)
+   -DWITH_CURL=$(usex curl)
+   -DWITH_ICU=$(usex icu)
+   -DWITH_ZLIB=1
+   )
+   # Upstream default is to build both the shared and the static library
+   use static-libs || mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE="Shared" )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-12-01 Thread Marek Szuba 
commit: ee5f15f316a7f48105d400be442ba2565e7b02dc
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec  1 23:23:15 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec  2 01:27:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5f15f3

app-text/sword-modules: add VieRobinson to the l10n_vi section

Signed-off-by: Marek Szuba  gentoo.org>

 .../sword-modules/{sword-modules-2.1.ebuild => sword-modules-2.2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/sword-modules/sword-modules-2.1.ebuild 
b/app-text/sword-modules/sword-modules-2.2.ebuild
similarity index 99%
rename from app-text/sword-modules/sword-modules-2.1.ebuild
rename to app-text/sword-modules/sword-modules-2.2.ebuild
index 9d74c11bf8d..3c794d64215 100644
--- a/app-text/sword-modules/sword-modules-2.1.ebuild
+++ b/app-text/sword-modules/sword-modules-2.2.ebuild
@@ -545,6 +545,7 @@ RDEPEND="
)
l10n_vi? (
app-dicts/sword-FVDPVietAnh
+   app-dicts/sword-VieRobinson
app-dicts/sword-VieStrongsGreek
app-dicts/sword-Viet
app-dicts/sword-VietLCCMN

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-09-10 Thread Marek Szuba 
commit: a87130f9eb234746b787e056861ad36c0f1f2b5d
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Sep 11 00:42:59 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Sep 11 00:44:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87130f9

app-text/sword-modules: add app-dicts/sword-VieStrongsGreek

Signed-off-by: Marek Szuba  gentoo.org>

 .../sword-modules/{sword-modules-2.ebuild => sword-modules-2.1.ebuild}   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/sword-modules/sword-modules-2.ebuild 
b/app-text/sword-modules/sword-modules-2.1.ebuild
similarity index 99%
rename from app-text/sword-modules/sword-modules-2.ebuild
rename to app-text/sword-modules/sword-modules-2.1.ebuild
index 8229d7f3c1c..9d74c11bf8d 100644
--- a/app-text/sword-modules/sword-modules-2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.1.ebuild
@@ -545,6 +545,7 @@ RDEPEND="
)
l10n_vi? (
app-dicts/sword-FVDPVietAnh
+   app-dicts/sword-VieStrongsGreek
app-dicts/sword-Viet
app-dicts/sword-VietLCCMN
app-dicts/sword-VietLCCMNCT

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-08-03 Thread Marek Szuba 
commit: ba428e37a4ea708538ce4733262b5844d0ad7be5
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug  3 12:29:33 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug  3 12:42:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba428e37

app-text/sword-modules: remove GerHfa2002 and GerHfaLex2002

These two modules are locked and I only included them by accident.

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-2.ebuild 
b/app-text/sword-modules/sword-modules-2.ebuild
index dc8a112bcfc..8229d7f3c1c 100644
--- a/app-text/sword-modules/sword-modules-2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.ebuild
@@ -88,8 +88,6 @@ RDEPEND="
app-dicts/sword-GerElb1871
app-dicts/sword-GerElb1905
app-dicts/sword-GerGruenewald
-   app-dicts/sword-GerHfa2002
-   app-dicts/sword-GerHfaLex2002
app-dicts/sword-GerLeoNA28
app-dicts/sword-GerLeoRP18
app-dicts/sword-GerLut1545

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-31 Thread Marek Szuba 
commit: aeda5bf121c4fbc1f956036196e099536cf318f9
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jul 31 19:24:36 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jul 31 19:31:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeda5bf1

app-text/sword-modules: group packages by L10N value

No real point in this pulling in every single SWORD module available...
Grouping them by language makes more sense to me.

This list includes all the modules which only got packaged for Gentoo
earlier on today.

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/metadata.xml  |   7 +-
 app-text/sword-modules/sword-modules-1-r3.ebuild | 143 --
 app-text/sword-modules/sword-modules-2.ebuild| 568 +++
 3 files changed, 571 insertions(+), 147 deletions(-)

diff --git a/app-text/sword-modules/metadata.xml 
b/app-text/sword-modules/metadata.xml
index 767ef6a4ec2..f24236186ef 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -5,8 +5,7 @@
mare...@gentoo.org
Marek Szuba

-   
-These are some of the more popular modules for the SWORD Project.
-They provide a large number of tools for personal study.
-   
+   
+   Install modules with no linguistic 
content, in unknown languages etc.
+   
 

diff --git a/app-text/sword-modules/sword-modules-1-r3.ebuild 
b/app-text/sword-modules/sword-modules-1-r3.ebuild
deleted file mode 100644
index c1c0e0d55a7..000
--- a/app-text/sword-modules/sword-modules-1-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="https://www.crosswire.org/sword/;
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-dicts/sword-Abbott
-   app-dicts/sword-ACV
-   app-dicts/sword-Afr1953
-   app-dicts/sword-AKJV
-   app-dicts/sword-Alb
-   app-dicts/sword-Aleppo
-   app-dicts/sword-AmTract
-   app-dicts/sword-AraSVD
-   app-dicts/sword-ArmEastern
-   app-dicts/sword-ArmWestern
-   app-dicts/sword-ASV
-   app-dicts/sword-Barnes
-   app-dicts/sword-BasHautin
-   app-dicts/sword-BBE
-   app-dicts/sword-BulVeren
-   app-dicts/sword-BurJudson
-   app-dicts/sword-Byz
-   app-dicts/sword-CBC
-   app-dicts/sword-Chamorro
-   app-dicts/sword-Clarke
-   app-dicts/sword-Common
-   app-dicts/sword-CroSaric
-   app-dicts/sword-CzeBKR
-   app-dicts/sword-DaOT1931NT1907
-   app-dicts/sword-Daily
-   app-dicts/sword-Darby
-   app-dicts/sword-Diaglott
-   app-dicts/sword-DRC
-   app-dicts/sword-DTN
-   app-dicts/sword-DutKant
-   app-dicts/sword-DutSVV
-   app-dicts/sword-Easton
-   app-dicts/sword-Esperanto
-   app-dicts/sword-FarOPV
-   app-dicts/sword-FinBiblia
-   app-dicts/sword-Finney
-   app-dicts/sword-FinPR
-   app-dicts/sword-FreBBB
-   app-dicts/sword-FreBDM1744
-   app-dicts/sword-FreCrampon
-   app-dicts/sword-FreSegond1910
-   app-dicts/sword-Geneva
-   app-dicts/sword-Geneva1599
-   app-dicts/sword-GerElb1871
-   app-dicts/sword-GerElb1905
-   app-dicts/sword-GerLut1545
-   app-dicts/sword-GerSch
-   app-dicts/sword-GreekHebrew
-   app-dicts/sword-HebrewGreek
-   app-dicts/sword-Heretics
-   app-dicts/sword-Hitchcock
-   app-dicts/sword-HunKar
-   app-dicts/sword-Institutes
-   app-dicts/sword-ISBE
-   app-dicts/sword-ISV
-   app-dicts/sword-ItaDio
-   app-dicts/sword-ItaRive
-   app-dicts/sword-JFB
-   app-dicts/sword-Josephus
-   app-dicts/sword-JPS
-   app-dicts/sword-JST
-   app-dicts/sword-Jubilee2000
-   app-dicts/sword-KJV
-   app-dicts/sword-KJVA
-   app-dicts/sword-KLV
-   app-dicts/sword-KLVen_iklingon
-   app-dicts/sword-KLViklingon_en
-   app-dicts/sword-Lightfoot
-   app-dicts/sword-LITV
-   app-dicts/sword-Luther
-   app-dicts/sword-MAK
-   app-dicts/sword-ManxGaelic
-   app-dicts/sword-MHC
-   app-dicts/sword-MHCC
-   app-dicts/sword-MKJV
-   app-dicts/sword-Montgomery
-   app-dicts/sword-Murdock
-   app-dicts/sword-Nave
-   app-dicts/sword-Norsk
-   app-dicts/sword-Orthodoxy
-   app-dicts/sword-Packard
-   app-dicts/sword-Personal
-   app-dicts/sword-Peshitta
-   app-dicts/sword-Pilgrim
-   app-dicts/sword-PNT
-   app-dicts/sword-Practice
-   app-dicts/sword-RKJNT
-   app-dicts/sword-RNKJV
-   app-dicts/sword-Robinson
-   app-dicts/sword-Rotherham
-   app-dicts/sword-RusMakarij
-   app-dicts/sword-RusSynodal
-   app-dicts/sword-RWebster
-   app-dicts/sword-RWP
-   app-dicts/sword-SAOA
-

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-29 Thread Marek Szuba 
commit: 224079f76c16f43bc97b542ff8ec5c1608b55d2a
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jul 29 14:19:20 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 29 14:20:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224079f7

app-text/sword-modules: add last-rite replacements to the list

Signed-off-by: Marek Szuba  gentoo.org>

 .../{sword-modules-1-r2.ebuild => sword-modules-1-r3.ebuild}   | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app-text/sword-modules/sword-modules-1-r2.ebuild 
b/app-text/sword-modules/sword-modules-1-r3.ebuild
similarity index 93%
rename from app-text/sword-modules/sword-modules-1-r2.ebuild
rename to app-text/sword-modules/sword-modules-1-r3.ebuild
index 55fc661077d..c1c0e0d55a7 100644
--- a/app-text/sword-modules/sword-modules-1-r2.ebuild
+++ b/app-text/sword-modules/sword-modules-1-r3.ebuild
@@ -32,7 +32,9 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-Chamorro
app-dicts/sword-Clarke
app-dicts/sword-Common
+   app-dicts/sword-CroSaric
app-dicts/sword-CzeBKR
+   app-dicts/sword-DaOT1931NT1907
app-dicts/sword-Daily
app-dicts/sword-Darby
app-dicts/sword-Diaglott
@@ -42,12 +44,14 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-DutSVV
app-dicts/sword-Easton
app-dicts/sword-Esperanto
+   app-dicts/sword-FarOPV
app-dicts/sword-FinBiblia
app-dicts/sword-Finney
app-dicts/sword-FinPR
app-dicts/sword-FreBBB
+   app-dicts/sword-FreBDM1744
app-dicts/sword-FreCrampon
-   app-dicts/sword-FreSegond
+   app-dicts/sword-FreSegond1910
app-dicts/sword-Geneva
app-dicts/sword-Geneva1599
app-dicts/sword-GerElb1871
@@ -70,6 +74,7 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-JST
app-dicts/sword-Jubilee2000
app-dicts/sword-KJV
+   app-dicts/sword-KJVA
app-dicts/sword-KLV
app-dicts/sword-KLVen_iklingon
app-dicts/sword-KLViklingon_en
@@ -97,6 +102,7 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-Robinson
app-dicts/sword-Rotherham
app-dicts/sword-RusMakarij
+   app-dicts/sword-RusSynodal
app-dicts/sword-RWebster
app-dicts/sword-RWP
app-dicts/sword-SAOA
@@ -105,6 +111,7 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-SME
app-dicts/sword-Smith
app-dicts/sword-SpaRV
+   app-dicts/sword-SpaRVG
app-dicts/sword-SpaVNT
app-dicts/sword-Spurious
app-dicts/sword-StrongsGreek
@@ -126,6 +133,7 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-Vulgate
app-dicts/sword-Vulgate_HebPs
app-dicts/sword-Webster
+   app-dicts/sword-Webster1913
app-dicts/sword-Wesley
app-dicts/sword-Weymouth
app-dicts/sword-WHNU

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-27 Thread Marek Szuba 
commit: 33c414e7a20298a8eb089cfd30185945b7c5f887
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 27 17:07:12 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 27 17:15:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c414e7

app-text/sword-modules: do not depend on masked modules

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-1-r2.ebuild | 12 
 1 file changed, 12 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-1-r2.ebuild 
b/app-text/sword-modules/sword-modules-1-r2.ebuild
index 81eda86d869..55fc661077d 100644
--- a/app-text/sword-modules/sword-modules-1-r2.ebuild
+++ b/app-text/sword-modules/sword-modules-1-r2.ebuild
@@ -32,10 +32,8 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-Chamorro
app-dicts/sword-Clarke
app-dicts/sword-Common
-   app-dicts/sword-Cro
app-dicts/sword-CzeBKR
app-dicts/sword-Daily
-   app-dicts/sword-Dan
app-dicts/sword-Darby
app-dicts/sword-Diaglott
app-dicts/sword-DRC
@@ -44,14 +42,11 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-DutSVV
app-dicts/sword-Easton
app-dicts/sword-Esperanto
-   app-dicts/sword-FarsiOPV
app-dicts/sword-FinBiblia
app-dicts/sword-Finney
app-dicts/sword-FinPR
app-dicts/sword-FreBBB
app-dicts/sword-FreCrampon
-   app-dicts/sword-FreLSG
-   app-dicts/sword-FreMartin
app-dicts/sword-FreSegond
app-dicts/sword-Geneva
app-dicts/sword-Geneva1599
@@ -63,7 +58,6 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-HebrewGreek
app-dicts/sword-Heretics
app-dicts/sword-Hitchcock
-   app-dicts/sword-HNV
app-dicts/sword-HunKar
app-dicts/sword-Institutes
app-dicts/sword-ISBE
@@ -76,7 +70,6 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-JST
app-dicts/sword-Jubilee2000
app-dicts/sword-KJV
-   app-dicts/sword-KJVD
app-dicts/sword-KLV
app-dicts/sword-KLVen_iklingon
app-dicts/sword-KLViklingon_en
@@ -103,7 +96,6 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-RNKJV
app-dicts/sword-Robinson
app-dicts/sword-Rotherham
-   app-dicts/sword-RST
app-dicts/sword-RusMakarij
app-dicts/sword-RWebster
app-dicts/sword-RWP
@@ -113,8 +105,6 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-SME
app-dicts/sword-Smith
app-dicts/sword-SpaRV
-   app-dicts/sword-SpaRVG2004
-   app-dicts/sword-SpaSEV
app-dicts/sword-SpaVNT
app-dicts/sword-Spurious
app-dicts/sword-StrongsGreek
@@ -135,9 +125,7 @@ RDEPEND="app-dicts/sword-Abbott
app-dicts/sword-Uma
app-dicts/sword-Vulgate
app-dicts/sword-Vulgate_HebPs
-   app-dicts/sword-WEB
app-dicts/sword-Webster
-   app-dicts/sword-WebstersDict
app-dicts/sword-Wesley
app-dicts/sword-Weymouth
app-dicts/sword-WHNU

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-27 Thread Marek Szuba 
commit: 4f3993f69c7c704e9d0cd427ed51459530337157
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul 27 13:38:11 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul 27 13:42:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3993f6

app-text/sword-modules: update the dependency list

Sync existing entries following the recent renaming + add the 9 which
were previously not there.

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-1-r1.ebuild | 138 -
 app-text/sword-modules/sword-modules-1-r2.ebuild | 147 +++
 2 files changed, 147 insertions(+), 138 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-1-r1.ebuild 
b/app-text/sword-modules/sword-modules-1-r1.ebuild
deleted file mode 100644
index f15f8165802..000
--- a/app-text/sword-modules/sword-modules-1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="https://www.crosswire.org/sword/;
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-dicts/sword-abbott
-   app-dicts/sword-acv
-   app-dicts/sword-afr1953
-   app-dicts/sword-akjv
-   app-dicts/sword-alb
-   app-dicts/sword-aleppo
-   app-dicts/sword-amtract
-   app-dicts/sword-arasvd
-   app-dicts/sword-asv
-   app-dicts/sword-barnes
-   app-dicts/sword-bbe
-   app-dicts/sword-bulveren
-   app-dicts/sword-byz
-   app-dicts/sword-cbc
-   app-dicts/sword-chamorro
-   app-dicts/sword-clarke
-   app-dicts/sword-common
-   app-dicts/sword-cro
-   app-dicts/sword-czebkr
-   app-dicts/sword-daily
-   app-dicts/sword-dan
-   app-dicts/sword-darby
-   app-dicts/sword-diaglott
-   app-dicts/sword-drc
-   app-dicts/sword-dtn
-   app-dicts/sword-dutkant
-   app-dicts/sword-dutsvv
-   app-dicts/sword-easton
-   app-dicts/sword-esperanto
-   app-dicts/sword-farsiopv
-   app-dicts/sword-finbiblia
-   app-dicts/sword-finney
-   app-dicts/sword-finpr
-   app-dicts/sword-frelsg
-   app-dicts/sword-geneva1599
-   app-dicts/sword-gerelb1871
-   app-dicts/sword-gerelb1905
-   app-dicts/sword-gerlut1545
-   app-dicts/sword-gersch
-   app-dicts/sword-greekhebrew
-   app-dicts/sword-hebrewgreek
-   app-dicts/sword-heretics
-   app-dicts/sword-hitchcock
-   app-dicts/sword-hnv
-   app-dicts/sword-hunkar
-   app-dicts/sword-institutes
-   app-dicts/sword-isbe
-   app-dicts/sword-isv
-   app-dicts/sword-itadio
-   app-dicts/sword-itarive
-   app-dicts/sword-jfb
-   app-dicts/sword-josephus
-   app-dicts/sword-jps
-   app-dicts/sword-jst
-   app-dicts/sword-jubilee2000
-   app-dicts/sword-kjv
-   app-dicts/sword-kjvd
-   app-dicts/sword-klv
-   app-dicts/sword-klven_iklingon
-   app-dicts/sword-klviklingon_en
-   app-dicts/sword-lightfoot
-   app-dicts/sword-litv
-   app-dicts/sword-luther
-   app-dicts/sword-mak
-   app-dicts/sword-manxgaelic
-   app-dicts/sword-mhc
-   app-dicts/sword-mhcc
-   app-dicts/sword-mkjv
-   app-dicts/sword-montgomery
-   app-dicts/sword-murdock
-   app-dicts/sword-nave
-   app-dicts/sword-norsk
-   app-dicts/sword-orthodoxy
-   app-dicts/sword-packard
-   app-dicts/sword-personal
-   app-dicts/sword-peshitta
-   app-dicts/sword-pilgrim
-   app-dicts/sword-pnt
-   app-dicts/sword-practice
-   app-dicts/sword-rkjnt
-   app-dicts/sword-rnkjv
-   app-dicts/sword-robinson
-   app-dicts/sword-rotherham
-   app-dicts/sword-rst
-   app-dicts/sword-rusmakarij
-   app-dicts/sword-rwebster
-   app-dicts/sword-rwp
-   app-dicts/sword-saoa
-   app-dicts/sword-scofield
-   app-dicts/sword-scotsgaelic
-   app-dicts/sword-sme
-   app-dicts/sword-smith
-   app-dicts/sword-sparv
-   app-dicts/sword-sparvg2004
-   app-dicts/sword-spasev
-   app-dicts/sword-spavnt
-   app-dicts/sword-spurious
-   app-dicts/sword-strongsgreek
-   app-dicts/sword-strongshebrew
-   app-dicts/sword-swahili
-   app-dicts/sword-tagalog
-   app-dicts/sword-tcr
-   app-dicts/sword-tdavid
-   app-dicts/sword-tfg
-   app-dicts/sword-tisch
-   app-dicts/sword-torrey
-   app-dicts/sword-tr
-   app-dicts/sword-tsk
-   app-dicts/sword-twenty
-   app-dicts/sword-tyndale
-   app-dicts/sword-ukjv
-   app-dicts/sword-ukrainian
-   app-dicts/sword-uma
-   app-dicts/sword-vulgate
-   app-dicts/sword-vulgate_hebps
-   app-dicts/sword-web
-   app-dicts/sword-webster
-   app-dicts/sword-webstersdict
-   app-dicts/sword-wesley
-

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/

2020-07-26 Thread Marek Szuba 
commit: 6847287af89502cc4bce9824f5ffaba1e766fbc7
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jul 26 08:55:34 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jul 26 08:58:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6847287a

app-text/sword: remove old part II

Missed a patch when I removed 1.7.4. With thanks to GihHub user mm1ke
for the heads-up.

Closes: https://github.com/gentoo/gentoo/pull/16830
Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/files/sword-1.7.4-gcc6.patch | 22 --
 1 file changed, 22 deletions(-)

diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch 
b/app-text/sword/files/sword-1.7.4-gcc6.patch
deleted file mode 100644
index 54c79671235..000
--- a/app-text/sword/files/sword-1.7.4-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 sword-1.7.4/configure.ac.old   2016-09-21 18:04:55.029088352 -0400
-+++ sword-1.7.4/configure.ac   2016-09-21 18:05:37.870349308 -0400
-@@ -197,7 +197,7 @@
- fi
- 
- 
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
- 
- if test x$enable_warnings = xyes; then
-   AM_CFLAGS="$AM_CFLAGS -Werror"
 sword-1.7.4/configure.old  2016-09-21 18:05:05.98373 -0400
-+++ sword-1.7.4/configure  2016-09-21 18:06:03.822112657 -0400
-@@ -16793,7 +16793,7 @@
- fi
- 
- 
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
- 
- if test x$enable_warnings = xyes; then
-   AM_CFLAGS="$AM_CFLAGS -Werror"

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2020-07-25 Thread Marek Szuba 
commit: 524d09d6512a9a4c85a33b5ae11195de7cda6835
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 25 13:50:12 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 25 13:53:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524d09d6

app-text/sword: switch to https URIs

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/sword-1.8.1-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/sword/sword-1.8.1-r1.ebuild 
b/app-text/sword/sword-1.8.1-r1.ebuild
index acafbb4e531..7da3c1961d4 100644
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/;
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
+HOMEPAGE="https://www.crosswire.org/sword/;
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-25 Thread Marek Szuba 
commit: b00f52f62c3653b45d4b4a221d96d62f37bd53b6
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 25 13:52:42 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 25 13:53:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00f52f6

app-text/sword-modules: Switch to https URIs

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword-modules/sword-modules-1-r1.ebuild 
b/app-text/sword-modules/sword-modules-1-r1.ebuild
index 07dd5e87277..f15f8165802 100644
--- a/app-text/sword-modules/sword-modules-1-r1.ebuild
+++ b/app-text/sword-modules/sword-modules-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="http://www.crosswire.org/sword/;
+HOMEPAGE="https://www.crosswire.org/sword/;
 
 LICENSE="metapackage"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2020-07-25 Thread Marek Szuba 
commit: d175d058648dce180161357f7fd6c3a19560f352
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 25 13:51:46 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 25 13:53:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d175d058

app-text/sword: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword/Manifest  |  1 -
 app-text/sword/sword-1.7.4-r1.ebuild | 85 
 2 files changed, 86 deletions(-)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index ed1a2c41782..dc9b0729842 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1 @@
-DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 
7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20
 SHA512 
4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 
4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d
 SHA512 
5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36

diff --git a/app-text/sword/sword-1.7.4-r1.ebuild 
b/app-text/sword/sword-1.7.4-r1.ebuild
deleted file mode 100644
index 99a6880de9c..000
--- a/app-text/sword/sword-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/;
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
-   curl? ( net-misc/curl )
-   icu? ( dev-libs/icu:= )
-   clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test"#Restricting for now, see bug 313207
-
-src_prepare() {
-   sed -i \
-   -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
-   -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
-   configure || die
-
-   sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
-   sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
-   cat <<-EOF > "${T}"/${PN}.conf
-   [Install]
-   DataPath=${EPREFIX}/usr/share/${PN}/
-   EOF
-   epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
-   epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
-   eapply_user
-}
-
-src_configure() {
-   # TODO: Why is this here and can we remove it?
-   strip-flags
-
-   # bug 618776
-   append-cxxflags -std=c++14
-
-   econf \
-   $(use_enable static-libs static) \
-   $(use_enable debug) \
-   --with-zlib \
-   $(use_with icu) \
-   --with-conf \
-   $(use_with curl) \
-   $(use_with clucene)
-}
-
-src_install() {
-   default
-
-   find "${ED}" -name '*.la' -exec rm -f {} +
-
-   if use doc; then
-   rm -rf examples/.cvsignore
-   rm -rf examples/cmdline/.cvsignore
-   rm -rf examples/cmdline/.deps
-   cp -R samples examples "${ED}"/usr/share/doc/${PF}/
-   fi
-
-   insinto /etc
-   doins "${T}"/${PN}.conf
-}
-
-pkg_postinst() {
-   elog "Check out http://www.crosswire.org/sword/modules/;
-   elog "to download modules that you would like to use with SWORD."
-   elog "Follow module installation instructions found on"
-   elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-07-25 Thread Marek Szuba 
commit: 35d0cbd71becbfb058b000f1ffb1a39210fae269
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 25 13:41:28 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 25 13:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d0cbd7

app-text/sword-modules: bump EAPI version to 7

Signed-off-by: Marek Szuba  gentoo.org>

 app-text/sword-modules/sword-modules-1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword-modules/sword-modules-1-r1.ebuild 
b/app-text/sword-modules/sword-modules-1-r1.ebuild
index ada05b1a4dd..07dd5e87277 100644
--- a/app-text/sword-modules/sword-modules-1-r1.ebuild
+++ b/app-text/sword-modules/sword-modules-1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 DESCRIPTION="A collection of modules for the SWORD project"
 HOMEPAGE="http://www.crosswire.org/sword/;

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-01-06 Thread Ulrich Müller 
commit: 20013ff02ebd6c57a39241177069b744afb324cb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan  6 20:27:26 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan  6 20:27:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20013ff0

app-text/sword-modules: Revision bump, no changes.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 .../sword-modules/{sword-modules-1.ebuild => sword-modules-1-r1.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-1.ebuild 
b/app-text/sword-modules/sword-modules-1-r1.ebuild
similarity index 100%
rename from app-text/sword-modules/sword-modules-1.ebuild
rename to app-text/sword-modules/sword-modules-1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-text/sword-modules/

2020-01-06 Thread Ulrich Müller 
commit: 080c7ac265ce02d011630d90ec32489fc15ecaf5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan  6 18:49:59 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan  6 20:19:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080c7ac2

app-text/sword-modules: Don't depend on last-rited packages.

Bug: https://bugs.gentoo.org/703604
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 app-text/sword-modules/sword-modules-1.ebuild | 29 ++-
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/app-text/sword-modules/sword-modules-1.ebuild 
b/app-text/sword-modules/sword-modules-1.ebuild
index f8c88194ab5..ada05b1a4dd 100644
--- a/app-text/sword-modules/sword-modules-1.ebuild
+++ b/app-text/sword-modules/sword-modules-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,9 +11,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="app-dicts/sword-ab
-   app-dicts/sword-abbott
-   app-dicts/sword-abs_essay_goodsam_swb
+RDEPEND="app-dicts/sword-abbott
app-dicts/sword-acv
app-dicts/sword-afr1953
app-dicts/sword-akjv
@@ -24,24 +22,14 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-asv
app-dicts/sword-barnes
app-dicts/sword-bbe
-   app-dicts/sword-br_en
-   app-dicts/sword-bulcarigradnt
app-dicts/sword-bulveren
-   app-dicts/sword-bwe
app-dicts/sword-byz
app-dicts/sword-cbc
app-dicts/sword-chamorro
-   app-dicts/sword-chincvs
-   app-dicts/sword-chincvt
-   app-dicts/sword-chiun
-   app-dicts/sword-chiuns
app-dicts/sword-clarke
app-dicts/sword-common
app-dicts/sword-cro
app-dicts/sword-czebkr
-   app-dicts/sword-czecep
-   app-dicts/sword-czekms
-   app-dicts/sword-czenkb
app-dicts/sword-daily
app-dicts/sword-dan
app-dicts/sword-darby
@@ -52,12 +40,10 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-dutsvv
app-dicts/sword-easton
app-dicts/sword-esperanto
-   app-dicts/sword-est
app-dicts/sword-farsiopv
app-dicts/sword-finbiblia
app-dicts/sword-finney
app-dicts/sword-finpr
-   app-dicts/sword-frecrl
app-dicts/sword-frelsg
app-dicts/sword-geneva1599
app-dicts/sword-gerelb1871
@@ -65,14 +51,11 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-gerlut1545
app-dicts/sword-gersch
app-dicts/sword-greekhebrew
-   app-dicts/sword-hebmodern
app-dicts/sword-hebrewgreek
app-dicts/sword-heretics
app-dicts/sword-hitchcock
app-dicts/sword-hnv
app-dicts/sword-hunkar
-   app-dicts/sword-hunuj
-   app-dicts/sword-icelandic
app-dicts/sword-institutes
app-dicts/sword-isbe
app-dicts/sword-isv
@@ -83,21 +66,16 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-jps
app-dicts/sword-jst
app-dicts/sword-jubilee2000
-   app-dicts/sword-kekchi
app-dicts/sword-kjv
app-dicts/sword-kjvd
app-dicts/sword-klv
app-dicts/sword-klven_iklingon
app-dicts/sword-klviklingon_en
-   app-dicts/sword-korean
-   app-dicts/sword-la_en
-   app-dicts/sword-latvian
app-dicts/sword-lightfoot
app-dicts/sword-litv
app-dicts/sword-luther
app-dicts/sword-mak
app-dicts/sword-manxgaelic
-   app-dicts/sword-maori
app-dicts/sword-mhc
app-dicts/sword-mhcc
app-dicts/sword-mkjv
@@ -115,7 +93,6 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-rkjnt
app-dicts/sword-rnkjv
app-dicts/sword-robinson
-   app-dicts/sword-romcor
app-dicts/sword-rotherham
app-dicts/sword-rst
app-dicts/sword-rusmakarij
@@ -147,7 +124,6 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-ukjv
app-dicts/sword-ukrainian
app-dicts/sword-uma
-   app-dicts/sword-umgreek
app-dicts/sword-vulgate
app-dicts/sword-vulgate_hebps
app-dicts/sword-web
@@ -159,5 +135,4 @@ RDEPEND="app-dicts/sword-ab
app-dicts/sword-wlc
app-dicts/sword-wulfila
app-dicts/sword-wycliffe
-   app-dicts/sword-xhosa
app-dicts/sword-ylt"

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2018-10-20 Thread Mikle Kolyada 
commit: 4db832dd530e8b536191e28f5ac990711d3cc534
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 20 17:50:35 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 20 17:50:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db832dd

app-text/sword: amd64 stable wrt bug #668282

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 app-text/sword/sword-1.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword/sword-1.8.1-r1.ebuild 
b/app-text/sword/sword-1.8.1-r1.ebuild
index dba6adc5520..97ffa1634b5 100644
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
 IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2018-10-17 Thread Thomas Deutschmann 
commit: db54e3b3eeea2d3b08abfc368e305539233b68dc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct 17 12:05:35 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct 17 12:05:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db54e3b3

app-text/sword: x86 stable (bug #668282)

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-text/sword/sword-1.8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sword/sword-1.8.1-r1.ebuild 
b/app-text/sword/sword-1.8.1-r1.ebuild
index 263d19b2a7c..dba6adc5520 100644
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
 IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2018-10-12 Thread Chris Reffett 
commit: 6a34df8eae4ad4debd0d170f1fe73cc0b3e62ff8
Author: Chris Reffett  gentoo  org>
AuthorDate: Fri Oct 12 22:37:53 2018 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Fri Oct 12 22:38:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a34df8e

app-text/sword: Revbump, switch to cmake build

Switch to using CMake build system. Incidentally fixes 668296.

Bug: https://bugs.gentoo.org/668296
Signed-off-by: Chris Reffett  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../{sword-1.8.1.ebuild => sword-1.8.1-r1.ebuild}  | 41 +-
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/app-text/sword/sword-1.8.1.ebuild 
b/app-text/sword/sword-1.8.1-r1.ebuild
similarity index 72%
rename from app-text/sword/sword-1.8.1.ebuild
rename to app-text/sword/sword-1.8.1-r1.ebuild
index 1ddc808294c..263d19b2a7c 100644
--- a/app-text/sword/sword-1.8.1.ebuild
+++ b/app-text/sword/sword-1.8.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit flag-o-matic
+EAPI=6
+inherit flag-o-matic cmake-utils
 
 DESCRIPTION="Library for Bible reading software"
 HOMEPAGE="http://www.crosswire.org/sword/;
@@ -27,38 +27,29 @@ DOCS="AUTHORS CODINGSTYLE ChangeLog README"
 RESTRICT="test"#Restricting for now, see bug 313207
 
 src_prepare() {
-   sed -i \
-   -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
-   -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
-   configure || die
-
-   sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
-   cat <<-EOF > "${T}"/${PN}.conf
-   [Install]
-   DataPath=${EPREFIX}/usr/share/${PN}/
-   EOF
eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
eapply_user
+
+   cmake-utils_src_prepare
 }
 
 src_configure() {
-   # TODO: Why is this here and can we remove it?
-   strip-flags
-
# bug 618776
append-cxxflags -std=c++14
 
-   econf \
-   $(use_enable static-libs static) \
-   $(use_enable debug) \
-   --with-zlib \
-   $(use_with icu) \
-   --with-conf \
-   $(use_with curl) \
-   $(use_with clucene)
+   local mycmakeargs=(
+   -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+   -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+   -DWITH_CLUCENE=$(usex clucene)
+   -DWITH_CURL=$(usex curl)
+   -DWITH_ICU=$(usex icu)
+   -DWITH_ZLIB=1
+   )
+   use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static )
+
+   cmake-utils_src_configure
 }
 
 src_install() {
@@ -74,7 +65,7 @@ src_install() {
fi
 
insinto /etc
-   doins "${T}"/${PN}.conf
+   cmake-utils_src_install
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/

2018-10-10 Thread Chris Reffett 
commit: 0a486b6ed5e7ad6dfce634d0b2dc574bed81c825
Author: Chris Reffett  gentoo  org>
AuthorDate: Thu Oct 11 00:03:45 2018 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Thu Oct 11 00:05:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a486b6e

app-text/sword: Version bump, fix ICU

Bump to 1.8.1, add patch from Fedora to fix builds with ICU >= 62

Bug: https://bugs.gentoo.org/666518
Signed-off-by: Chris Reffett  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-text/sword/Manifest|   2 +-
 app-text/sword/files/sword-1.8.1-icu61.diff| 138 +
 .../{sword-1.8.0.ebuild => sword-1.8.1.ebuild} |   3 +-
 3 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 739447b1e03..ed1a2c41782 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1,2 @@
 DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 
7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20
 SHA512 
4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
-DIST sword-1.8.0.tar.gz 2444386 BLAKE2B 
dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86
 SHA512 
c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
+DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 
4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d
 SHA512 
5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36

diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff 
b/app-text/sword/files/sword-1.8.1-icu61.diff
new file mode 100644
index 000..2129f279ddc
--- /dev/null
+++ b/app-text/sword/files/sword-1.8.1-icu61.diff
@@ -0,0 +1,138 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5cbd06a..1d3a2d2 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,5 +1,4 @@
+-# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken 
from another CMake system
+-#   limit pkg-config version to >= 0.14, demo, utilities, doc, tests
++# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+ #   use BUILD_SHARED_LIBS
+ #   convince perl swig bindings to build properly
+ #
+@@ -13,7 +12,7 @@
+ # all posterity and eternity, wherever such transfer is possible.  Where it is
+ # not, then this file is released under the GPLv2 by myself.
+ PROJECT(libsword CXX C)
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
+ SET(SWORD_VERSION 1.8.1)
+ 
+ # Make sure it's an out-of-stream build
+@@ -56,7 +55,8 @@ IF(MSVC)
+ ELSE(MSVC)
+   FIND_PACKAGE(BZIP2 QUIET)
+   FIND_PACKAGE(XZ QUIET)
+-  FIND_PACKAGE(ICU QUIET)
++  FIND_PACKAGE(ICU
++  COMPONENTS data i18n io uc)
+   FIND_PACKAGE(CURL QUIET)
+ ENDIF(MSVC)
+ FIND_PACKAGE(CLucene QUIET)
+@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
+ IF(WITH_ICU)
+   INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
+   ADD_DEFINITIONS(${ICU_DEFINITIONS})
+-  SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} 
${ICU_I18N_LIBRARIES})
++  MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
++  IF("${ICU_VERSION}" VERSION_GREATER "61")
++  ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
++  ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
++  SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
+ ENDIF(WITH_ICU)
+ IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+   SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
+deleted file mode 100644
+index 451c2f3..000
+--- a/cmake/FindICU.cmake
 /dev/null
+@@ -1,68 +0,0 @@
+-# Finds the International Components for Unicode (ICU) Library
+-#
+-#  ICU_FOUND  - True if ICU found.
+-#  ICU_I18N_FOUND - True if ICU's internationalization library found.
+-#  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
+-#   Note: always include ICU headers as, e.g., 
+-#   unicode/utypes.h
+-#  ICU_LIBRARIES  - Libraries to link against for the common ICU
+-#  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+-#   (note: in addition to ICU_LIBRARIES)
+-
+-# Look for the header file.
+-find_path(
+-  ICU_INCLUDE_DIR 
+-  NAMES unicode/utypes.h
+-  DOC "Include directory for the ICU library")
+-mark_as_advanced(ICU_INCLUDE_DIR)
+-
+-# Look for the library.
+-find_library(
+-  ICU_LIBRARY
+-  NAMES icuuc cygicuuc cygicuuc32
+-  DOC "Libraries to link against for the common parts of

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2018-06-19 Thread Chris Reffett 
commit: 5d2a203eac7c405960b8d5d13ed4b85abdc946d9
Author: Chris Reffett  gentoo  org>
AuthorDate: Wed Jun 20 00:08:36 2018 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Wed Jun 20 01:21:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2a203e

app-text/sword: Version bump

Closes: https://bugs.gentoo.org/658358
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/sword/Manifest   |  1 +
 app-text/sword/sword-1.8.0.ebuild | 84 +++
 2 files changed, 85 insertions(+)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 1ea34213ec8..739447b1e03 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1 +1,2 @@
 DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 
7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20
 SHA512 
4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
+DIST sword-1.8.0.tar.gz 2444386 BLAKE2B 
dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86
 SHA512 
c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e

diff --git a/app-text/sword/sword-1.8.0.ebuild 
b/app-text/sword/sword-1.8.0.ebuild
new file mode 100644
index 000..bb6ed4a2b10
--- /dev/null
+++ b/app-text/sword/sword-1.8.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/;
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+   curl? ( net-misc/curl )
+   icu? ( dev-libs/icu:= )
+   clucene? ( dev-cpp/clucene )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"#Restricting for now, see bug 313207
+
+src_prepare() {
+   sed -i \
+   -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+   -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+   configure || die
+
+   sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+   sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+   cat <<-EOF > "${T}"/${PN}.conf
+   [Install]
+   DataPath=${EPREFIX}/usr/share/${PN}/
+   EOF
+   eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
+   eapply_user
+}
+
+src_configure() {
+   # TODO: Why is this here and can we remove it?
+   strip-flags
+
+   # bug 618776
+   append-cxxflags -std=c++14
+
+   econf \
+   $(use_enable static-libs static) \
+   $(use_enable debug) \
+   --with-zlib \
+   $(use_with icu) \
+   --with-conf \
+   $(use_with curl) \
+   $(use_with clucene)
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -exec rm -f {} +
+
+   if use doc; then
+   rm -rf examples/.cvsignore
+   rm -rf examples/cmdline/.cvsignore
+   rm -rf examples/cmdline/.deps
+   cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+   fi
+
+   insinto /etc
+   doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+   elog "Check out http://www.crosswire.org/sword/modules/;
+   elog "to download modules that you would like to use with SWORD."
+   elog "Follow module installation instructions found on"
+   elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2018-02-19 Thread David Seifert 
commit: 543adb508b78e2abcb84ff47cb8f7f8bb927e10b
Author: David Seifert  gentoo  org>
AuthorDate: Mon Feb 19 18:17:20 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Feb 19 19:40:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=543adb50

app-text/sword: Always build in C++14 mode

Closes: https://bugs.gentoo.org/618776
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-text/sword/sword-1.7.4-r1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-text/sword/sword-1.7.4-r1.ebuild 
b/app-text/sword/sword-1.7.4-r1.ebuild
index be1fa4a3314..72b16688cc8 100644
--- a/app-text/sword/sword-1.7.4-r1.ebuild
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,10 @@ src_prepare() {
 src_configure() {
# TODO: Why is this here and can we remove it?
strip-flags
+
+   # bug 618776
+   append-cxxflags -std=c++14
+
econf \
$(use_enable static-libs static) \
$(use_enable debug) \

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/

2017-12-06 Thread Michael Palimaka 
commit: 4e029fcdc6e0621a3908482f1ed65c61022e5ad6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Dec  5 17:39:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 11:59:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e029fcd

app-text/sword: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6457

 app-text/sword/files/sword-1.6.2-gcc47.patch | 35 
 1 file changed, 35 deletions(-)

diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch 
b/app-text/sword/files/sword-1.6.2-gcc47.patch
deleted file mode 100644
index 7b55de75b64..000
--- a/app-text/sword/files/sword-1.6.2-gcc47.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/419505
-
-
 a/include/multimapwdef.h
-+++ b/include/multimapwdef.h
-@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap {
- public:
-   typedef std::pair value_type;
-   T& getWithDefault(const Key& k, const T& defaultValue) {
--  if (find(k) == this->end()) {
--  insert(value_type(k, defaultValue));
-+  if (this->find(k) == this->end()) {
-+  this->insert(value_type(k, defaultValue));
-   }
--  return (*(find(k))).second;
-+  return (*(this->find(k))).second;
-   }
- 
-   T& operator[](const Key& k) {
--  if (find(k) == this->end()) {
--  insert(value_type(k, T()));
-+  if (this->find(k) == this->end()) {
-+  this->insert(value_type(k, T()));
-   }
--  return (*(find(k))).second;
-+  return (*(this->find(k))).second;
-   }
-   bool has(const Key& k, const T ) const {
--  typename std::multimap::const_iterator start = 
lower_bound(k);
--  typename std::multimap::const_iterator end = 
upper_bound(k);
-+  typename std::multimap::const_iterator start = 
this->lower_bound(k);
-+  typename std::multimap::const_iterator end = 
this->upper_bound(k);
-   for (; start!=end; start++) {
-   if (start->second == val)
-   return true;

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/

2017-11-14 Thread Chris Reffett 
commit: 35091c0e19d6bb95e53f62349a74af9ba370839c
Author: Chris Reffett  gentoo  org>
AuthorDate: Tue Nov 14 14:03:20 2017 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Tue Nov 14 14:04:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35091c0e

app-text/sword: Fix automagic dep on clucene

Gentoo-Bug: 637398
Package-Manager: Portage-2.3.14, Repoman-2.3.5
RepoMan-Options: --force

 app-text/sword/files/sword-1.7.4-configure.patch   | 23 ++
 app-text/sword/metadata.xml|  3 +++
 .../{sword-1.7.4.ebuild => sword-1.7.4-r1.ebuild}  | 11 +++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app-text/sword/files/sword-1.7.4-configure.patch 
b/app-text/sword/files/sword-1.7.4-configure.patch
new file mode 100644
index 000..a098addcd0d
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-configure.patch
@@ -0,0 +1,23 @@
+--- a/configure
 b/configure
+@@ -16893,7 +16895,7 @@
+ # -
+ 
+ # NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds 
that clucene is not multilib-save and places some include files in /usr/lib[64]/
++if test "x$with_clucene" != "xno"; then
+-with_clucene=no
+ if test "x$CLUCENE2_LIBS" != x; then
+echo "clucene 2.x found - lucene searching options available"
+AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 
-I$libdir"
+@@ -16914,6 +16912,11 @@
+echo "lucene searching options not available"
+ fi
+ fi
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
++$as_echo "clucene manually disabled - excluding support" >&6; }
++with_clucene="no"
++fi
+ 
+ for ac_func in vsnprintf
+ do :

diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index dd852d82e55..fb9230654d3 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -9,4 +9,7 @@ The SWORD Project is the CrossWire Bible Society's free Bible 
software
 project. Its purpose is to create tools that allow programmers and Bible
 societies to write new Bible software more quickly and easily.
 
+
+Use dev-cpp/clucene for lucene search 
support
+
 

diff --git a/app-text/sword/sword-1.7.4.ebuild 
b/app-text/sword/sword-1.7.4-r1.ebuild
similarity index 90%
rename from app-text/sword/sword-1.7.4.ebuild
rename to app-text/sword/sword-1.7.4-r1.ebuild
index 2db87d10461..be1fa4a3314 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic
 
 DESCRIPTION="Library for Bible reading software"
@@ -11,11 +11,12 @@ 
SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="curl debug doc icu static-libs"
+IUSE="clucene curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib
curl? ( net-misc/curl )
icu? ( dev-libs/icu:= )
+   clucene? ( dev-cpp/clucene )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -39,19 +40,21 @@ src_prepare() {
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
+   epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
+   eapply_user
 }
 
 src_configure() {
# TODO: Why is this here and can we remove it?
strip-flags
-
econf \
$(use_enable static-libs static) \
$(use_enable debug) \
--with-zlib \
$(use_with icu) \
--with-conf \
-   $(use_with curl)
+   $(use_with curl) \
+   $(use_with clucene)
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2017-01-10 Thread Chris Reffett 
commit: b94b1722b0aa457f7ec541efa9e4b05334686de6
Author: Chris Reffett  gentoo  org>
AuthorDate: Tue Jan 10 23:05:15 2017 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Tue Jan 10 23:12:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94b1722

app-text/sword: Clean up old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/sword/Manifest   |  3 --
 app-text/sword/sword-1.6.2.ebuild | 78 ---
 app-text/sword/sword-1.7.2.ebuild | 78 ---
 app-text/sword/sword-1.7.3.ebuild | 78 ---
 4 files changed, 237 deletions(-)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 5d59b68..d097893 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,4 +1 @@
-DIST sword-1.6.2.tar.gz 1965427 SHA256 
af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 
3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4
 WHIRLPOOL 
50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
-DIST sword-1.7.2.tar.gz 2127944 SHA256 
ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 
1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe
 WHIRLPOOL 
894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
-DIST sword-1.7.3.tar.gz 2149459 SHA256 
5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 
4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a
 WHIRLPOOL 
a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
 DIST sword-1.7.4.tar.gz 2157882 SHA256 
995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9dc9b313edd9d213d SHA512 
4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 WHIRLPOOL 
a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b

diff --git a/app-text/sword/sword-1.6.2.ebuild 
b/app-text/sword/sword-1.6.2.ebuild
deleted file mode 100644
index d56179b..
--- a/app-text/sword/sword-1.6.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/;
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
-   curl? ( net-misc/curl )
-   icu? ( dev-libs/icu:= )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test"#Restricting for now, see bug 313207
-
-src_prepare() {
-   sed -i \
-   -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
-   -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
-   configure || die
-
-   sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
-   sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
-   cat <<-EOF > "${T}"/${PN}.conf
-   [Install]
-   DataPath=${EPREFIX}/usr/share/${PN}/
-   EOF
-
-   epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_configure() {
-   # TODO: Why is this here and can we remove it?
-   strip-flags
-
-   econf \
-   $(use_enable static-libs static) \
-   $(use_enable debug) \
-   --with-zlib \
-   $(use_with icu) \
-   --with-conf \
-   $(use_with curl)
-}
-
-src_install() {
-   default
-
-   find "${ED}" -name '*.la' -exec rm -f {} +
-
-   if use doc; then
-   rm -rf examples/.cvsignore
-   rm -rf examples/cmdline/.cvsignore
-   rm -rf examples/cmdline/.deps
-   cp -R samples examples "${ED}"/usr/share/doc/${PF}/
-   fi
-
-   insinto /etc
-   doins "${T}"/${PN}.conf
-}
-
-pkg_postinst() {
-   elog "Check out http://www.crosswire.org/sword/modules/;
-   elog "to download modules that you would like to use with SWORD."
-   elog "Follow module installation instructions found on"
-   elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}

diff --git a/app-text/sword/sword-1.7.2.ebuild 
b/app-text/sword/sword-1.7.2.ebuild
deleted file mode 100644
index 07ab6f0..
--- a/app-text/sword/sword-1.7.2.ebuild
+++ /dev/null
@@ -1,78

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2017-01-10 Thread Agostino Sarubbo 
commit: 7957f4c371a87a2dec688099dbcb4b3f85e1bedb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 10 14:55:01 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 10 14:55:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7957f4c3

app-text/sword: amd64 stable wrt bug #605142

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/sword/sword-1.7.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sword/sword-1.7.4.ebuild 
b/app-text/sword/sword-1.7.4.ebuild
index 3943b6f..c6014e0 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
 IUSE="curl debug doc icu static-libs"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/

2016-10-24 Thread Chris Reffett 
commit: ea26c138a5a7b151457852959532d6ddac9f0945
Author: Chris Reffett  gentoo  org>
AuthorDate: Tue Oct 25 00:42:52 2016 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Tue Oct 25 00:43:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea26c138

app-text/sword: Add patch for building with GCC 6

Gentoo-Bug: 593818

Package-Manager: portage-2.3.2

 app-text/sword/files/sword-1.7.4-gcc6.patch | 22 ++
 app-text/sword/sword-1.7.4.ebuild   |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch 
b/app-text/sword/files/sword-1.7.4-gcc6.patch
new file mode 100644
index ..54c7967
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-gcc6.patch
@@ -0,0 +1,22 @@
+--- sword-1.7.4/configure.ac.old   2016-09-21 18:04:55.029088352 -0400
 sword-1.7.4/configure.ac   2016-09-21 18:05:37.870349308 -0400
+@@ -197,7 +197,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
+--- sword-1.7.4/configure.old  2016-09-21 18:05:05.98373 -0400
 sword-1.7.4/configure  2016-09-21 18:06:03.822112657 -0400
+@@ -16793,7 +16793,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"

diff --git a/app-text/sword/sword-1.7.4.ebuild 
b/app-text/sword/sword-1.7.4.ebuild
index 1567283..3943b6f 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,6 +39,7 @@ src_prepare() {
[Install]
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
+   epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-text/sword/

2015-12-28 Thread Chris Reffett 
commit: cec0fab2a8cb74462bc0208cf722672fe6bb5575
Author: Chris Reffett  gentoo  org>
AuthorDate: Mon Dec 28 21:43:01 2015 +
Commit: Chris Reffett  gentoo  org>
CommitDate: Mon Dec 28 21:44:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec0fab2

app-text/sword: Version bump

Package-Manager: portage-2.2.26

 app-text/sword/Manifest   |  1 +
 app-text/sword/sword-1.7.4.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b8141c6..5d59b68 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,3 +1,4 @@
 DIST sword-1.6.2.tar.gz 1965427 SHA256 
af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 
3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4
 WHIRLPOOL 
50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
 DIST sword-1.7.2.tar.gz 2127944 SHA256 
ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 
1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe
 WHIRLPOOL 
894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
 DIST sword-1.7.3.tar.gz 2149459 SHA256 
5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 
4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a
 WHIRLPOOL 
a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
+DIST sword-1.7.4.tar.gz 2157882 SHA256 
995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9dc9b313edd9d213d SHA512 
4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 WHIRLPOOL 
a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b

diff --git a/app-text/sword/sword-1.7.4.ebuild 
b/app-text/sword/sword-1.7.4.ebuild
new file mode 100644
index 000..1567283
--- /dev/null
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/;
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+   curl? ( net-misc/curl )
+   icu? ( dev-libs/icu:= )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"#Restricting for now, see bug 313207
+
+src_prepare() {
+   sed -i \
+   -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+   -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+   configure || die
+
+   sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+   sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+   cat <<-EOF > "${T}"/${PN}.conf
+   [Install]
+   DataPath=${EPREFIX}/usr/share/${PN}/
+   EOF
+}
+
+src_configure() {
+   # TODO: Why is this here and can we remove it?
+   strip-flags
+
+   econf \
+   $(use_enable static-libs static) \
+   $(use_enable debug) \
+   --with-zlib \
+   $(use_with icu) \
+   --with-conf \
+   $(use_with curl)
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -exec rm -f {} +
+
+   if use doc; then
+   rm -rf examples/.cvsignore
+   rm -rf examples/cmdline/.cvsignore
+   rm -rf examples/cmdline/.deps
+   cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+   fi
+
+   insinto /etc
+   doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+   elog "Check out http://www.crosswire.org/sword/modules/;
+   elog "to download modules that you would like to use with SWORD."
+   elog "Follow module installation instructions found on"
+   elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}