diff options
| -rw-r--r-- | app-text/sword/ChangeLog | 4 | ||||
| -rw-r--r-- | app-text/sword/Manifest | 7 | ||||
| -rw-r--r-- | app-text/sword/files/digest-sword-1.5.5 | 1 | ||||
| -rw-r--r-- | app-text/sword/files/sword-installmgr-gentoo.patch (renamed from app-text/sword/files/sword-1.5.7-gentoo.patch) | 4 | ||||
| -rw-r--r-- | app-text/sword/files/sword.conf | 2 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.5.ebuild | 37 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.6.ebuild | 16 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.7.ebuild | 9 |
8 files changed, 30 insertions, 50 deletions
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog index 145acb53d452..a4453ae6ba19 100644 --- a/app-text/sword/ChangeLog +++ b/app-text/sword/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for app-text/sword # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.11 2004/04/08 20:01:48 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.12 2004/04/08 22:11:14 squinky86 Exp $ *sword-1.5.7 (05 Apr 2004) @@ -9,6 +9,8 @@ added patch for building with curl (closes bug #47088) thanks to stamm@flashmail.com, changed post_install information + edit patch to apply to 1.5.6 to close bug #44041 + remove older version 05 Apr 2004; Jon Hood <squinky86@gentoo.org> sword-1.5.7.ebuild: version bump. Thanks to Timothy Stotts for this ebuild in bug diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index 881aeff1210c..b522e46e2624 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,9 +1,10 @@ -MD5 6de2dcab10bda6ce078c44d0698aae67 sword-1.5.7.ebuild 1376 -MD5 887f4ccf2ef2114492b71bb1c2fe6d14 sword-1.5.6.ebuild 1008 +MD5 b001b1fe1676647c5b862c932e7fb3e8 sword-1.5.7.ebuild 1442 +MD5 40917bd70ed153afabcfaddc066ba193 sword-1.5.6.ebuild 1186 MD5 2e2db1e17a1ae6063c062256435c55ea sword-1.5.5.ebuild 1008 MD5 7c9eb0079a0923284840c0f76b10a42b ChangeLog 1459 MD5 ad380c3ad43e07e96cb3f81b334994a4 metadata.xml 570 MD5 1d74f356d597b13019fc25fdfbec57af files/digest-sword-1.5.5 64 MD5 9e04e627c30e6862e7cae8a2e5b9af22 files/digest-sword-1.5.6 64 MD5 804c86a778da7cd957c88cf4640abfae files/digest-sword-1.5.7 64 -MD5 6690d5aeb5306ece0d6e1bfb85701e00 files/sword-1.5.7-gentoo.patch 504 +MD5 eebb7c4602450ff87a76e5a693e72da7 files/sword.conf 37 +MD5 8da3224ff457b08e298c9aabe83920b9 files/sword-installmgr-gentoo.patch 472 diff --git a/app-text/sword/files/digest-sword-1.5.5 b/app-text/sword/files/digest-sword-1.5.5 deleted file mode 100644 index 8ca525bd95ae..000000000000 --- a/app-text/sword/files/digest-sword-1.5.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 d5889fa47ed52c83cfd6466fabc0241b sword-1.5.5.tar.gz 3984442 diff --git a/app-text/sword/files/sword-1.5.7-gentoo.patch b/app-text/sword/files/sword-installmgr-gentoo.patch index e95cbe735aac..90d664dcdbbf 100644 --- a/app-text/sword/files/sword-1.5.7-gentoo.patch +++ b/app-text/sword/files/sword-installmgr-gentoo.patch @@ -1,6 +1,6 @@ diff -Naur sword-1.5.7.vanilla/src/mgr/installmgr.cpp sword-1.5.7/src/mgr/installmgr.cpp ---- sword-1.5.7.vanilla/src/mgr/installmgr.cpp 2003-11-25 13:11:13.000000000 -0600 -+++ sword-1.5.7/src/mgr/installmgr.cpp 2004-04-08 15:51:34.933586760 -0500 +--- src/mgr/installmgr.cpp 2003-11-25 13:11:13.000000000 -0600 ++++ src/mgr/installmgr.cpp 2004-04-08 15:51:34.933586760 -0500 @@ -150,7 +150,7 @@ curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile); diff --git a/app-text/sword/files/sword.conf b/app-text/sword/files/sword.conf new file mode 100644 index 000000000000..49ea7eeeb752 --- /dev/null +++ b/app-text/sword/files/sword.conf @@ -0,0 +1,2 @@ +[Install] +DataPath=/usr/share/sword/ diff --git a/app-text/sword/sword-1.5.5.ebuild b/app-text/sword/sword-1.5.5.ebuild deleted file mode 100644 index 0428859480d5..000000000000 --- a/app-text/sword/sword-1.5.5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.5.ebuild,v 1.4 2004/03/12 09:18:44 mr_bones_ Exp $ - -DESCRIPTION="library for bible reading software" -HOMEPAGE="http://www.crosswire.org/sword/" -SRC_URI="ftp://ftp.crosswire.org/pub/sword/source/v1.5/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" - -DEPEND="virtual/glibc - sys-libs/zlib" - -src_compile() { - econf - emake || die "parallel make failed" -} - -src_install() { - einstall - - dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README - cp -R samples examples ${D}/usr/share/doc/${PF} - dohtml doc/api-documentation/html/* -} - -pkg_postinst() { - einfo "" - einfo "Check out http://www.crosswire.org/sword/modules/" - einfo "to download modules that you would like to enhance" - einfo "the library with. Follow module installation" - einfo "instructions found on the web or in INSTALL.gz found" - einfo "in /usr/share/doc/${PF}" - einfo "" -} diff --git a/app-text/sword/sword-1.5.6.ebuild b/app-text/sword/sword-1.5.6.ebuild index 58e47e2049c4..096800aadbe8 100644 --- a/app-text/sword/sword-1.5.6.ebuild +++ b/app-text/sword/sword-1.5.6.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.6.ebuild,v 1.4 2004/03/12 09:18:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.6.ebuild,v 1.5 2004/04/08 22:11:14 squinky86 Exp $ + +inherit eutils DESCRIPTION="library for bible reading software" HOMEPAGE="http://www.crosswire.org/sword/" @@ -10,11 +12,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="x86" +IUSE="curl" DEPEND="virtual/glibc - sys-libs/zlib" + sys-libs/zlib + curl? ( >=net-misc/curl-7.10.8 )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-installmgr-gentoo.patch +} src_compile() { - econf + econf || die "configure failed" emake || die "parallel make failed" } diff --git a/app-text/sword/sword-1.5.7.ebuild b/app-text/sword/sword-1.5.7.ebuild index 7c4087bbfe79..2994c8907ab3 100644 --- a/app-text/sword/sword-1.5.7.ebuild +++ b/app-text/sword/sword-1.5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.3 2004/04/08 20:18:46 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.4 2004/04/08 22:11:14 squinky86 Exp $ inherit eutils @@ -15,12 +15,13 @@ KEYWORDS="~x86 ~ppc" IUSE="icu curl" DEPEND="virtual/glibc sys-libs/zlib - curl? ( >=net-misc/curl-7.9 ) + curl? ( >=net-misc/curl-7.10.8 ) icu? ( dev-libs/icu )" src_unpack() { unpack ${A} - epatch ${FILESDIR}/${P}-gentoo.patch + cd ${S} + epatch ${FILESDIR}/${PN}-installmgr-gentoo.patch } src_compile() { @@ -30,6 +31,8 @@ src_compile() { src_install() { einstall || die "install failed" + dodir /etc + doins ${FILESDIR}/sword.conf dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README cp -R samples examples ${D}/usr/share/doc/${PF} |