gentoo resync : 31.12.2017 (final resync this year)

13 files changed, 130 insertions, 188 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index df7531264bfd..6c8af4fe4ca6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 06b6199f7db5..90a8a46eca4b 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,5 @@
 AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
 AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
 DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
-EBUILD coolreader-3.1.2.71-r2.ebuild 1769 BLAKE2B da957458ea637448ecafb9966b41b123923eca91a11dca91e8119172198e40ecca163471bd645d57499dc90aa4fb44542b92afab2e787d4a615efa11ec9fd66a SHA512 ba1db10c44e2cd8ad697596264d041c3eafad8ea82fda1878ac6077696e928b3e2b3ac335f63878d7849ffbecd66ff5a220f64e3425315c5f1520176c842d0bb
-MISC metadata.xml 528 BLAKE2B ab49d8fb15bc3d716c5f027a3d1615963f68745dfd9d30a072b4211693d1a7bd78ba74a649435c03824ade40ce9db8018a3995e691543cbbe21fb172ac8db33b SHA512 7cca7abbe95fc510c91f0c3b4db45257b00dd5497c1f978e398d4e5a7dcd8238e9056b4980eaa9e4cbd97cda9b5781186f87301df17383b051a876d0974cbf8f
+EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365
+MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
index afcc1ac458be..9c7e43e5f3f1 100644
--- a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
+++ b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+WX_GTK_VER="3.0"
 
-inherit cmake-utils
+inherit cmake-utils wxwidgets
 
 if [ "${PV}" == 9999 ]
 then
@@ -30,7 +31,7 @@ DEPEND="sys-libs/zlib
 	media-libs/libpng:0
 	virtual/jpeg:0
 	media-libs/freetype
-	wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
 	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
 RDEPEND="${DEPEND}
 	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
