public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/sword: ChangeLog sword-1.6.1.ebuild
@ 2010-05-14  8:14 Fabian Groffen (grobian)
  0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen (grobian) @ 2010-05-14  8:14 UTC (permalink / raw
  To: gentoo-commits

grobian     10/05/14 08:14:39

  Modified:             ChangeLog sword-1.6.1.ebuild
  Log:
  Add Prefix changes and keywords, bug #317935
  (Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.58                 app-text/sword/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog	10 Feb 2010 03:57:23 -0000	1.57
+++ ChangeLog	14 May 2010 08:14:39 -0000	1.58
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/sword
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.57 2010/02/10 03:57:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.58 2010/05/14 08:14:39 grobian Exp $
+
+  14 May 2010; Fabian Groffen <grobian@gentoo.org> sword-1.6.1.ebuild:
+  Add Prefix changes and keywords, bug #317935
 
   10 Feb 2010; Joseph Jezak <josejx@gentoo.org> sword-1.6.0.ebuild:
   Marked ppc stable for bug #294863.



1.2                  app-text/sword/sword-1.6.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/sword-1.6.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/sword-1.6.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/sword/sword-1.6.1.ebuild?r1=1.1&r2=1.2

Index: sword-1.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sword-1.6.1.ebuild	5 Jan 2010 21:15:41 -0000	1.1
+++ sword-1.6.1.ebuild	14 May 2010 08:14:39 -0000	1.2
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.1.ebuild,v 1.1 2010/01/05 21:15:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.1.ebuild,v 1.2 2010/05/14 08:14:39 grobian Exp $
+
+EAPI="3"
 
 inherit flag-o-matic
 
@@ -10,7 +12,7 @@
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
 IUSE="curl debug doc icu lucene"
 
 RDEPEND="sys-libs/zlib
@@ -20,7 +22,14 @@
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
+src_prepare() {
+	cat > "${T}"/sword.conf <<- _EOF
+		[Install]
+		DataPath=${EPREFIX}/usr/share/sword/
+	_EOF
+}
+
+src_configure() {
 	strip-flags
 	econf --with-zlib \
 		--with-conf \
@@ -28,7 +37,6 @@
 		$(use_enable debug) \
 		$(use_with icu) \
 		$(use_with lucene) || die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
@@ -38,11 +46,11 @@
 		rm -rf examples/.cvsignore
 		rm -rf examples/cmdline/.cvsignore
 		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${D}/usr/share/doc/${PF}/"
+		cp -R samples examples "${ED}/usr/share/doc/${PF}/"
 	fi
 	# global configuration file
 	insinto /etc
-	doins "${FILESDIR}/sword.conf"
+	doins "${T}/sword.conf"
 }
 
 pkg_postinst() {
@@ -50,6 +58,6 @@
 	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 /usr/share/doc/${PF}/"
+	elog "the web or in ${EPREFIX}/usr/share/doc/${PF}/"
 	echo
 }






^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/sword: ChangeLog sword-1.6.1.ebuild
@ 2010-01-05 21:15 Steve Dibb (beandog)
  0 siblings, 0 replies; 2+ messages in thread
From: Steve Dibb (beandog) @ 2010-01-05 21:15 UTC (permalink / raw
  To: gentoo-commits

beandog     10/01/05 21:15:41

  Modified:             ChangeLog
  Added:                sword-1.6.1.ebuild
  Log:
  Version bump
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.56                 app-text/sword/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sword/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sword/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sword/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	3 Dec 2009 10:54:01 -0000	1.55
+++ ChangeLog	5 Jan 2010 21:15:41 -0000	1.56
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/sword
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.55 2009/12/03 10:54:01 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.56 2010/01/05 21:15:41 beandog Exp $
+
+*sword-1.6.1 (05 Jan 2010)
+
+  05 Jan 2010; Steve Dibb <beandog@gentoo.org> +sword-1.6.1.ebuild:
+  Version bump
 
   03 Dec 2009; Markus Meier <maekke@gentoo.org> sword-1.6.0.ebuild:
   amd64 stable, bug #294863



1.1                  app-text/sword/sword-1.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sword/sword-1.6.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/sword/sword-1.6.1.ebuild?rev=1.1&content-type=text/plain

Index: sword-1.6.1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.1.ebuild,v 1.1 2010/01/05 21:15:41 beandog Exp $

inherit flag-o-matic

DESCRIPTION="Library for Bible reading software."
HOMEPAGE="http://www.crosswire.org/sword/"
SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/${P}.tar.gz"
LICENSE="GPL-2"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="curl debug doc icu lucene"

RDEPEND="sys-libs/zlib
	curl? ( net-misc/curl )
	icu? ( dev-libs/icu )
	lucene? ( dev-cpp/clucene )"
DEPEND="${RDEPEND}
	dev-util/pkgconfig"

src_compile() {
	strip-flags
	econf --with-zlib \
		--with-conf \
		$(use_with curl) \
		$(use_enable debug) \
		$(use_with icu) \
		$(use_with lucene) || die "configure failed"
	emake || die "make failed"
}

src_install() {
	make DESTDIR="${D}" install || die "install failed"
	dodoc AUTHORS CODINGSTYLE ChangeLog README
	if use doc ;then
		rm -rf examples/.cvsignore
		rm -rf examples/cmdline/.cvsignore
		rm -rf examples/cmdline/.deps
		cp -R samples examples "${D}/usr/share/doc/${PF}/"
	fi
	# global configuration file
	insinto /etc
	doins "${FILESDIR}/sword.conf"
}

pkg_postinst() {
	echo
	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 /usr/share/doc/${PF}/"
	echo
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-14  8:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-14  8:14 [gentoo-commits] gentoo-x86 commit in app-text/sword: ChangeLog sword-1.6.1.ebuild Fabian Groffen (grobian)
  -- strict thread matches above, loose matches on Subject: below --
2010-01-05 21:15 Steve Dibb (beandog)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox