Version bump wrt bug 500218

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

6 files changed, 166 insertions, 22 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 7aeb7c9a7624..183d409dd229 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/bibletime
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.69 2013/03/02 19:40:22 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.70 2014/02/03 23:57:03 creffett Exp $
+
+*bibletime-2.10.0 (03 Feb 2014)
+
+  03 Feb 2014; Chris Reffett <creffett@gentoo.org> +bibletime-2.10.0.ebuild:
+  Version bump wrt bug 500218
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> bibletime-2.9.1.ebuild:
   Move Qt dependencies to the new category
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 52d33e02472c..b5ad83be1678 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST bibletime-2.10.0.tar.xz 3252312 SHA256 89763b17e91b6fe8a791c69d9357bcaf548abb7c1007a1c47efd834a2ec9f1fc SHA512 7c3e7a60d0d8bdcfab4f90eefd9b1dcff5b57c35e4a7224b2eec094a0bf9b9ca9757d9b37317689e4cf0283a132a274ec81a3ba5fea0feb6dd2735e2378c3098 WHIRLPOOL f342e21223cc911f8c80de9a8ecd521aa38a8aeee08238522a389f28a02d3c71580e2ebc9642a042607fbb8219344ddc9c29cacf6f9ef4df1dd78dc379224699
 DIST bibletime-2.9.1.tar.bz2 5968979 SHA256 308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5 SHA512 6099e48fc3d54cb8362ec1a3965b372e60fd136d036dfd8d94b5e443ee5f27eb092162b653160bfc71d5366f79af35e22ee40d64ecd681f184bc4e90c1cd9e0a WHIRLPOOL 0677646ce099297321c4a519364b41254544f6d8660d72f9e76b6a8eafd08205915f40aef5bbc6463199ca0d272e28b926b13b0637ecdef1bc822256363cecf2
+EBUILD bibletime-2.10.0.ebuild 1099 SHA256 ca525e5e2160dd4c81689f53ede437b5952267c92ffece83153240d523fc45f5 SHA512 7ac4bd78afbc0d568ffbc718e71ea9e679ea1febdd2fbda7b1199fb41fd8c1c2948195e843749933a548444939bb04f821d51f91e3341f2f463d2beafce81eb4 WHIRLPOOL 37c4a5c06972ea69e770a4cdcfbbf5520bb60835689a4cbaf04dfa41175b024cec76e0990025018bcab9d828b3fdd9011be755b5d38a09fff02222274798ff4e
 EBUILD bibletime-2.9.1.ebuild 1094 SHA256 2eed2e32b4b145cca869e7ceef3bf7b6f62cd9f3d128468e2e525bc01c53dd12 SHA512 219dc2de50634eb4c5107b84f98180290cf5b91b3df664a210f179b3c292667bd2a3aa28cd42727cecfc4a881476fab4fed82e79daf79a9238ec04ed1733c0b3 WHIRLPOOL 9895cb995cab7e727b3dea1f2c7251ccb3fa46c7012c02fec0a8f8bf3b4fc971d59005307cf45da3a0ac72933441ec5414b9e404b1af69ab66bf274adb031f7d
