Add Prefix changes and keywords, bug #317935

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

3 files changed, 21 insertions, 20 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index fe4fca028393..11eb4b62eb4f 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -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.
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b688ec1f7b3f..910a1dca8015 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX escape_range.patch 459 RMD160 ba8b7edc6cccea592fb653175ed6eee5c578aa8d SHA1 a77ebef76f4bdf6593507f88da3498a49659b89f SHA256 f1772e8cdc36cf2405234f1e992a0d5d29b200ce5adc82092c65df65fe034ff1
 AUX sword-1.5.10+gcc-4.3.patch 1120 RMD160 dba12e2cec72acd7d18822c2d5b64128cc583682 SHA1 5846e3a37605b8df4a4fa23119de8be310ba51fa SHA256 43c6f412744a4ba5e7ebd6875a7b49f2f82a755eaf39c17ab65b6f2c7fc365f1
 AUX sword-1.5.11-gcc44.patch 238 RMD160 e90efea927b29a73cbeb2a58a213e8ba7277173b SHA1 e77689428f2d669cb0d59f7387371f42f2745e5b SHA256 65f00926c8c03c2671dccfe75068a8737cb378cd32752d907f104dc17fc2f3dc
@@ -16,13 +13,6 @@ EBUILD sword-1.5.11.ebuild 1589 RMD160 6249e1e0d2df8c96772d6dd60d1b7a26881f2f6d
 EBUILD sword-1.5.8-r2.ebuild 1331 RMD160 fb6d2def67fcfd93ccb3d9c5865d4c06af9197a4 SHA1 60c29fd1ff4a8da2a358e26e3b56497ce05db117 SHA256 bdfb9d1aef9282c3e43bd7d883c76c9c1314eca069a072bdf7948ca80add3cb5
 EBUILD sword-1.5.9-r2.ebuild 1578 RMD160 2becc8aec4d49b6b68189907849f9a2ed4b91649 SHA1 c3c9334ee11b1958f2006c6736e32fda24e4678b SHA256 32a6d1008011704efdfb7944081c492b5ea429a3af50cdd52f3c6ad274b495c4
 EBUILD sword-1.6.0.ebuild 1489 RMD160 e30dbc142d9b6c72a7fb32893b3fccadca61158b SHA1 48f447ad94e864dcb74dd3451bf23c3815c10850 SHA256 d330cd1537856ec977adfecd6dac53614015f229d2e0dab1d64d40596fc68fc3
-EBUILD sword-1.6.1.ebuild 1481 RMD160 206842cd489dcf728d0c8c4a5fa65668f1d7f5f0 SHA1 7f8afc5058c238177d82192bafe38f15b18c3cd2 SHA256 18bb2fd9f552fd5f730a7b1745a1becbb2b49584d1bfd97b446c00c28066c0b4
-MISC ChangeLog 7702 RMD160 6ab0ea5dc826cfc913a74422fafebfe046481deb SHA1 6cb3fc48ded00558a82ff47fe4e7487b5e90db46 SHA256 b0a453b831966396596f991ad777a3985f3aae5d78ca589783c88c90f21e40eb
+EBUILD sword-1.6.1.ebuild 1590 RMD160 cc00550022f687238efd5b59005938eb9cb46906 SHA1 d727496913de7799066c8f39db48a031b68704ea SHA256 47173453a35ac370b5a5a50932bd5ebf6870ad6f61bce261d75cd6d7e14ed11b
+MISC ChangeLog 7822 RMD160 36d98ea7befe5f946e6f4fef2e19bf67133faaf8 SHA1 761a7186ae669960b552c5956445040296651e71 SHA256 4d47400bd388738de1788a958018a02ce15035767e80068513e9d808f6e3e030
 MISC metadata.xml 587 RMD160 120d4f4fa5da22981921241ab12cb94777e8d6dc SHA1 709b3c5098cc9e4464acee6f38caaf092bf0db23 SHA256 7319e4922bacf9b9a17da615e2a722afbec5e1f7bc1873bdaa9e1d16b216c393
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktyLncACgkQcsIHjyDViGQqyACeON4K5hFcX8mLDfcITjsSEYXC
-wBQAn19bV6R6XQ9/RPsNX7hzURx88W9m
-=/D5/
------END PGP SIGNATURE-----
diff --git a/app-text/sword/sword-1.6.1.ebuild b/app-text/sword/sword-1.6.1.ebuild
index 8e15df44fed7..64a9dcdd3c43 100644
--- a/app-text/sword/sword-1.6.1.ebuild
+++ b/app-text/sword/sword-1.6.1.ebuild
@@ -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 @@ 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"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
 IUSE="curl debug doc icu lucene"
 
 RDEPEND="sys-libs/zlib
@@ -20,7 +22,14 @@ RDEPEND="sys-libs/zlib
 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 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_with icu) \
 		$(use_with lucene) || die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
@@ -38,11 +46,11 @@ src_install() {
 		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 @@ 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 /usr/share/doc/${PF}/"
+	elog "the web or in ${EPREFIX}/usr/share/doc/${PF}/"
 	echo
 }