[gentoo-commits] proj/gentoo-bsd:master commit in: app-cdr/cdrtools/files/, scripts/mkstages/, app-cdr/cdrtools/

[gentoo-commits] proj/gentoo-bsd:master commit in: app-cdr/cdrtools/files/, scripts/mkstages/, app-cdr/cdrtools/

[Yuta SATOH]

commit:     8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Aug 23 14:46:58 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Aug 23 14:46:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8816a085

remove cdrtools fixed in official tree, close bug #395163

---
 app-cdr/cdrtools/Manifest                          |    3 -
 app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild      |  133 --------------------
 .../files/cdrtools-3.01_alpha07-fbsd.patch         |   13 --
 scripts/mkstages/stages_builder.sh                 |    2 +-
 4 files changed, 1 insertions(+), 150 deletions(-)

diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
deleted file mode 100644
index 56f4e2c..0000000
--- a/app-cdr/cdrtools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 042c1ac..0000000
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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
deleted file mode 100644
index 2689074..0000000
--- a/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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

diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index 97bdb1c..c422076 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -56,7 +56,7 @@ prepare(){
 	mv gentoo-bsd-* ${WORKDIR}/portage.bsd-overlay
 
 	echo "emerging catalyst..."
-	PORTDIR_OVERLAY=${WORKDIR}/portage.bsd-overlay ACCEPT_KEYWORDS=~x86-fbsd emerge -uq =app-cdr/cdrtools-3.00 '<app-text/build-docbook-catalog-1.19' =dev-util/catalyst-2.0.10.1 =app-arch/libarchive-3.0.3 || exit 1
+	PORTDIR_OVERLAY=${WORKDIR}/portage.bsd-overlay ACCEPT_KEYWORDS=~x86-fbsd emerge -uq app-cdr/cdrtools '<app-text/build-docbook-catalog-1.19' =dev-util/catalyst-2.0.10.1 =app-arch/libarchive-3.0.3 || exit 1
 	grep "^export MAKEOPTS" /etc/catalyst/catalystrc > /dev/null 2>&1
 	if [ $? -ne 0 ] ; then
 		echo "export MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/catalyst/catalystrc