-MISC ChangeLog 9295 SHA256 a95ced4aa8956380425aa792986902bfaea73289a35ef4695ef4dcb8ac99d83d SHA512 7ecf6f49040e89421e60c70c05a8028f63fe37c2d506e1883c358b754b8d5089fb79a2df18ce1091dbcfb82251dc1c91807c96d8dd6d504cd36ea3aec21ca069 WHIRLPOOL a5a38c5488a4952555417659004f1d2cadadec861e12936deffbc32494c0cd0056ac7ea3491594e1ec48ef31dd51bd71264f95e90d7b34c8f4d74b0be9b42014
+MISC ChangeLog 9436 SHA256 e0f3746d430bf85e95f7f4f6d4b10cc2441d40f7eb341b26f8af8d687ee3d82b SHA512 f3fd89e78bdab4dcd1cbdfad25813abc171761671875b234c025f18e902d463e2caa127c0af97562969c7c520b4e6fd8e88ef7b6c2dc24473d43b9da007741fd WHIRLPOOL 733869f55d94ef1bfece279a2fda20fa486326fc0bbf6cd6e715fa2b8a4947797c9b8c4b52c4224f64530663dbe18760a19d5c72c00e6cb4c1f961fe967cbc8c
 MISC metadata.xml 436 SHA256 d59c32394540212a4cb547af0ffa112a9d6f0d4bc9dfacaeda9395c518d88141 SHA512 0d693ba775b318a49d8b6e7c87120e46c9372321c663d68f9e35f68b14ba57d82d6738bbb39bf27e2b46292d051828df5b0429d794fdf1beb92770b19fb92d0a WHIRLPOOL ce5e55cc7ecfdcb03e13a901a1c816081ac82724381f1bc000e1b11e58f1759def388aa6994bebd53b4ce01417e769e1b29c1e98ae3ccb54506cd98969a4a106
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlWlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88okcQANIVQFl7f21fuF/SY30Pyyxw
-gVWsZ3S8TdEHlDzqDX17m0qxMbgL57EHxuhpGgVSvb+OIkb3ijYN7D/7BBKxAxoF
-Cd2EDujPHstBXC2xIO9rfaVv5B/HVaSzfBIXGyCaw3H1RHC1fZodS3NMTn1NkVrh
-ze/xR/133KnoR9Zv+xGxT3iOwWl2gpDSQSCoWVMo9eSJy3byokFPgWoXGiMQuk3L
-uGCR0FKkFllf2LZABYpX1S4oESA+3A+mqwLGVagaXjU1aOGiXx4o2udznhMLOOYP
-bzqdooJUM4Er0PrgTrvWCjAL5Vi0i0LWQ491aMC3PmOH7ZwXGhVot1VX0Gy8HitA
-l6hmOlnsTyBOK4t4QSIyU9RUeq2Cn8TJ9npX+OTRrLXsNuVZ3PwLkGBk2MlGMQfk
-HjueZkmdi0ssHfrJXA2SkUTzxYwoDUevRuKxaIAt+FNAwkSD1ddRn2jPQ/RuoFPi
-5tOnauEeynaCCn5/zg2Yud6xl94Vc2ZbII3GGy2zV2+sgN5UFRNM0pxYAA1ITiHl
-7/rPusngSYF1Gy2mlwg0IjV2L+Yx7rTtoO3W7E4zBKkcs68L+XGYXpcNPYAlOaGJ
-bWaFMUB+KlFojfSUvI7MiulUMwHQu057nSS+H1sTnr+aQkHZ+J5qkzSr3Q2u+jZ0
-lXj5yr8mhwxEmXHf1jqt
-=C5DZ
+iKYEAREIAGYFAlLwLM1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1S6QgCgoQ0c0smvU8xSFprxeOIVbw27
+9DgAnivlYcpDDwCjSPI8RF0hM4D+7BW1
+=YaEB
 -----END PGP SIGNATURE-----
