reinit the tree, so we can have metadata

5 files changed, 154 insertions, 0 deletions

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
new file mode 100644
index 000000000000..7936bed4147d
--- /dev/null
+++ b/app-text/sword/Manifest
@@ -0,0 +1,7 @@
+AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2
+AUX sword-1.7.4-gcc6.patch 626 SHA256 c783f0cc82aad0b2523520f6f1c4681d072814357f991c97eaed30ae8bf27633 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04 WHIRLPOOL bfb3eb02865fe05e37230efcd04a07a49f11867ce7f1ca3001a71388e1f0516e9e3bb8d333f9acd904749ac26806e5a016cdece40183836ddd98449024b1e85c
+DIST sword-1.7.4.tar.gz 2157882 SHA256 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 WHIRLPOOL a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b
+EBUILD sword-1.7.4.ebuild 1806 SHA256 32c41c7ea310e9fe38c35edc98d3f2f253bb6ab67099b4df08c5b1eec1f04bfc SHA512 63e09d9cc09d52a46a53e16ecd465dc14d14089f2167c793d62b9e4fd2dd3a89db9410081abcda4a86c00e639de5566695c5ca8440aceecabc6e07f9bdb074d7 WHIRLPOOL f5d72be286c4ee93139f6bb2e3aefc34cb5b4ebe71a1235d5e8b966b211e89e37385965df91d2e3f18bc48a58529b148bfb818e51fad6add14b8b94c6108432f
+MISC ChangeLog 2899 SHA256 c9011d88f56f86d89f5926d322e0fe842e56dd696e170a5988d9ab1a156c176c SHA512 b644b5f463d06f21d5c020c2745337eb6ea4eaa96f4d61f525e3a7cbbfb2d9e7d7a03228dcfad1e169b1f5a04bb3336bcf9912f6da53dc1b760a4a501e05d6b4 WHIRLPOOL 6dae9178f384d86dd4b540d27ecd8ea25d66515ebc26c5fd480e728d59241c941ff2e064a931ab9a7e555c87d1e6c979336c39a44235573fc8892fb0f1f25718
+MISC ChangeLog-2015 9933 SHA256 44e85bc622ecf64881d56dcb7eaaea593f1d079f01985e8e2fd05c6f9fa673af SHA512 faa409e310dc4b2ee42426c0333f9b6b807ea7f47977ad4aaf3a2a4da82a5eae88448552232b2f3c2f9496ef48443d9ad18bc120adf80da9d97c22283dc8e62a WHIRLPOOL eb04fc90cd1784136b448d22b9c05aaf19a13ac61c7e66a6580e6c4e7adcbccbf4f85fa1bd2f375346789690af628baa0901de4f67fecb4dff1d634cf3152487
+MISC metadata.xml 462 SHA256 8561ec0d9cadf7a9df9507c23736fc5caed222339248d244eb70b5936db6ff27 SHA512 df9a01114d4063b4ae82f1046cab4d22c790de4cd63b0b7b5f6f33d59918cc081c3601542299236c3b4ea9062ec0f315ed82db6295797ee4140408a75e0696c3 WHIRLPOOL f0288af7a0e2d2a3b8c76eaddd88a173e3e482e1b3bcc35ac0714375033ce0aface4ca8859ec6499071d210b4fa5fcd70eb4012504dfdb0d04115ee1f2248136
diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch b/app-text/sword/files/sword-1.6.2-gcc47.patch
new file mode 100644
index 000000000000..7b55de75b646
--- /dev/null
+++ b/app-text/sword/files/sword-1.6.2-gcc47.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/419505
+
+
+--- a/include/multimapwdef.h
++++ b/include/multimapwdef.h
+@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> {
+ public:
+ 	typedef std::pair<const Key, T> 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 &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
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 000000000000..54c79671235e
--- /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.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
new file mode 100644
index 000000000000..dd852d82e555
--- /dev/null
+++ b/app-text/sword/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+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>
+</pkgmetadata>
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 000000000000..2db87d10461d
--- /dev/null
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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}/${PN}-1.7.4-gcc6.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}/"
+}