gentoo resync : 25.08.2020

5 files changed, 14 insertions, 123 deletions

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 5859a055f208..a95adde22dfb 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,8 +1,5 @@
 AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
-AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04
 AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d414424fc3ca7618a098d6e3ee82c440eb95c3370eeb0dbe46a4abe7ccc0c62e7b725cfed0f8ec0951e11099627337 SHA512 7bd545014ea81fa5f6203d39fd1a4125ae163ac51fe76270511b1df65d4dbf44b912fbaf3fa6a6d6a20370efc3abfff9feabe5de7177981ce1b62f4d9c5ce49d
-DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
-EBUILD sword-1.7.4-r1.ebuild 1964 BLAKE2B fd911784f0d72c29f0a1fbdaf5df45594ba95428d654e65f8b9f3d88752ac7c651ff7b00441b90db1917141f962b022e33e8ef92e6d9a6c2ba5f0068629926f7 SHA512 a0a1698b1160feac54e444f951b60c661823ee25652ad4f219074b71a6d01f8f90ca03f381988e734849a28d45400c8e7fbbfc0ee8442393ba2a3225a2c0450b
-EBUILD sword-1.8.1-r1.ebuild 1816 BLAKE2B fb8a0b982e10ef201181308adc42fd235dce26c4bfbfa87e4ae3870373bc50116feac875d30e688178d174a727886175ec6cbc26307da152eebb220cdc454cea SHA512 070f6efa7131ec2559826431c926be8630d862f584280c5aa09d5ae942bf6e189443bf144f759aa6e95adf5db046a772bb69386685ad3248c6aed5a467a5d199
-MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
+EBUILD sword-1.8.1-r1.ebuild 1818 BLAKE2B bfb01f3537feccb057fd34fc0784af7ea955164e2b6f195ad10f85f0a5759ba14e3626895d11f4ed31f43ecb3c0d479330c75bbf9e5622b522827390f76c72d4 SHA512 05577095fb4cede4cb549dc18af636937523bf6089fa70e0c73b91464799e2eb134ab0179c293fa5ec2acb5ee8e328fd5c3e19aef5b298abb2757d15841f2cf4
+MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
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 54c79671235e..000000000000
--- 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.900008373 -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/metadata.xml b/app-text/sword/metadata.xml
index fb9230654d3a..760864b569c2 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>theology@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
 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.
-</longdescription>
-<use>
-    <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+	</use>
 </pkgmetadata>
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 99a6880de9ce..000000000000
--- 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}/"
-}
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
index acafbb4e5311..7da3c1961d47 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"