[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/files/, app-cdr/dvd+rw-tools/

[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/files/, app-cdr/dvd+rw-tools/

[Mike Frysinger]

commit:     ecf086834103c1d9ebbc989b292f91e83ce34079
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 02:30:54 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 02:31:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf08683

app-cdr/dvd+rw-tools: fix build w/newer glibc

 app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild             |  1 +
 app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
index 9cb5333..00729c4 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
@@ -23,6 +23,7 @@ src_prepare() {
 	# Linux compiler flags only include -O2 and are incremental
 	sed -i '/FLAGS/s:-O2::' Makefile.m4
 
+	epatch "${FILESDIR}"/${PN}-7.0-sysmacros.patch
 	# Fix compilation when DFORTIFY_SOURCE=2
 	# https://bugs.gentoo.org/257360
 	# https://bugzilla.redhat.com/show_bug.cgi?id=426068

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch
new file mode 100644
index 0000000..b65c4c9
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch
@@ -0,0 +1,12 @@
+include sysmacros.h explicitly for major()/minor()/etc...
+
+--- a/growisofs.c
++++ b/growisofs.c
+@@ -408,6 +408,7 @@
+ # ifndef _GNU_SOURCE
+ #  define _GNU_SOURCE
+ # endif
++# include <sys/sysmacros.h>
+ #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || \
+       (defined(__APPLE__) && defined(__MACH__))
+ # define off64_t	off_t

[gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/files/, app-cdr/dvd+rw-tools/

[Michael Palimaka]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 4003 bytes --]

commit:     b510df361241e8f16314b1f14642305f0111dac6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 03:58:54 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 04:00:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b510df36

app-cdr/dvd+rw-tools: remove 7.1-r1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild    | 52 ----------------------
 .../files/dvd+rw-tools-7.0-dvddl.patch             | 13 ------
 .../files/dvd+rw-tools-7.0-wctomb.patch            | 11 -----
 3 files changed, 76 deletions(-)

diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
deleted file mode 100644
index 4b988db10ad..00000000000
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-src_prepare() {
-	# Linux compiler flags only include -O2 and are incremental
-	sed -i '/FLAGS/s:-O2::' Makefile.m4
-
-	epatch "${FILESDIR}"/${PN}-7.0-sysmacros.patch
-	# Fix compilation when DFORTIFY_SOURCE=2
-	# https://bugs.gentoo.org/257360
-	# https://bugzilla.redhat.com/show_bug.cgi?id=426068
-	epatch "${FILESDIR}"/${PN}-7.0-wctomb.patch
-	epatch "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
-	# Allow burning small images on dvd-dl media.
-	# Patch snatched from Fedora, obviously correct.
-	epatch "${FILESDIR}"/${PN}-7.0-dvddl.patch
-	# Exit with non-zero status when child process does.
-	# https://bugzilla.redhat.com/show_bug.cgi?id=243036
-	epatch "${FILESDIR}"/${PN}-7.0-wexit.patch
-}
-
-src_compile() {
-	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install || die
-	dohtml index.html
-}
-
-pkg_postinst() {
-	elog "When you run growisofs if you receive:"
-	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
-	elog "error message please run 'ulimit -l unlimited'"
-}

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
deleted file mode 100644
index c1c6fb3332a..00000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
-+++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
-@@ -1412,9 +1412,7 @@
-     blocks += 15, blocks &= ~15;
- 
-     if (blocks <= split)
--	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
--			"    use single layer media for this recording\n"),
--	exit (FATAL_START(EMEDIUMTYPE));
-+	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
- 
-     blocks /= 16;
-     blocks += 1;

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
deleted file mode 100644
index 56bd72575e8..00000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- transport.hxx~	2008-03-25 21:24:47.000000000 -0400
-+++ transport.hxx	2008-03-25 21:25:36.000000000 -0400
-@@ -116,7 +116,7 @@
- extern "C" char *plusminus_locale()
- { static class __plusminus {
-     private:
--	char str[4];
-+	char str[MB_LEN_MAX];
-     public:
- 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
- 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');