diff --git a/app-text/bibletime/bibletime-2.10.0.ebuild b/app-text/bibletime/bibletime-2.10.0.ebuild
new file mode 100644
index 000000000000..f30f871c4b22
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.0.ebuild,v 1.1 2014/02/03 23:57:03 creffett Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt4 Bible study application using the SWORD library."
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+# bug 313657
+# RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.6.0
+	>=dev-cpp/clucene-2.3.3.4
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qttest:4
+"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt;:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_WEBKIT=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index 83969a417dad..77be08405e8a 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sword
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.70 2013/05/23 14:20:33 creffett Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.71 2014/02/03 23:56:26 creffett Exp $
+
+*sword-1.7.2 (03 Feb 2014)
+
+  03 Feb 2014; Chris Reffett <creffett@gentoo.org> +sword-1.7.2.ebuild:
+  Version bump wrt bug 500218
 
   23 May 2013; Chris Reffett <creffett@gentoo.org> sword-1.6.2.ebuild:
   Restricting tests wrt bug 313207
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index f5a657aef986..7ac5288426d4 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2
 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
 EBUILD sword-1.6.2.ebuild 1910 SHA256 34ba7502fabdacc2d53567bf2c2b607defc4f6f4ec57b47a414bad04a25ab893 SHA512 c80c43229c2f20baaedbc8a82c06086af536c4c5551b5e86be58f64c59a66c871627c6d429220a79ed16f9b92eb5e649a40db07d2a33b4c66f7f26a2416e3b1d WHIRLPOOL b44231c43308239e84b8f6c9db01614ac2caa9e9b60278e29043e592a0bc400c302a1a0319785edf87e7bc3abac4bb8661cf676fbcade243f9c36ab38444ee1a
-MISC ChangeLog 9533 SHA256 8130b97da7389acb6ac1edaa9c9827e31c4ca8322761b3ce9e58be04c4dfdd90 SHA512 406bb0e50b5b55951cbfa284fb31e89e0b36751e70ca5773d2cac3cb70ee508c4eba203af3871eef5b77519db0a34b937a5efd8a1b3e79f3039d8e53c8c8430a WHIRLPOOL 0cbb9a601daa0bb94149dfa371aa6424a4631122aedb348555ad15e7b014e370209558e3ae88099acb91f8517eafcbf93b0d44a23e540a32a0bca49bd6fa9d8a
+EBUILD sword-1.7.2.ebuild 1874 SHA256 87a1d20f0e419ab676913e37b384273af7b9af0de8db42e8b23bfadb0480921d SHA512 c98e64f6894b58b9993f47a049a7a12b30f578fb121c648ff0802c34220664ab30c3629e21d792d313d6bbad8dc7f6447ea7325fc5808fea7885b84a0695e40f WHIRLPOOL 5eaaff991dd8acdc89204d46b93e4cdde9756dc05a36fc439068f7f495580e34b1c1fccd74cef913f4419c6a8767133c19e3fe1ab0536145542b1e68576f76b6
+MISC ChangeLog 9664 SHA256 aad6e8a922a530d3887b2328d7c02d6abba579bde0ecd5b765d5e3b4211486ba SHA512 0534b07ffbad9507ca8abfc05db3a92c43a3756f6f9ca16220f9b558189f7d9e236c5053b747b333d13a241fa1f4eacc29896f68171512c9e2c3b3c5c4bc451f WHIRLPOOL 78d7c5883d66bc93af4406c9364d89fae1898989b0f4138c91ce61d85e4a6143b2e37cfa1c9ff257b14e33fb916492c999044a6469865fdeaff49049c60d5ae0
 MISC metadata.xml 469 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789 SHA512 73c8f05759ff7ca4a6a275d7fbab7d0c120764a3cbfec4829fc1137438cdd8b38ba607b23efdd10de35c547cd938e8dc14b1551110957f9d4dc0e7bc822266cc WHIRLPOOL 3eac7eb0f3087a133b7fad4eae01bd0a5b4413cb60d56bbeac9b2207a9eeaab01ddae231a06ed5e02c33563813dc05d9e1d43e933f524c7efd45dccc9a917a48
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iKYEAREIAGYFAlLwLLJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1RgnACfXPpihvQH0qrrbJ2UWUDipVlE
+zBMAn14pEFwulgkhMtsZ3wJpKFs584T5
+=DlyJ
+-----END PGP SIGNATURE-----
diff --git a/app-text/sword/sword-1.7.2.ebuild b/app-text/sword/sword-1.7.2.ebuild
new file mode 100644
index 000000000000..bb9c13d5f5de
--- /dev/null
+++ b/app-text/sword/sword-1.7.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.7.2.ebuild,v 1.1 2014/02/03 23:56:26 creffett Exp $
+
+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}/"
+}