@@ -48,10 +49,7 @@ src_configure() {
 	CMAKE_USE_DIR="${S}"
 	CMAKE_BUILD_TYPE="Release"
 	if use wxwidgets; then
-		. "${ROOT}/var/lib/wxwidgets/current"
-		if [[ "${WXCONFIG}" -eq "none" ]]; then
-		   	die "The wxGTK profile should be selected!"
-		fi
+		setup-wxwidgets
 		local mycmakeargs=(-D GUI=WX)
 	else
 		local mycmakeargs=(-D GUI=QT5)
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index afd1b4bc9da9..0bc14087cc2d 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -8,6 +8,9 @@
     A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices.
     Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI.
   </longdescription>
+  <use>
+    <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
+  </use>
   <upstream>
     <remote-id type="sourceforge">crengine</remote-id>
   </upstream>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 823302c596f3..017ad5ba351a 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -4,10 +4,12 @@ DIST dvisvgm-2.2.1.tar.gz 2841744 BLAKE2B a9221bd927544249a30262f1916a1323efd3e5
 DIST dvisvgm-2.2.2.tar.gz 2848315 BLAKE2B 157237fcd7e61a9cf7978f3b595d1ac5fa7765dc1615721dc9812a27e26b20f077aa46535fc19f9fee28bc5714467f6176df6ab1ca094be2299d77ae4542a103 SHA512 e15384b4842a9c6963110b96b611f4f4beff301818972ef0aa77590b7aefdb488c3df16f93a5b786c97229df730c112db97770b612786fdff9011b5a2808d917
 DIST dvisvgm-2.2.3.tar.gz 2813537 BLAKE2B 0cc2625c779d22dceef8b26c0e977086601f246beed5610f722e2efe59ca617b29f27bf5de87c7b1aaf2b87ddb3320ede9852b39bd8633ca13594752e62869f0 SHA512 b3d17f13496a371914baa0a498e845b5c52dd74bf3d54cbd86fc91977f786d148f34145fee53272029ddf7507e468c827a41ef48ba2fb02212448858e868ad03
 DIST dvisvgm-2.2.tar.gz 2841354 BLAKE2B 713257347b258338b8ebf408ee6affddef4a53b51621496cb64638e295a27f90ea03f6d752b692f609429f1e5220363f866e4bbff3e82de1f4a03494ded3052e SHA512 310b3272f41d3378ddfb5663d4b6906f7b1cd1dfbbcff0ad249b27c5c37290c5eb496ec84a536f3166a51de4708f6069da9c6811bb7fc9e667d00b1c3aaafd53
+DIST dvisvgm-2.3.tar.gz 2816291 BLAKE2B 3c804b49d9a5447063cd70646d0c6bdb56bf7f457aa84a4ef535341e2b5b9bea2b3dbb3209c3afebb5ebaea04300b5784b25ed244145a1afd6a8a4974326c914 SHA512 b1efc505db2c52471306eca099285c35685cf92d0f084a46daa476423d3706a2a3260584f9fdcc5722630a49b4178c9bd36d6cd8019a5b4c9f3759468e8e8313
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1145 BLAKE2B e82da95f1e0ef36b946ed42c5ce02a2aa3ab6e30bb81d01ea6d59a664d524944dbdabcb4562cfefb5bb4d1c9b4f79dcae6405bf5b708a59a7c603914c882199b SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b
 EBUILD dvisvgm-2.2.1.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.3.ebuild 1185 BLAKE2B 0ae97decf87076b5faaefa67c17c01ddfc4e6811550d3dbbe3b25af423ab53a66c6035391ed59b3eed6e323ebff89eafaa5679b931077dad57deda3743941144 SHA512 af5c91311b75be4c344d94748c650ebc317db6e7ca961f0d4dd834f817870623ec2302ade85cb1f9e9597d4799eff2e7c40f5dd61b9ecafe95153047f4ac7443
 EBUILD dvisvgm-2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
+EBUILD dvisvgm-2.3.ebuild 1159 BLAKE2B 30ef40ab739050535e3741719be165a3342c9524a3384c9482e9381782fd22bdfd843e5010f2569466e11ed679405b1bb6ab3d2a910d390916cd7d0b648509ac SHA512 0ff07d7e87ef3bc17ff1883ac3fae3292b4232c441e04e0ffbf575ed729574896328a47055485a777209c9a637a0d3469c697bf8e4f7c044539ef6c6b72fce44
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.3.ebuild b/app-text/dvisvgm/dvisvgm-2.3.ebuild
new file mode 100644
index 000000000000..83e11b6eb230
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 69e086e47d2e..c4ba1a8cfc31 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
+DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
 EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
+EBUILD htmlmin-0.1.12.ebuild 510 BLAKE2B 7fbcff6d9ba90ef0b0fb54cfb2193dd6af3df6a48fb26770fe4a3c7a7fe760052359e06210156c46523f70efcc05ef4934bd96abed2e53cb11010b006d27f648 SHA512 7161bd303a555e2d70dda490d5c5ced5c2b43891c4455767736ae69d8790a90dceb75312c3c0fea7ab59a070b7ab9bc98a55213ebbe51c37e4f369f2e609fb7e
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
new file mode 100644
index 000000000000..3f036caef84b
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed '/prune/d' -i MANIFEST.in
+	default
+}
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index fa94b790b324..30bca1ff1f3d 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,3 +1,5 @@
+DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
 DIST pdf2htmlEX-0.14.6.tgz 8955179 BLAKE2B 68a474a0afce7e505af0331c7a05e745d0c18057c0e9dab0f57f8455b36489c399985d2f69cbebc2c3df3264ee1eef43346df49ff9ac3fae7edd3bbff884c6d2 SHA512 0bef898653755da3d731a99f2850d11a686a1db589c615216c84dcac76f3a3c41f561732fe37be262cfec3f65970b2704819c3bd4d94d87cd63d26f062dacf50
