Version bump wrt bug 525426

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x28DB029C

3 files changed, 103 insertions, 6 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index f643768ad37b..e28914519a07 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sword
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.72 2014/08/10 18:34:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.73 2014/10/14 18:37:32 creffett Exp $
+
+*sword-1.7.3 (14 Oct 2014)
+
+  14 Oct 2014; Chris Reffett <creffett@gentoo.org> +sword-1.7.3.ebuild:
+  Version bump wrt bug 525426
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> sword-1.6.2.ebuild,
   sword-1.7.2.ebuild:
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 6c3947572eae..6e02b3939b7a 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -4,14 +4,28 @@ 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
+DIST sword-1.7.3.tar.gz 2149459 SHA256 5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a WHIRLPOOL a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
 EBUILD sword-1.6.2.ebuild 1907 SHA256 586eda6734c6325265c843d7752ad1a32d98bb2403bfdce26be44a7591336220 SHA512 a804b2eeeffe4d6ba77eaf3308cb490e72939787c5d3719791503fe738bd821349ff3efc837064821146a0f0b84abdd51b05aa8b34aa4cad5af49fb72a74e5c5 WHIRLPOOL 6d55dd36ad9ddcb8ab49deb3adf317fc75fa0522f1230700e140806e64f33776f157f88977a17f5f65c0766398d3ef7aeef42e1707a12c72b03e5ae5674a70bb
 EBUILD sword-1.7.2.ebuild 1871 SHA256 e591706581541fbda89afecfe3c9d2a813e6d26081b7d94973187b6724666075 SHA512 80a295252fa9eb94f3abb87556db9c8ba5fb7bed007c12b100ebeb4e51739dd2962a46a015a25fa793e4e933aabb626dbdb57473df8451b33187c9ea36089646 WHIRLPOOL 9ff114a4fca08b135f2b2a2e49834917b6400283398b0e5d8ddf9e5de8245dcae1a624115cc3b2313431a1df13481d693074c4b3f2acbb1ffc35b41598fdffbf
-MISC ChangeLog 9800 SHA256 99ef2b4bc70dbb2b7f8e5115d8efbc833ec6452809014335ea0bcef6d4f93914 SHA512 479124921f508136f93c29d09139f7748a66095b0f636e6b8463f1664ccff6174b65036c745dd320429b4e36b68b65dd3e22482ceda4ad0df9b389635f93639d WHIRLPOOL 524e89630f62950047af19aa29472f0a638fa6d9e04beacb15acadc2af02d4eaafb14f8a686031c99d14b815ae117a7f6bacb1c4578ca5b696ac859dfcd88875
+EBUILD sword-1.7.3.ebuild 1873 SHA256 46f0b8205b05593546a0a8c979f2de34e7a3b8d9157071ce9781938f3253c2be SHA512 2ed3a5b81d2030b5e5c5b4cc7f539ad4c8c595722ccd90250ad85aa6105ea047d37d9355fc48bc16aa0aac887103be19273cf9c6c5847ceb50dd2b2cea0dc4bf WHIRLPOOL 8d52cb8f92085242456a4e95c5a36442b1970bf2627b17fef5e0f842dd7b1727e64c0f17a2f17558541e8a95efa14a5998bb730678d9936d94a240e321e25757
+MISC ChangeLog 9933 SHA256 44e85bc622ecf64881d56dcb7eaaea593f1d079f01985e8e2fd05c6f9fa673af SHA512 faa409e310dc4b2ee42426c0333f9b6b807ea7f47977ad4aaf3a2a4da82a5eae88448552232b2f3c2f9496ef48443d9ad18bc120adf80da9d97c22283dc8e62a WHIRLPOOL eb04fc90cd1784136b448d22b9c05aaf19a13ac61c7e66a6580e6c4e7adcbccbf4f85fa1bd2f375346789690af628baa0901de4f67fecb4dff1d634cf3152487
 MISC metadata.xml 469 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789 SHA512 73c8f05759ff7ca4a6a275d7fbab7d0c120764a3cbfec4829fc1137438cdd8b38ba607b23efdd10de35c547cd938e8dc14b1551110957f9d4dc0e7bc822266cc WHIRLPOOL 3eac7eb0f3087a133b7fad4eae01bd0a5b4413cb60d56bbeac9b2207a9eeaab01ddae231a06ed5e02c33563813dc05d9e1d43e933f524c7efd45dccc9a917a48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPnu0wACgkQcaHudmEf86ol8wCfbo+PIUGxI7XxpVCNVh9spfsV
-1p4AnivezujGuxRLstOQnFfNDzw1QfAb
-=crZb
+iQJ8BAEBCABmBQJUPW1yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
+MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcRZYP/A7g1zLYZ5IDSVqfvb2Uk5R3
+iJ2hnmebD15DHzlkv7c0J0tlYr9lTCrEaAJyZ3YC+JHzck5HQD66nsIiVRX7r5+R
+LOJFlbxo43JHKBCF3WUkeONZ9NJl9Umu8gdedDd4glCdQaoko6owFpw+zO0EGdNe
+zOsi6pQwT9ZL2hCbfsoOFBn8cnRe3uMOEayH8H680VdRp15EptzxdS5bNZXIR+1o
+fVLfus3c8aJPHqnxxiMBJeGAwECWbzeDm0GndpK5blive2obNXPD9D0JlR9GVmLq
++Oho9liEF9YHiU19Lp37RD6mwMzgg2Y8WEPuwq0xAJxz9OeeVIewJ6P7pFMw+Zrz
+EoLJDADOa55zpik6mZYccZi2o0FUMXwdxuojTw4VCrpm8afa/r0df7ttDIesLxDt
+FeylhWY8YWA2iycrt5xHltK8eO3Kj8GHa7uuo/jvq2bWgobeT6sx9kiC4VqceCM9
+sjTZZ9uKxl+6T8xan4ZjNOrvnaqemAgJHbZm8dkEavaZArhovccr6WK2dh5leeP1
+NmhWAp+QcJD5/JJjwJ6uVSgRi0Umdbd0HjV2uZNMOsrVGUjCNx+qA0XeZlAXs6qB
+hp81JcMq+7MpNMhptEZkXuqwu2J2fd7vENJP8PnZtJTcCgqhcWiLD1xsbGklL56I
+mpgTn3i8jDIjIkgeUttG
+=7dyx
 -----END PGP SIGNATURE-----
diff --git a/app-text/sword/sword-1.7.3.ebuild b/app-text/sword/sword-1.7.3.ebuild
new file mode 100644
index 000000000000..6355fa05fc9b
--- /dev/null
+++ b/app-text/sword/sword-1.7.3.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.3.ebuild,v 1.1 2014/10/14 18:37:32 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}/"
+}