diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-text/sword | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-text/sword')
-rw-r--r-- | app-text/sword/Manifest | 3 | ||||
-rw-r--r-- | app-text/sword/files/sword-1.6.2-gcc47.patch | 35 | ||||
-rw-r--r-- | app-text/sword/metadata.xml | 13 | ||||
-rw-r--r-- | app-text/sword/sword-1.6.2.ebuild | 78 | ||||
-rw-r--r-- | app-text/sword/sword-1.7.2.ebuild | 78 | ||||
-rw-r--r-- | app-text/sword/sword-1.7.3.ebuild | 78 |
6 files changed, 285 insertions, 0 deletions
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest new file mode 100644 index 000000000000..b8141c67aa45 --- /dev/null +++ b/app-text/sword/Manifest @@ -0,0 +1,3 @@ +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 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/metadata.xml b/app-text/sword/metadata.xml new file mode 100644 index 000000000000..212f74428c43 --- /dev/null +++ b/app-text/sword/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>theology</herd> +<maintainer> + <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.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild new file mode 100644 index 000000000000..d56179b6c1c0 --- /dev/null +++ b/app-text/sword/sword-1.6.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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}"/${P}-gcc47.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}/" +} 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..07ab6f0d9dab --- /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 +# $Id$ + +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}/" +} 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..07ab6f0d9dab --- /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 +# $Id$ + +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}/" +} |