1 |
commit: 33e1efb78282e59c62628e27429c0aa6b9976dc9 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 15:17:58 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 15:17:58 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e1efb7 |
7 |
|
8 |
app-cdr/dvd+rw-tools: new revision with EAPI=6 to fix a bug. |
9 |
|
10 |
A new revision was in order to fix bug 440426 and only show a ulimit |
11 |
warning for new installs. It made sense to update to EAPI=6 for the |
12 |
new revision, and that simplified the ebuild a bit. To use the EAPI=6 |
13 |
PATCHES support, two patches had to be revisioned to be -p1 |
14 |
compatible. Theoretically they could have been modified in-place |
15 |
(since epatch autodetects the -pN level), but since that would affect |
16 |
a stable ebuild, I avoided it. |
17 |
|
18 |
Gentoo-Bug: 440426 |
19 |
|
20 |
Package-Manager: portage-2.2.28 |
21 |
|
22 |
app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild | 51 ++++++++++++++++++++++ |
23 |
.../files/dvd+rw-tools-7.0-dvddl-r1.patch | 13 ++++++ |
24 |
.../files/dvd+rw-tools-7.0-wctomb-r1.patch | 11 +++++ |
25 |
3 files changed, 75 insertions(+) |
26 |
|
27 |
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild |
28 |
new file mode 100644 |
29 |
index 0000000..f2abcae |
30 |
--- /dev/null |
31 |
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild |
32 |
@@ -0,0 +1,51 @@ |
33 |
+# Copyright 1999-2016 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+# $Id$ |
36 |
+ |
37 |
+EAPI=6 |
38 |
+ |
39 |
+inherit toolchain-funcs |
40 |
+ |
41 |
+DESCRIPTION="A set of tools for DVD+RW/-RW drives" |
42 |
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/" |
43 |
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" |
44 |
+ |
45 |
+LICENSE="GPL-2" |
46 |
+SLOT="0" |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
48 |
+IUSE="" |
49 |
+ |
50 |
+RDEPEND="virtual/cdrtools" |
51 |
+DEPEND="${RDEPEND} |
52 |
+ sys-devel/m4" |
53 |
+ |
54 |
+PATCHES=( |
55 |
+ "${FILESDIR}"/${PN}-7.0-sysmacros.patch |
56 |
+ "${FILESDIR}"/${PN}-7.0-wctomb-r1.patch |
57 |
+ "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch |
58 |
+ "${FILESDIR}"/${PN}-7.0-dvddl-r1.patch |
59 |
+ "${FILESDIR}"/${PN}-7.0-wexit.patch |
60 |
+) |
61 |
+ |
62 |
+src_prepare() { |
63 |
+ # Linux compiler flags only include -O2 and are incremental. |
64 |
+ sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS" |
65 |
+ default |
66 |
+} |
67 |
+ |
68 |
+src_compile() { |
69 |
+ emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
70 |
+} |
71 |
+ |
72 |
+src_install() { |
73 |
+ emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install |
74 |
+ dodoc index.html |
75 |
+} |
76 |
+ |
77 |
+pkg_postinst() { |
78 |
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then |
79 |
+ elog 'If you receive an error, "unable to anonymously mmap...' |
80 |
+ elog 'Resource temporarily unavailable" when running growisofs,' |
81 |
+ elog 'then you may need to run "ulimit -l unlimited".' |
82 |
+ fi |
83 |
+} |
84 |
|
85 |
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch |
86 |
new file mode 100644 |
87 |
index 0000000..8975b04 |
88 |
--- /dev/null |
89 |
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch |
90 |
@@ -0,0 +1,13 @@ |
91 |
+--- a/growisofs_mmc.cpp 2006-04-27 20:45:00.788446635 +0200 |
92 |
++++ b/growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200 |
93 |
+@@ -1412,9 +1412,7 @@ |
94 |
+ blocks += 15, blocks &= ~15; |
95 |
+ |
96 |
+ if (blocks <= split) |
97 |
+- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n" |
98 |
+- " use single layer media for this recording\n"), |
99 |
+- exit (FATAL_START(EMEDIUMTYPE)); |
100 |
++ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n"); |
101 |
+ |
102 |
+ blocks /= 16; |
103 |
+ blocks += 1; |
104 |
|
105 |
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch |
106 |
new file mode 100644 |
107 |
index 0000000..9a98897 |
108 |
--- /dev/null |
109 |
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch |
110 |
@@ -0,0 +1,11 @@ |
111 |
+--- a/transport.hxx 2008-03-25 21:24:47.000000000 -0400 |
112 |
++++ b/transport.hxx 2008-03-25 21:25:36.000000000 -0400 |
113 |
+@@ -116,7 +116,7 @@ |
114 |
+ extern "C" char *plusminus_locale() |
115 |
+ { static class __plusminus { |
116 |
+ private: |
117 |
+- char str[4]; |
118 |
++ char str[MB_LEN_MAX]; |
119 |
+ public: |
120 |
+ __plusminus() { setlocale(LC_CTYPE,ENV_LOCALE); |
121 |
+ int l = wctomb(str,(wchar_t)(unsigned char)'±'); |