app-cdr/cdrtools: Sync with gentoo

It's from gentoo commit b9d442e605aa22364388004f2a99a22a17a7383f.
This commit is contained in:
Krzesimir Nowak 2022-02-17 07:30:24 +01:00
parent 0c211f7f7b
commit 49110b0363
9 changed files with 344 additions and 2158 deletions

View File

@ -1,167 +0,0 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*cdrtools-3.01_alpha30 (09 Aug 2015)
*cdrtools-3.01_alpha24 (09 Aug 2015)
*cdrtools-3.01_alpha17 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+cdrtools-3.01_alpha17.ebuild, +cdrtools-3.01_alpha24.ebuild,
+cdrtools-3.01_alpha30.ebuild, +metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
*cdrtools-3.01_alpha31 (02 Sep 2015)
02 Sep 2015; Daniel Pielmeier <billie@gentoo.org>
+cdrtools-3.01_alpha31.ebuild:
Version bump
Package-Manager: portage-2.2.20.1
28 Sep 2015; Daniel Pielmeier <billie@gentoo.org>
-cdrtools-3.01_alpha30.ebuild:
Remove old.
Package-Manager: portage-2.2.20.1
*cdrtools-3.02_alpha02 (25 Nov 2015)
25 Nov 2015; Daniel Pielmeier <billie@gentoo.org>
+cdrtools-3.02_alpha02.ebuild:
Version bump.
Package-Manager: portage-2.2.20.1
*cdrtools-3.02_alpha05 (24 Jan 2016)
24 Jan 2016; Daniel Pielmeier <billie@gentoo.org>
cdrtools-3.01_alpha17.ebuild, cdrtools-3.01_alpha24.ebuild,
cdrtools-3.01_alpha31.ebuild, cdrtools-3.02_alpha02.ebuild,
+cdrtools-3.02_alpha05.ebuild:
Version bump.
Package-Manager: portage-2.2.26
24 Jan 2016; Daniel Pielmeier <billie@gentoo.org>
-cdrtools-3.01_alpha31.ebuild:
Remove old.
Package-Manager: portage-2.2.26
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
*cdrtools-3.02_alpha06 (13 Feb 2016)
13 Feb 2016; Daniel Pielmeier <billie@gentoo.org>
+cdrtools-3.02_alpha06.ebuild:
Version bump.
Package-Manager: portage-2.2.26
13 Feb 2016; Daniel Pielmeier <billie@gentoo.org>
-cdrtools-3.02_alpha02.ebuild:
Remove old.
Package-Manager: portage-2.2.26
03 Apr 2016; Daniel Pielmeier <billie@gentoo.org>
-cdrtools-3.02_alpha05.ebuild:
Remove old.
Package-Manager: portage-2.2.26
09 Apr 2016; Anthony G. Basile <blueness@gentoo.org>
cdrtools-3.02_alpha06.ebuild, +files/cdrtools-fix-clone-uclibc.patch:
avoid clash with clone() on uclibc, bug #486782
Package-Manager: portage-2.2.26
17 Apr 2016; Patrice Clement <monsieurp@gentoo.org> metadata.xml:
Fix metadata.xml file.
Package-Manager: portage-2.2.26
07 May 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Add missing upstream maintainer's name
13 May 2016; Agostino Sarubbo <ago@gentoo.org> cdrtools-3.02_alpha06.ebuild:
amd64 stable wrt bug #581286
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
17 May 2016; Markus Meier <maekke@gentoo.org> cdrtools-3.02_alpha06.ebuild:
arm stable, bug #581286
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"
24 May 2016; Jeroen Roovers <jer@gentoo.org> cdrtools-3.02_alpha06.ebuild:
Stable for HPPA PPC64 (bug #581286).
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches
31 May 2016; Tobias Klausmann <klausman@gentoo.org>
cdrtools-3.02_alpha06.ebuild:
3.02_alpha06-r0: add alpha keyword
Gentoo-Bug: 581286
Package-Manager: portage-2.3.0_rc1

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1 @@
AUX cdrtools-fix-clone-uclibc.patch 2582 SHA256 e79031d3a1152792ffa62fbd860eaff639f02d966cae76527c519a60b21bd02d SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077 WHIRLPOOL 45b81f0872378072187f2f562f0e4d07ee88e04b986cfbbfd57838e24001a67e00868bc20d09ee041300b70f8644afd8ca7dbe0158057a63238bb21fea8ddd42 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
DIST cdrtools-3.02a06.tar.bz2 2117648 SHA256 ed79ab99414352ea9305163660b52b6a82394466bae03aebdbe2150997835eb1 SHA512 31a0743e39513841e77dcaaa52d746cafc0867ba01d46d43310f89e4ef2a0759fcac2e812aa323854daaa9a5ce8627c0612b8e461072a6066c20883ebe639c0c WHIRLPOOL 6358a39ee1fd51be417d3bb21ba7b43b8ee9b6dd71c925b7a1a8bc6f402380804f761749b3c912fc9f4a3e4d49bb4988441c3348ccfcc794847be8f0444628c9
EBUILD cdrtools-3.01_alpha17.ebuild 5122 SHA256 657c7e2eb0c074b124f934f94cbdb0280d21849aa9df68cdd9eda241d491d1c2 SHA512 f051206954a3ae51f004e47290768c0099678c124170a603e2de04e3b2625b7e10e0c963ec96289597f62df7acfd5fd6156b1624dfae3fc60cd81bc1a4c9b930 WHIRLPOOL fb32a4340117d6f02e6a23d73e33b9343b8074fc8ae0512b42d13750f894fab6ea0d6ed62af4c0a0b04b71ce2eb331f63ccdd113a47409763663f8506d11f7ab
EBUILD cdrtools-3.01_alpha24.ebuild 7871 SHA256 7a302b1f7c5fe5c80afeab874542bbec358da826404676563aec498ff4ada20e SHA512 91d115ad8dfbe7344dc1f823e079c60e99e9c7bb365636f29b76c59ae3abcf9761aa103d6f62483fb0c087b2fa8668155bb089598cedfe2db7104a375b161527 WHIRLPOOL d3505749b69979d6fb9a6db611c86b98631bbae546d290b0b4a531a21e562d4b335255514d495c11c02e5ed24b8b02d31992edb7096dac8437745e6a36361d82
EBUILD cdrtools-3.02_alpha06.ebuild 8171 SHA256 5105afa57c00e933874bf40b852e8730926bf6604f3e1bc5c3db567676756314 SHA512 e3562adee05e5bf536dbb7ddb223c174427084ceaa9512f2a4008e34e5b26a8b3a270dcb65516aee090a3341f5d037af8d9e9ab0de2b2b53ed143034edf4b7d5 WHIRLPOOL 441319a21ab3e38439280c87382f165f8b5fd26bba84fda334bac661fcf13d386317697b66e7c3dfa34847933b34096256e232a58a1e2c867f1c6f41fd40c397
MISC ChangeLog 5195 SHA256 2b32fc2e1de52afca41ab7826118e84465787ebe1e2d07c42b020e58e6a39066 SHA512 4847ce231500b15680eab748225afb3667f27ff0e565abc4e109cec8fea688414a716f2a9aedff5c5831da54e7b58b91a6afa182216bb1418a8b54c5bb63aa1b WHIRLPOOL 4c93027080200fc77589ece218eca81b448df53be8483fbdec06860feb835d6bc50cde73e7218a32875040c921e6f824b991df9b241128f454cae88ec26bc235
MISC ChangeLog-2015 54810 SHA256 a24781a62f564903e5d421a02178b731f592dd3053e4465084755b87e3405fba SHA512 ebe4c18329c93d9811cfdd2f320b45337fa3840dfdd28931502c24621d9bb714334396cb75753a52a5187fbab75a6b915bac8b9497bd8ef3d323e11146e42a04 WHIRLPOOL 9b9e8ec0905e88df239fda6a25e8c9c87de026b78969488c4ee9076886308d665f39d4743f6b702486e847fccc3f2bfbe15dae2f8b362ee967d4887400957416
MISC metadata.xml 533 SHA256 de2b429bb77ad70e4cea960e60a0c6030e2e227c74f1d51c5ef6aed451a8dc7d SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818 WHIRLPOOL 0d599d804246578c0fd2aae8023dded4afe75114c0e296c5335b3c12992b6d85c3a0202ec90b5dcff30795bbf44f6b98cffb69af6471e55a5326b4b575c2a54c

View File

@ -1,166 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
MY_P="${P/_alpha/a}"
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
SRC_URI="mirror://sourceforge/${PN}/$([[ -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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl )
caps? ( sys-libs/libcap )
nls? ( virtual/libintl )
!app-cdr/cdrkit"
DEPEND="${RDEPEND}
x11-misc/makedepend
nls? ( >=sys-devel/gettext-0.18.1.1 )"
S=${WORKDIR}/${P/_alpha[0-9][0-9]}
FILECAPS=(
cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
)
src_prepare() {
gnuconfig_update
# Remove profiled make files.
find -name '*_p.mk' -delete
# 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 armv5tel 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"
[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
sed -i \
-e "s:/opt/schily:/usr:g" \
-e "s:/usr/src/linux/include::g" \
-e "s:bin:root:g" \
-e '/^DEFUMASK/s,002,022,g' \
Defaults.${os} || die "sed Schily make setup"
# re DEFUMASK above:
# bug 486680: grsec TPE will block the exec if the directory is
# group-writable. This is painful with cdrtools, because it makes a bunch of
# group-writable directories during build. Change the umask on their
# creation to prevent this.
}
# 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 caps; then
CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
fi
if ! use acl; then
CFLAGS="${CFLAGS} -DNO_ACL"
fi
# If not built with -j1, "sometimes" cdda2wav will not be built.
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
LDOPTX="${LDFLAGS}" \
INS_BASE="${ED}/usr" INS_RBASE="${ED}" 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="${ED}/usr" INS_RBASE="${ED}" 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 "${ED}"/usr/share/man/man5
}
pkg_postinst() {
fcaps_pkg_postinst
if [[ ${CHOST} == *-darwin* ]] ; then
einfo
einfo "Darwin/OS X use the following device names:"
einfo
einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
einfo
einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
einfo
fi
}

View File

@ -1,29 +1,34 @@
# Copyright 1999-2016 Gentoo Foundation # Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5 EAPI=7
inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig inherit fcaps toolchain-funcs flag-o-matic gnuconfig
MY_P="${P/_alpha/a}" MY_P="${P/_alpha/a}"
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
HOMEPAGE="http://sourceforge.net/projects/cdrtools/" HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2" SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode" IUSE="acl caps nls unicode selinux"
RDEPEND="acl? ( virtual/acl ) BDEPEND="
nls? ( >=sys-devel/gettext-0.18.1.1 )
x11-misc/makedepend
"
RDEPEND="
acl? ( virtual/acl )
caps? ( sys-libs/libcap ) caps? ( sys-libs/libcap )
nls? ( virtual/libintl ) nls? ( virtual/libintl )
!app-cdr/cdrkit" selinux? ( sec-policy/selinux-cdrecord )
DEPEND="${RDEPEND} "
x11-misc/makedepend DEPEND="
nls? ( >=sys-devel/gettext-0.18.1.1 )" ${RDEPEND}
"
S=${WORKDIR}/${P/_alpha[0-9][0-9]} S=${WORKDIR}/${P/_alpha[0-9][0-9]}
@ -36,15 +41,16 @@ FILECAPS=(
cdrtools_os() { cdrtools_os() {
local os="linux" local os="linux"
[[ ${CHOST} == *-darwin* ]] && os="mac-os10" [[ ${CHOST} == *-darwin* ]] && os="mac-os10"
[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
echo "${os}" echo "${os}"
} }
src_prepare() { src_prepare() {
default
gnuconfig_update gnuconfig_update
# Remove profiled make files. # Remove profiled make files.
find -name '*_p.mk' -delete find -name '*_p.mk' -delete || die "delete *_p.mk"
# Adjusting hardcoded paths. # Adjusting hardcoded paths.
sed -i -e "s|opt/schily|usr|" \ sed -i -e "s|opt/schily|usr|" \
@ -65,10 +71,19 @@ src_prepare() {
$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
|| die "sed rules" || die "sed rules"
# Enable verbose build.
sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
RULES/*.rul RULES/rules.prg RULES/rules.inc \
|| die "sed verbose rules"
# Respect CC/CXX variables. # Respect CC/CXX variables.
cd "${S}"/RULES cd "${S}"/RULES || die
local tcCC=$(tc-getCC) local tcCC=$(tc-getCC)
local tcCXX=$(tc-getCXX) local tcCXX=$(tc-getCXX)
# fix RISC-V build err, bug 811375
ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
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" rules1.top || die "sed rules1.top"
sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
@ -79,12 +94,8 @@ src_prepare() {
sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
rules.cnf || die "sed rules.cnf" rules.cnf || die "sed rules.cnf"
# Add support for arm64
ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
# Schily make setup. # Schily make setup.
cd "${S}"/DEFAULTS cd "${S}"/DEFAULTS || die
local os=$(cdrtools_os) local os=$(cdrtools_os)
sed -i \ sed -i \
@ -129,6 +140,12 @@ ac_cv_sizeof() {
} }
src_configure() { src_configure() {
use acl || export ac_cv_header_sys_acl_h="no"
use caps || export ac_cv_lib_cap_cap_get_proc="no"
export ac_cv_header_pulse_pulseaudio_h="no"
export ac_cv_header_alsa_asoundlib_h="no"
export ac_cv_lib_asound_snd_pcm_open="no"
# skip obsolete configure script # skip obsolete configure script
if tc-is-cross-compiler ; then if tc-is-cross-compiler ; then
# Cache known values for targets. #486680 # Cache known values for targets. #486680
@ -218,14 +235,6 @@ src_compile() {
fi fi
fi fi
if ! use caps; then
CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
fi
if ! use acl; then
CFLAGS="${CFLAGS} -DNO_ACL"
fi
# If not built with -j1, "sometimes" cdda2wav will not be built. # If not built with -j1, "sometimes" cdda2wav will not be built.
emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
@ -242,16 +251,16 @@ src_install() {
dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
cd "${S}"/cdda2wav cd "${S}"/cdda2wav || die
docinto cdda2wav docinto cdda2wav
dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
cd "${S}"/mkisofs cd "${S}"/mkisofs || die
docinto mkisofs docinto mkisofs
dodoc ChangeLog* TODO dodoc ChangeLog* TODO
# Remove man pages related to the build system # Remove man pages related to the build system
rm -rvf "${ED}"/usr/share/man/man5 rm -rvf "${ED}"/usr/share/man/man5 || die
} }
pkg_postinst() { pkg_postinst() {

View File

@ -0,0 +1,287 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit fcaps toolchain-funcs flag-o-matic gnuconfig
MY_P="${P/_alpha/a}"
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode selinux"
BDEPEND="
nls? ( >=sys-devel/gettext-0.18.1.1 )
x11-misc/makedepend
"
RDEPEND="
acl? ( virtual/acl )
caps? ( sys-libs/libcap )
nls? ( virtual/libintl )
selinux? ( sec-policy/selinux-cdrecord )
"
DEPEND="
${RDEPEND}
"
S=${WORKDIR}/${P/_alpha[0-9][0-9]}
FILECAPS=(
cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
)
cdrtools_os() {
local os="linux"
[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
echo "${os}"
}
src_prepare() {
default
gnuconfig_update
# Remove profiled make files.
find -name '*_p.mk' -delete || die "delete *_p.mk"
# 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"
# Enable verbose build.
sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
RULES/*.rul RULES/rules.prg RULES/rules.inc \
|| die "sed verbose rules"
# Respect CC/CXX variables.
cd "${S}"/RULES || die
local tcCC=$(tc-getCC)
local tcCXX=$(tc-getCXX)
# fix RISC-V build err, bug 811375
ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
rules1.top || die "sed rules1.top"
sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-e "/COPTOPT=/s|-O||" \
-e 's|$(GCCOPTOPT)||' \
cc-gcc.rul || die "sed cc-gcc.rul"
sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
rules.cnf || die "sed rules.cnf"
# Add support for arm64
ln -sf i586-linux-cc.rul aarch64_be-linux-cc.rul
ln -sf i586-linux-clang.rul aarch64_be-linux-clang.rul
ln -sf i586-linux-clang32.rul aarch64_be-linux-clang32.rul
ln -sf i586-linux-clang64.rul aarch64_be-linux-clang64.rul
ln -sf i586-linux-gcc.rul aarch64_be-linux-gcc.rul
ln -sf i586-linux-gcc32.rul aarch64_be-linux-gcc32.rul
ln -sf i586-linux-gcc64.rul aarch64_be-linux-gcc64.rul
# Schily make setup.
cd "${S}"/DEFAULTS || die
local os=$(cdrtools_os)
sed -i \
-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-e "s|^\(LDPATH=\).*|\1|" \
-e "s|^\(RUNPATH=\).*|\1|" \
-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-e '/^DEFUMASK/s,002,022,g' \
Defaults.${os} || die "sed Schily make setup"
# re DEFUMASK above:
# bug 486680: grsec TPE will block the exec if the directory is
# group-writable. This is painful with cdrtools, because it makes a bunch of
# group-writable directories during build. Change the umask on their
# creation to prevent this.
}
ac_cv_sizeof() {
cat <<-EOF >"${T}"/test.c
#include <inttypes.h>
#include <stddef.h>
#include <stdint.h>
#include <sys/types.h>
int main () {
static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
test_array [0] = 0;
return test_array [0];
}
EOF
local i=1
while [[ ${i} -lt 20 ]] ; do
if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
echo ${i}
return 0
fi
: $(( i += 1 ))
done
return 1
}
src_configure() {
use acl || export ac_cv_header_sys_acl_h="no"
use caps || export ac_cv_lib_cap_cap_get_proc="no"
export ac_cv_header_pulse_pulseaudio_h="no"
export ac_cv_header_alsa_asoundlib_h="no"
export ac_cv_lib_asound_snd_pcm_open="no"
# skip obsolete configure script
if tc-is-cross-compiler ; then
# Cache known values for targets. #486680
tc-export CC
local var val t types=(
char "short int" int "long int" "long long"
"unsigned char" "unsigned short int" "unsigned int"
"unsigned long int" "unsigned long long"
float double "long double" size_t ssize_t ptrdiff_t
mode_t uid_t gid_t pid_t dev_t time_t wchar_t
"char *" "unsigned char *"
)
for t in "${types[@]}" ; do
var="ac_cv_sizeof_${t// /_}"
var=${var//[*]/p}
val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
export "${var}=${val}"
einfo "Computing sizeof(${t}) as ${val}"
done
# We don't have these types.
export ac_cv_sizeof___int64=0
export ac_cv_sizeof_unsigned___int64=0
export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
export ac_cv_type_prototypes="yes"
export ac_cv_func_mlock{,all}="yes"
export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
export ac_cv_func_dtoa_r="no"
export ac_cv_func_sys_siglist{,_def}="no"
export ac_cv_func_printf_{j,ll}="yes"
export ac_cv_realloc_null="yes"
export ac_cv_no_user_malloc="no"
export ac_cv_var_timezone="yes"
export ac_cv_var___progname{,_full}="yes"
export ac_cv_fnmatch_igncase="yes"
export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
export ac_cv_file__usr_src_linux_include="no"
case $(cdrtools_os) in
linux)
export ac_cv_func_bsd_{g,s}etpgrp="no"
export ac_cv_hard_symlinks="yes"
export ac_cv_link_nofollow="yes"
export ac_cv_access_e_ok="no"
export ac_cv_dev_minor_noncontig="yes"
case ${ac_cv_sizeof_long_int} in
4) export ac_cv_dev_minor_bits="32";;
8) export ac_cv_dev_minor_bits="44";;
esac
cat <<-EOF >"${T}"/test.c
struct {
char start[6];
unsigned char x1:4;
unsigned char x2:4;
char end[5];
} a = {
.start = {'S', 't', 'A', 'r', 'T', '_'},
.x1 = 5,
.x2 = 4,
.end = {'_', 'e', 'N', 'd', 'X'},
};
EOF
${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
export ac_cv_c_bitfields_htol="no"
elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
export ac_cv_c_bitfields_htol="yes"
fi
;;
esac
fi
}
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 not built with -j1, "sometimes" cdda2wav will not be built.
emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
}
src_install() {
# If not built with -j1, "sometimes" manpages are not installed.
emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
LDOPTX="${LDFLAGS}" 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 || die
docinto cdda2wav
dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
cd "${S}"/mkisofs || die
docinto mkisofs
dodoc ChangeLog* TODO
# Remove man pages related to the build system
rm -rvf "${ED}"/usr/share/man/man5 || die
}
pkg_postinst() {
fcaps_pkg_postinst
if [[ ${CHOST} == *-darwin* ]] ; then
einfo
einfo "Darwin/OS X use the following device names:"
einfo
einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
einfo
einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
einfo
fi
}

View File

@ -1,26 +1,24 @@
# Copyright 1999-2016 Gentoo Foundation # Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5 EAPI=6
inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig inherit fcaps toolchain-funcs flag-o-matic gnuconfig
MY_P="${P/_alpha/a}" MY_P="${P/_alpha/a}"
DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
HOMEPAGE="http://sourceforge.net/projects/cdrtools/" HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2" SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0" SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode" IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl ) RDEPEND="acl? ( virtual/acl )
caps? ( sys-libs/libcap ) caps? ( sys-libs/libcap )
nls? ( virtual/libintl ) nls? ( virtual/libintl )"
!app-cdr/cdrkit"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
x11-misc/makedepend x11-misc/makedepend
nls? ( >=sys-devel/gettext-0.18.1.1 )" nls? ( >=sys-devel/gettext-0.18.1.1 )"
@ -36,20 +34,16 @@ FILECAPS=(
cdrtools_os() { cdrtools_os() {
local os="linux" local os="linux"
[[ ${CHOST} == *-darwin* ]] && os="mac-os10" [[ ${CHOST} == *-darwin* ]] && os="mac-os10"
[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
echo "${os}" echo "${os}"
} }
src_prepare() { src_prepare() {
default
gnuconfig_update gnuconfig_update
# This fixes a clash with clone() on uclibc. Upstream isn't
# going to include this so let's try to carry it forward.
# Contact me if it needs updating. Bug #486782.
# Anthony G. Basile <blueness@gentoo.org>.
# Remove profiled make files. # Remove profiled make files.
find -name '*_p.mk' -delete find -name '*_p.mk' -delete || die "delete *_p.mk"
# Adjusting hardcoded paths. # Adjusting hardcoded paths.
sed -i -e "s|opt/schily|usr|" \ sed -i -e "s|opt/schily|usr|" \
@ -76,7 +70,7 @@ src_prepare() {
|| die "sed verbose rules" || die "sed verbose rules"
# Respect CC/CXX variables. # Respect CC/CXX variables.
cd "${S}"/RULES cd "${S}"/RULES || die
local tcCC=$(tc-getCC) local tcCC=$(tc-getCC)
local tcCXX=$(tc-getCXX) 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}|" \
@ -90,7 +84,7 @@ src_prepare() {
rules.cnf || die "sed rules.cnf" rules.cnf || die "sed rules.cnf"
# Schily make setup. # Schily make setup.
cd "${S}"/DEFAULTS cd "${S}"/DEFAULTS || die
local os=$(cdrtools_os) local os=$(cdrtools_os)
sed -i \ sed -i \
@ -137,6 +131,7 @@ ac_cv_sizeof() {
src_configure() { src_configure() {
use acl || export ac_cv_header_sys_acl_h="no" use acl || export ac_cv_header_sys_acl_h="no"
use caps || export ac_cv_lib_cap_cap_get_proc="no" use caps || export ac_cv_lib_cap_cap_get_proc="no"
export ac_cv_header_pulse_pulseaudio_h="no"
# skip obsolete configure script # skip obsolete configure script
if tc-is-cross-compiler ; then if tc-is-cross-compiler ; then
@ -243,16 +238,16 @@ src_install() {
dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
cd "${S}"/cdda2wav cd "${S}"/cdda2wav || die
docinto cdda2wav docinto cdda2wav
dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
cd "${S}"/mkisofs cd "${S}"/mkisofs || die
docinto mkisofs docinto mkisofs
dodoc ChangeLog* TODO dodoc ChangeLog* TODO
# Remove man pages related to the build system # Remove man pages related to the build system
rm -rvf "${ED}"/usr/share/man/man5 rm -rvf "${ED}"/usr/share/man/man5 || die
} }
pkg_postinst() { pkg_postinst() {

View File

@ -1,69 +0,0 @@
diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
--- cdrtools-3.02.orig/readcd/readcd.c 2016-01-24 11:15:19.000000000 -0500
+++ cdrtools-3.02/readcd/readcd.c 2016-04-09 12:29:54.727635502 -0400
@@ -257,7 +257,7 @@
BOOL pifscan;
BOOL plot;
BOOL fulltoc;
-BOOL clone;
+BOOL clonetoc;
BOOL edc_corr;
BOOL noerror;
BOOL nocorr;
@@ -294,7 +294,7 @@
error(_("\t-plot Print data suitable for gnuplot\n"));
#ifdef CLONE_WRITE
error(_("\t-fulltoc Retrieve the full TOC\n"));
- error(_("\t-clone Retrieve the full TOC and all data\n"));
+ error(_("\t-clonetoc Retrieve the full TOC and all data\n"));
error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n"));
#endif
error(_("\ttimeout=# set the default SCSI command timeout to #.\n"));
@@ -320,7 +320,7 @@
}
/* CSTYLED */
-char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
+char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
EXPORT int
main(ac, av)
@@ -397,7 +397,7 @@
&scanbus, &dev, &scgopts, &sectors, &do_write,
&c2scan, &cxscan, &pi8scan, &pifscan,
&plot,
- &fulltoc, &clone,
+ &fulltoc, &clonetoc,
&edc_corr,
&noerror, &nocorr,
&notrunc, &retries, &do_factor, &filename,
@@ -679,7 +679,7 @@
if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
meshpoints || fulltoc ||
- clone || edc_corr) {
+ clonetoc || edc_corr) {
dorw(scgp, filename, sectors);
} else {
doit(scgp);
@@ -894,9 +894,9 @@
if (params.name == NULL)
params.name = "/dev/null";
read_ftoc(scgp, &params, FALSE);
- } else if (clone || edc_corr) {
+ } else if (clonetoc || edc_corr) {
if (!is_mmc(scgp, NULL, NULL))
- comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
+ comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
if (!edc_corr)
noerror = TRUE;
if (retries == MAX_RETRY)
@@ -904,7 +904,7 @@
if (params.name == NULL)
params.name = "/dev/null";
- if (clone)
+ if (clonetoc)
if (read_ftoc(scgp, &params, TRUE) < 0)
comerrno(EX_BAD, _("Read fulltoc problems.\n"));
readcd_disk(scgp, &params);

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<maintainer type="person"> <maintainer type="person">
<email>billie@gentoo.org</email> <email>billie@gentoo.org</email>
@ -12,5 +12,4 @@
</maintainer> </maintainer>
<remote-id type="sourceforge">cdrtools</remote-id> <remote-id type="sourceforge">cdrtools</remote-id>
</upstream> </upstream>
<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
</pkgmetadata> </pkgmetadata>