Revert last commit since according to Ulrich Mueller suid root is also used for elevating scheduling priority.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 14 insertions, 149 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index a297e082a15a..e9a3ac813838 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.285 2012/01/28 01:51:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.286 2012/01/28 07:16:59 ssuominen Exp $
+
+  28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -cdrtools-3.01_alpha06-r1.ebuild:
+  Revert last commit since according to Ulrich Mueller suid root is also used
+  for elevating scheduling priority.
 
 *cdrtools-3.01_alpha06-r1 (28 Jan 2012)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 62478d147b91..247dc856c62b 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -6,18 +6,17 @@ DIST cdrtools-3.01a05.tar.bz2 2001070 RMD160 a3962ce855a52d9eb7f5d528e1d91226a77
 DIST cdrtools-3.01a06.tar.bz2 2026840 RMD160 abf83892bbea28906c88c1f109d42891dd34f721 SHA1 0001d0213dfe2c78c4b8b34288854c01c5387464 SHA256 d554429d62a38d5afff68cae35a44ee2f564ee8fedc4c2e73b28249d28b3e7a3
 EBUILD cdrtools-3.00.ebuild 4181 RMD160 cd282f91d5aea86d295dad57d8550b1e8ae9b247 SHA1 d8ca832a3ac7c1b9272ad6ba47911584ed5270f6 SHA256 3f960865bfde655f9b184638ff83a0b3f0314b2244c790f5049ff045a745bb9d
 EBUILD cdrtools-3.01_alpha05.ebuild 4164 RMD160 367c6dbdc29f6db72307f20fcf209633d828b8c8 SHA1 5206088d721db3306c34c48966dd484916ad05cc SHA256 465b3e9388a413d99f291b6ea567da753a2915ddaf4ca3b60b36cfb5b416bcc3
-EBUILD cdrtools-3.01_alpha06-r1.ebuild 4405 RMD160 96f91321a09d3a5678548241edab03111c64f1a3 SHA1 27204a5793770f3e44e9bd3150bb2e8e5fe1becb SHA256 251041e65abfab0b11439f9ef7014b68e2a3d861885e989cc987a82639c5cccf
 EBUILD cdrtools-3.01_alpha06.ebuild 4164 RMD160 371e778659559f5131ae61a7068eecf006e8d549 SHA1 b4d10a430204cdbcb7ddf55e0229004f30a42f9b SHA256 eb2ace49fc3f5c750383a437b144ae50122ddc42d01ccc9b5c44db7abfc857dc
-MISC ChangeLog 44496 RMD160 454bb0a0704aca3927c3a5837cee45b4669316fd SHA1 e32065be0210930e4711385e0420bcb235f5b529 SHA256 dcfac9adb56be369df7045abfe29006f933f6600a0a250e32053cb08f59e3ef7
+MISC ChangeLog 44702 RMD160 4bf55973c6cfc8ab526d899e19d7fe011167b486 SHA1 9b2bdd6e10b705b2243adf08ab2c5fa580c51fb5 SHA256 35cec33d74d7142cfbf32d976a9e0674ecc5c58c775ed71ebbc45fe8bf56db20
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPI1QWAAoJEEdUh39IaPFNFucIAIAq1RcN4Ek+HKPCak4UXfRh
-6khaqxAbXxyuFGeYhWCAIVh1WH0+7RWJRXAbS1eL9tAyV9IbZTXy0c8/ZghdkQZE
-ezHIcYrB3sKONj/FJrHDQ7cZETGllQGwbF7bwBDPkNduUvybVZ6OeMHObL+ivUjY
-7XFEYqPLPzeHUeu3MKvdrKMR/MSUxP/nq9+k8vmfyvsv9j3VN7uNKugWOYG6TqQV
-TSnPE5wpGWyyGUrWISgtOZAjQfrNF/NtBF9wF6X9/wBZHgjbC0KLV5vv85AAKODS
-kgJsXe2rIJ4WZSuWIzeyPFvk32tYpK5TCDQvILc1Ar7D9p10H8ucoze7Ahh3gs4=
-=242y
+iQEcBAEBAgAGBQJPI6BlAAoJEEdUh39IaPFNkM8H/29OC6UU6L49okkYzRBlKope
+YtRZntjYwImZseU0cCSq9jJ3jLeVQrZz1nkwrQojEUdtuOxFB8b8wRIOTt+ytPk+
+i/e/5VKtE5y2tB71nCDUZvcAt0lAUvf2VcdoeGSJhB7XrO+OUY/u49YBg0PigpTl
+7MwFRrJ+t+B1SWYzSpMJFVSwkWz2mq3mQ9y4BZ7Q9ry6Kd6oEZqg82qKOpMq73le
+IUxUTj5qyxGClCIy+8HGXhidneuufEQ7M6EygJvObxff7YzStZ3m0dG1ZWmqmqec
+e1+wurVmZYAHKA6xpHAuPc9G7oG8V73Cl1PJ3fRWJWquisq9+HTULzCZrianOSU=
+=labI
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha06-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha06-r1.ebuild
deleted file mode 100644
index fbc28ade6988..000000000000
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha06-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha06-r1.ebuild,v 1.1 2012/01/28 01:51:23 ssuominen Exp $
-
-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() {
-	# 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}|" \
-		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
-
-	# amd64-fbsd support
-	ln -s i386-freebsd-cc.rul amd64-freebsd-cc.rul || die
-	ln -s i386-freebsd-gcc.rul amd64-freebsd-gcc.rul || die
-
-	# 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
-
-	# Change from -rws--x--x to -rwx--s--x for udev users
-	if has_version sys-fs/udev; then
-		fowners root:disk /usr/bin/{cdda2wav,cdrecord,readcd} /usr/sbin/rscsi
-		fperms u-s,g+s /usr/bin/{cdda2wav,cdrecord,readcd} /usr/sbin/rscsi
-	fi
-}