+EBUILD pdf2htmlEX-0.14.6.2.ebuild 979 BLAKE2B d91ed9b11885a230ed270e5b6d607f3ee46a622ccb9486fc00bda81b58c5555c4ba34eb8852bde4e5e0953aa301fe6a9f2ccf9e22db5ab276d1134ff52bb5622 SHA512 01a3ce13e12befe178c77253dac2787fac6aee446c93a0dd3bb6b35fb2d53b9e83b35814229d260f2be6ac24012ce2bcb16f88889db06625fe182f1608f94dca
 EBUILD pdf2htmlEX-0.14.6.ebuild 559 BLAKE2B fc566297c6a7fd57a4bb36f74ceccac62dfaa3a0d3b18469420171b92cddfecccd418dd9d8a8e3a5eff35d7504f50b84cb026764c28ed3d9ca38fe0be248dfd0 SHA512 a903ef5c199c68c8eb5243dd1abcedf0bbad5d7b13132ada1affc18a635e27ca1f52b075c2221dd67e5a5a69fbc85d2ab1a1a0fcbf0398e91bb705b3343f0a60
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
new file mode 100644
index 000000000000..384d67d85f05
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A precise PDF to HTML converter"
+HOMEPAGE="http://coolwanglu.github.io/pdf2htmlEX/"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz
+"
+#	https://github.com/coolwanglu/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+CDEPEND="
+	>=app-text/poppler-0.61.1:=[jpeg,png]
+	app-text/poppler-data
+	~media-gfx/fontforge-20170731
+	media-libs/freetype
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	local ver=6.4.0
+	local msg="${P} needs at least GCC ${ver} set to compile."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			die ${msg}
+		fi
+	fi
+}
+
+src_configure() {
+	append-cflags -no-pie
+	append-cxxflags -no-pie
+	cmake-utils_src_configure
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index fc8d20639325..6b0be365379a 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,3 @@
-DIST xiphos-4.0.4-20150830.tar.gz 8040173 BLAKE2B d70641d1ead8bde745fe64a758df2f441bf38e1c1b55ea78eecfb60cbb9d7e41c120c87fb4cade81ed17e2f3530b9dcc04ebe7150aca5faea5bf5a47b991a6c9 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
-EBUILD xiphos-4.0.4-r1.ebuild 1997 BLAKE2B 112e9fc41bc71fffa20e028a29cff313a143167e06aaf0e081d7217578ee9d10711c015013030390fce804750e41fb718f0beaef29181f616ee70cbdb4aa7227 SHA512 7f567d2a98ebc2b0804a30672cad38c715bb8eaf455773a41a291bb1ab45d0416bdbd0d2c92fcb34a303c104087cce757f417492d4734c06f014b3f9208a334c
-EBUILD xiphos-4.0.4.ebuild 1974 BLAKE2B 133c2f68c34faf7955225203f58c1dd1cbfc5d01128bfac51ec65cc1884a0ea32d2bc1eabcf65d71349077fef361be693da17e4ec4136cd54683907c5cd399ce SHA512 3d8c9effc1d70ec378c886c29cc8134ef62272f046a2ad4fbd3bddb95a01a6206f86047be32337f37c40fe4ebbce0ec87d2ca8e8ab8b998135af2d4a5fae37b9
 EBUILD xiphos-4.0.6a.ebuild 2045 BLAKE2B 02426203620395f5a64438b0a7f97f41224a454fb8fcab01b61a6bb607bdda89ab0f47a1e4d44372db100abc8b8f28f0aa24dcff6cdb71f8e98412a589747d7d SHA512 e33b0410713e889a93febe02576e6a8213243be185c66b3b947fb0e7dc48c76178a05dc3e031f81bccf89668f9feb64f9db45fd59babaf263576ac58c3d85000
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.4-r1.ebuild b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
deleted file mode 100644
index a68d218a8e36..000000000000
--- a/app-text/xiphos/xiphos-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
deleted file mode 100644
index 12931a93f012..000000000000
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }