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

[Peter Alfredsen (loki_val)]

loki_val    08/09/30 23:03:14

  Modified:             ChangeLog
  Added:                cdrtools-2.01.01_alpha50-r2.ebuild
  Removed:              cdrtools-2.01.01_alpha50-r1.ebuild
  Log:
  A last bug, discovered by daniel pielmeyer (again :-)). Fix to make cdrtools install its configuration files in /etc, not /usr/etc.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)

Revision  Changes    Path
1.210                app-cdr/cdrtools/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- ChangeLog	28 Sep 2008 13:47:01 -0000	1.209
+++ ChangeLog	30 Sep 2008 23:03:13 -0000	1.210
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.209 2008/09/28 13:47:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.210 2008/09/30 23:03:13 loki_val Exp $
+
+*cdrtools-2.01.01_alpha50-r2 (30 Sep 2008)
+
+  30 Sep 2008; Peter Alfredsen <loki_val@g.o>
+  -cdrtools-2.01.01_alpha50-r1.ebuild, +cdrtools-2.01.01_alpha50-r2.ebuild:
+  A last bug, discovered by daniel pielmeyer (again :-)). Fix to make
+  cdrtools install its configuration files in /etc, not /usr/etc.
 
 *cdrtools-2.01.01_alpha50-r1 (28 Sep 2008)
 



1.1                  app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r2.ebuild

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

Index: cdrtools-2.01.01_alpha50-r2.ebuild
===================================================================
# Copyright 1999-2008 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_alpha50-r2.ebuild,v 1.1 2008/09/30 23:03:13 loki_val Exp $

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"

DEPEND="virtual/libc
	sys-apps/acl
	!app-cdr/dvdrtools
	!app-cdr/cdrkit"

PROVIDE="virtual/cdrtools"

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

src_unpack() {
	unpack ${A}
	cd "${S}"

	#Adjust 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"

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

	sed -i -e "s:\(^INSDIR=\t\t\)\(etc/default\):\1../\2:" \
		$(grep -l -r '^INSDIR.\+default' .) \
		|| die "404 on etc sed"

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

	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
	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}
	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}

	# For dynamic linking:
	sed -i "s:static:dynamic:" Defaults.${MYARCH}

	# lame symlinks that all point to the same thing
	cd "${S}"/RULES
	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_compile() {
	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

	#Watch out for an elusive parallel make bug, that may yet occur.

	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
}

src_install() {
	emake MANDIR="share/man" INS_BASE="${D}/usr/" 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"

}

pkg_postinst() {
	echo
	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
	einfo "should be used for IDE CD writers.  And make sure that the permissions"
	einfo "on this device are set properly and your user is in the correct group."
}