From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4701813800E for ; Sat, 28 Jul 2012 09:03:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE664E002C; Sat, 28 Jul 2012 09:03:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9091AE002C for ; Sat, 28 Jul 2012 09:03:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 700251B40C6 for ; Sat, 28 Jul 2012 09:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 31110E5436 for ; Sat, 28 Jul 2012 09:03:11 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1343466142.316427a428dc4b66bc23b66d03d73b9c0ca2a10f.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: app-cdr/cdrtools/files/, app-cdr/cdrtools/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: app-cdr/cdrtools/Manifest app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch X-VCS-Directories: app-cdr/cdrtools/files/ app-cdr/cdrtools/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 316427a428dc4b66bc23b66d03d73b9c0ca2a10f X-VCS-Branch: master Date: Sat, 28 Jul 2012 09:03:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 94862bad-2eed-4f95-93ed-434f280077b4 X-Archives-Hash: ffea8949b99348851ed78cb10389789d commit: 316427a428dc4b66bc23b66d03d73b9c0ca2a10f Author: Yuta SATOH gentoo gr jp> AuthorDate: Sat Jul 28 09:02:22 2012 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sat Jul 28 09:02:22 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=316427a4 added cdrtools, fixes bug #395163 --- app-cdr/cdrtools/Manifest | 3 + app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild | 133 ++++++++++++++++++++ .../files/cdrtools-3.01_alpha07-fbsd.patch | 13 ++ 3 files changed, 149 insertions(+), 0 deletions(-) diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest new file mode 100644 index 0000000..56f4e2c --- /dev/null +++ b/app-cdr/cdrtools/Manifest @@ -0,0 +1,3 @@ +AUX cdrtools-3.01_alpha07-fbsd.patch 487 RMD160 31633dd4c17378bb366348554a3e51a826ae0e48 SHA1 9221a81225c2dfcea8d27101298f5b50dad287e7 SHA256 25325ec1b193aa5c5f737918aa59dfff6c19dc62b095d7858fed11b039e79610 +DIST cdrtools-3.01a07.tar.bz2 2043525 RMD160 b8331d826bf64de8bd26c041624a3e41648b6952 SHA1 ee4b540e4897ee6637837a097658305d18345999 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428 +EBUILD cdrtools-3.01_alpha07.ebuild 4048 RMD160 e8b9ea26d71c1feff5c8412a535df25ab4ea5b57 SHA1 c9c2ae1fd147cc4dddbeb9b38ebaba5c270125c1 SHA256 2d85d25e875017a6ffb8e71c49da3392410fdec9031cc3b02f321fa50ebef068 diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild new file mode 100644 index 0000000..042c1ac --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit multilib eutils toolchain-funcs flag-o-matic + +MY_P="${P/_alpha/a}" + +DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.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 ~x86-fbsd" +IUSE="acl unicode" + +DEPEND="acl? ( virtual/acl ) + >=sys-devel/gettext-0.18.1.1 + !app-cdr/cdrkit" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${P/_alpha[0-9][0-9]} + +src_prepare() { + use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-3.01_alpha07-fbsd.patch + + # Remove profiled make files. + rm -f $(find . -name '*_p.mk') || die "rm profiled" + + # Adjusting hardcoded paths. + sed -i -e 's:opt/schily:usr:' \ + $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ + || die "sed opt/schily" + + sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \ + $(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \ + || die "sed doc" + + # Respect libdir. + sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ + || die "sed multilib" + + # Do not install static libraries. + sed -i -e 's:include\t\t.*rules.lib::' \ + $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ + || die "sed rules" + + # Respect CC/CXX variables. + cd "${S}"/RULES + 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" + sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \ + -e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \ + -e "/COPTOPT=/s/-O//" \ + -e 's/$(GCCOPTOPT)//' \ + cc-gcc.rul || die "sed cc-gcc.rul" + sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \ + rules.cnf || die "sed rules.cnf" + + # Create additional symlinks needed for some archs (armv4l already created) + local t + for t in armv4tl armv5l armv5tel armv6l armv7l ppc64 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 + + # Schily make setup. + cd "${S}"/DEFAULTS + local os="linux" + + sed -i \ + -e "s:/opt/schily:/usr:g" \ + -e "s:/usr/src/linux/include::g" \ + -e "s:bin:root:g" \ + Defaults.${os} || die "sed Schily make setup" +} + +# skip obsolete configure script +src_configure() { : ; } + +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 + + if ! use acl; then + CFLAGS="${CFLAGS} -DNO_ACL" + fi + + # LIB_ACL_TEST removed to support x86-fbsd + # If not built with -j1, "sometimes" cdda2wav will not be built. + emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ + LDOPTX="${LDFLAGS}" \ + INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \ + RUNPATH="" GMAKE_NOWARN="true" +} + +src_install() { + # If not built with -j1, "sometimes" manpages are not installed. + emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ + LDOPTX="${LDFLAGS}" \ + INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \ + RUNPATH="" 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* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux + + cd "${S}"/cdda2wav + docinto cdda2wav + dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO + + cd "${S}"/mkisofs + docinto mkisofs + dodoc ChangeLog* TODO + + # Remove man pages related to the build system + rm -rvf "${D}"/usr/share/man/man5 +} diff --git a/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch b/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch new file mode 100644 index 0000000..2689074 --- /dev/null +++ b/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch @@ -0,0 +1,13 @@ +diff --git a/libschily/shlschily.mk b/libschily/shlschily.mk +index 3280b39..ea92050 100644 +--- a/libschily/shlschily.mk ++++ b/libschily/shlschily.mk +@@ -14,7 +14,7 @@ CPPOPTS += -Istdio + CPPOPTS += -DUSE_SCANSTACK # Try to scan stack frames + CPPOPTS += -DPORT_ONLY # Add missing funcs line snprintf for porting + include Targets +-LIBS= -lc ++LIBS= -lc $(LIB_INTL) + + ########################################################################### + include $(SRCROOT)/$(RULESDIR)/rules.shl