[gentoo-commits] gentoo-x86 commit in app-cdr/cdrtools: ChangeLog cdrtools-2.01.01_alpha67-r1.ebuild

[gentoo-commits] gentoo-x86 commit in app-cdr/cdrtools: ChangeLog cdrtools-2.01.01_alpha67-r1.ebuild

[Daniel Pielmeier (billie)]

billie      09/11/04 22:35:32

  Modified:             ChangeLog
  Added:                cdrtools-2.01.01_alpha67-r1.ebuild
  Log:
  Also use LINKMODE in src_install. This should fix bug #289110.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.238                app-cdr/cdrtools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?r1=1.237&r2=1.238

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog	4 Nov 2009 18:17:23 -0000	1.237
+++ ChangeLog	4 Nov 2009 22:35:31 -0000	1.238
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.237 2009/11/04 18:17:23 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.238 2009/11/04 22:35:31 billie Exp $
+
+*cdrtools-2.01.01_alpha67-r1 (04 Nov 2009)
+
+  04 Nov 2009; Pielmeier Daniel <billie@gentoo.org>
+  +cdrtools-2.01.01_alpha67-r1.ebuild:
+  Also use LINKMODE in src_install. This should fix bug #289110.
 
 *cdrtools-2.01.01_alpha67 (04 Nov 2009)
 



1.1                  app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild?rev=1.1&content-type=text/plain

Index: cdrtools-2.01.01_alpha67-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild,v 1.1 2009/11/04 22:35:31 billie Exp $

EAPI=2

inherit multilib eutils toolchain-funcs flag-o-matic

DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
HOMEPAGE="http://cdrecord.berlios.de/"
SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"

LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="unicode acl"

DEPEND="acl? ( sys-apps/acl )
	!app-cdr/dvdrtools
	!app-cdr/cdrkit"
RDEPEND="${DEPEND}"

S=${WORKDIR}/${PN}-2.01.01

src_prepare() {
	# Adjusting hardcoded paths.
	sed -i -e 's:opt/schily:usr:' \
		$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \
		$(grep -l --include='*.c' --include='*.h' -r 'opt/schily' .) \
		|| die "404 on opt-schily sed"

	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
		$(grep -l -r 'INSDIR.\+doc' .) \
		|| die "404 on doc sed"

	# Respect libdir.
	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
		|| die "404 on multilib-sed"

	# See previous comment s/libdir/--disable-static/.
	sed -i -e 's:include\t\t.*rules.lib::' \
		$(grep -l -r '^include.\+rules\.lib' .) \
		|| die "404 on rules sed"

	# Remove profiled make files.
	rm -f $(find . -name '*_p.mk') || die "rm failed"

	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch

	# Schily make setup.
	cd "${S}"/DEFAULTS
	local MYARCH="linux"

	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed"
	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed"
	sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed"

	cd "${S}"/RULES

	# Respect CC/CXX variables
	local tcCC=$(tc-getCC)
	local tcCXX=$(tc-getCXX)
	sed -i -e "/cc-config.sh/s/\$(C_ARCH:%64=%) \$(CCOM_DEF)/${tcCC} ${tcCC}/" \
		rules1.top || die "sed rules1.top failed"
	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s/gcc/${tcCC}/" \
		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s/g++/${tcCXX}/" \
		cc-gcc.rul || die "sed cc-gcc.rul failed"
	sed -i -e "s/^#CONFFLAGS +=\t-cc=\$(XCC_COM)$/CONFFLAGS +=\t-cc=${tcCC}/g" \
		rules.cnf || die "sed rules.cnf failed"

	# Create additional symlinks needed for some archs.
	local t
	for t in ppc64 sh4 s390x ; do
		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
	done
}

src_configure() { : ; }

src_compile() {
	local ACL="-lacl"
	if use unicode; then
		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
		if [[ -n ${flags} ]]; then
			append-flags ${flags}
		else
			ewarn "Your compiler does not support the options required to build"
			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
		fi
	fi

	if ! use acl
	then
		CFLAGS="${CFLAGS} -DNO_ACL"
		ACL=""
	fi
	# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" \
		LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" \
		LINKMODE="dynamic" GMAKE_NOWARN="true" || die "emake failed"
}

src_install() {
	# If not built with -j1, "sometimes" manpages are not installed. Bug?
	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" \
		LINKMODE="dynamic" GMAKE_NOWARN="true" install

	# These symlinks are for compat with cdrkit.
	dosym schily /usr/include/scsilib
	dosym ../scg /usr/include/schily/scg

	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"

	cd "${S}"/cdda2wav
	docinto cdda2wav
	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
}

[gentoo-commits] gentoo-x86 commit in app-cdr/cdrtools: ChangeLog cdrtools-2.01.01_alpha67-r1.ebuild

[Daniel Pielmeier (billie)]

billie      09/11/14 19:10:40

  Modified:             ChangeLog cdrtools-2.01.01_alpha67-r1.ebuild
  Log:
  Replace slashes as separator in sed expressions as $(tc-getCC) or $(tc-getCXX) can return a full path which contains slashes, this in turn makes sed fail.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.239                app-cdr/cdrtools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.239&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?rev=1.239&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/ChangeLog?r1=1.238&r2=1.239

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- ChangeLog	4 Nov 2009 22:35:31 -0000	1.238
+++ ChangeLog	14 Nov 2009 19:10:39 -0000	1.239
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.238 2009/11/04 22:35:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.239 2009/11/14 19:10:39 billie Exp $
+
+  14 Nov 2009; Daniel Pielmeier <billie@gentoo.org>
+  cdrtools-2.01.01_alpha67-r1.ebuild:
+  Replace slashes as separator in sed expressions as $(tc-getCC) or
+  $(tc-getCXX) can return a full path which contains slashes.
 
 *cdrtools-2.01.01_alpha67-r1 (04 Nov 2009)
 



1.2                  app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild?r1=1.1&r2=1.2

Index: cdrtools-2.01.01_alpha67-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdrtools-2.01.01_alpha67-r1.ebuild	4 Nov 2009 22:35:31 -0000	1.1
+++ cdrtools-2.01.01_alpha67-r1.ebuild	14 Nov 2009 19:10:39 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild,v 1.1 2009/11/04 22:35:31 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild,v 1.2 2009/11/14 19:10:39 billie Exp $
 
 EAPI=2
 
@@ -61,12 +61,12 @@
 	# Respect CC/CXX variables
 	local tcCC=$(tc-getCC)
 	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s/\$(C_ARCH:%64=%) \$(CCOM_DEF)/${tcCC} ${tcCC}/" \
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
 		rules1.top || die "sed rules1.top failed"
-	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s/gcc/${tcCC}/" \
-		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s/g++/${tcCXX}/" \
+	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
+		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
 		cc-gcc.rul || die "sed cc-gcc.rul failed"
-	sed -i -e "s/^#CONFFLAGS +=\t-cc=\$(XCC_COM)$/CONFFLAGS +=\t-cc=${tcCC}/g" \
+	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
 		rules.cnf || die "sed rules.cnf failed"
 
 	# Create additional symlinks needed for some archs.