Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 317935 - Please review Prefix changes for app-text/sword-1.6.1
Summary: Please review Prefix changes for app-text/sword-1.6.1
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All All
: High normal (vote)
Assignee: Theology Herd (disbanded)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: prefix-gx86
  Show dependency tree
 
Reported: 2010-04-30 20:15 UTC by Fabian Groffen
Modified: 2010-05-14 08:14 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Fabian Groffen gentoo-dev 2010-04-30 20:15:21 UTC
To make sword ebuild Prefix aware, a bump to EAPI=3 is necessary to fix a small issue with its docs installation.  The changes can be applied to the ebuild in place, or against a new revision.  Thanks in advance.


--- sword-1.6.1.ebuild  5 Jan 2010 21:15:41 -0000       1.1
+++ sword-1.6.1.ebuild  30 Apr 2010 20:11:05 -0000
@@ -2,6 +2,8 @@
 # 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 $
 
+EAPI="3"
+
 inherit flag-o-matic
 
 DESCRIPTION="Library for Bible reading software."
@@ -20,7 +22,7 @@
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
-src_compile() {
+src_configure() {
        strip-flags
        econf --with-zlib \
                --with-conf \
@@ -28,7 +30,6 @@
                $(use_enable debug) \
                $(use_with icu) \
                $(use_with lucene) || die "configure failed"
-       emake || die "make failed"
 }
 
 src_install() {
@@ -38,7 +39,7 @@
                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
Comment 1 Fabian Groffen gentoo-dev 2010-05-01 13:42:36 UTC
I missed files/sword.conf.  It contains a path that needs the offset in it too.

Since it's a really small file, I would suggest to create it on the fly from the ebuild.  Alternative is to keep it a file and inject a @GENTOO_PORTAGE_EPREFIX@ placeholder in it, which is then processed by a call to eprefixify.  For that the file needs to be copied to a writable area first though.
Comment 2 Steve Dibb (RETIRED) gentoo-dev 2010-05-13 21:40:28 UTC
ok to go
Comment 3 Fabian Groffen gentoo-dev 2010-05-14 08:14:19 UTC
committed, thanks