summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2010-09-12 21:15:31 +0000
committerJonathan Callen <abcd@gentoo.org>2010-09-12 21:15:31 +0000
commitb7d107f88140af76048e5ed120575e55c720fe72 (patch)
tree3fd615f2638be8566ec1e8546d4b970d68f8e572 /sys-apps
parentfix metadata (diff)
downloadgentoo-2-b7d107f88140af76048e5ed120575e55c720fe72.tar.gz
gentoo-2-b7d107f88140af76048e5ed120575e55c720fe72.tar.bz2
gentoo-2-b7d107f88140af76048e5ed120575e55c720fe72.zip
Add prefix support and keywords, switch to EAPI=3, add missing dep on sys-devel/gettext when USE=nls
(Portage version: v2.2_rc69-91-g2d3847a/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/eject/ChangeLog6
-rw-r--r--sys-apps/eject/eject-2.1.5-r2.ebuild21
2 files changed, 17 insertions, 10 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index 6ce3ce0fa1ab..7b198b304033 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/eject
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.81 2010/02/01 19:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.82 2010/09/12 21:15:31 abcd Exp $
+
+ 12 Sep 2010; Jonathan Callen <abcd@gentoo.org> eject-2.1.5-r2.ebuild:
+ Add prefix support and keywords, switch to EAPI=3, add missing dep on
+ sys-devel/gettext when USE=nls
01 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> eject-2.1.5-r2.ebuild:
Change SRC_URI to Gentoo mirrors wrt #303136, thanks to Juan Welthagen for
diff --git a/sys-apps/eject/eject-2.1.5-r2.ebuild b/sys-apps/eject/eject-2.1.5-r2.ebuild
index 106a0f35eb78..794236f7fe49 100644
--- a/sys-apps/eject/eject-2.1.5-r2.ebuild
+++ b/sys-apps/eject/eject-2.1.5-r2.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/sys-apps/eject/eject-2.1.5-r2.ebuild,v 1.10 2010/02/01 19:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.5-r2.ebuild,v 1.11 2010/09/12 21:15:31 abcd Exp $
+
+EAPI="3"
inherit eutils
@@ -10,14 +12,15 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls"
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
S=${WORKDIR}/${PN}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/${PN}"-2.0.13-xmalloc.patch
epatch "${FILESDIR}/${PN}"-2.1.4-scsi-rdwr.patch
epatch "${FILESDIR}/${PN}"-2.1.5-handle-spaces.patch #151257
@@ -25,14 +28,14 @@ src_unpack() {
epatch "${FILESDIR}/${PN}"-2.1.5-toggle.patch #261880
}
-src_compile() {
+src_configure() {
econf \
$(use_enable nls)
-
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
+ # PREFIX for po/Makefile, which hardcodes a prefix of "$(DESTDIR)/usr"
+ # it is not used in the other makefiles
+ emake DESTDIR="${D}" PREFIX="${ED}/usr" install || die
dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
}