From 86a2760009ef574433ae717a50b45d56e4d943bb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 27 Nov 2008 18:02:11 +0000 Subject: Respect build settings #248714 by Diego E. Pettenò and touchup rar DEPEND #244989 by drantin. (Portage version: 2.2_rc16/cvs/Linux 2.6.27.4 x86_64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-cdr/xdvdfs-tools/ChangeLog | 9 +++++++-- app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild | 26 +++++++++++++------------ 2 files changed, 21 insertions(+), 14 deletions(-) (limited to 'app-cdr') diff --git a/app-cdr/xdvdfs-tools/ChangeLog b/app-cdr/xdvdfs-tools/ChangeLog index a80090732ce9..0f28ee533360 100644 --- a/app-cdr/xdvdfs-tools/ChangeLog +++ b/app-cdr/xdvdfs-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/xdvdfs-tools -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/ChangeLog,v 1.10 2007/02/21 20:21:23 peper Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/ChangeLog,v 1.11 2008/11/27 18:02:11 vapier Exp $ + + 27 Nov 2008; Mike Frysinger + xdvdfs-tools-2.1-r1.ebuild: + Respect build settings #248714 by Diego E. Pettenò and touchup rar DEPEND + #244989 by drantin. 21 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild index 01d1bf2f83b7..64852a5ff6ae 100644 --- a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild +++ b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild @@ -1,38 +1,40 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild,v 1.2 2008/06/14 16:13:13 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild,v 1.3 2008/11/27 18:02:11 vapier Exp $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="Tools for manipulating Xbox ISO images" HOMEPAGE="http://www.layouts.xbox-scene.com/" -SRC_URI="http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv2.1.rar" +SRC_URI="http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv${PV}.rar" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="" -DEPEND="app-arch/unrar" +DEPEND="|| ( app-arch/unrar app-arch/rar )" RDEPEND="" S=${WORKDIR}/XDVDFS_Tools/src src_unpack() { - unrar x "${DISTDIR}"/XDVDFSToolsv${PV}.rar + unpack ${A} mv "XDVDFS Tools" XDVDFS_Tools - sed -i -e "s:CCFLAGS = .*:CCFLAGS = ${CFLAGS}:g" "${S}"/makefile.prefab + sed -i \ + -e '/^LDFLAGS = -s/d' \ + -e '/^CCFLAGS =/s:=.*:= ${CFLAGS} ${CPPFLAGS}:g' \ + -e "/^CC =/s:=.*:=$(tc-getCC):" \ + "${S}"/makefile.prefab epatch "${FILESDIR}"/${P}-fnamefix.patch mkdir "${S}"/xdvdfs_extract/output "${S}"/xdvdfs_maker/output } src_compile() { - cd "${S}"/xdvdfs_dumper - emake || die "xdvdfs_dumper" - cd ../xdvdfs_extract - emake || die "xdvdfs_extract" - cd ../xdvdfs_maker - emake || die "xdvdfs_maker" + local d + for d in xdvdfs_{dumper,extract,maker} ; do + emake -C ${d} || die + done } src_install() { -- cgit v1.2.3-65-gdbad