1 |
commit: 8816a0853a4f55b5d4a6f75d1fd2ae20cc63b4eb |
2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
3 |
AuthorDate: Thu Aug 23 14:46:58 2012 +0000 |
4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
5 |
CommitDate: Thu Aug 23 14:46:58 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8816a085 |
7 |
|
8 |
remove cdrtools fixed in official tree, close bug #395163 |
9 |
|
10 |
--- |
11 |
app-cdr/cdrtools/Manifest | 3 - |
12 |
app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild | 133 -------------------- |
13 |
.../files/cdrtools-3.01_alpha07-fbsd.patch | 13 -- |
14 |
scripts/mkstages/stages_builder.sh | 2 +- |
15 |
4 files changed, 1 insertions(+), 150 deletions(-) |
16 |
|
17 |
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest |
18 |
deleted file mode 100644 |
19 |
index 56f4e2c..0000000 |
20 |
--- a/app-cdr/cdrtools/Manifest |
21 |
+++ /dev/null |
22 |
@@ -1,3 +0,0 @@ |
23 |
-AUX cdrtools-3.01_alpha07-fbsd.patch 487 RMD160 31633dd4c17378bb366348554a3e51a826ae0e48 SHA1 9221a81225c2dfcea8d27101298f5b50dad287e7 SHA256 25325ec1b193aa5c5f737918aa59dfff6c19dc62b095d7858fed11b039e79610 |
24 |
-DIST cdrtools-3.01a07.tar.bz2 2043525 RMD160 b8331d826bf64de8bd26c041624a3e41648b6952 SHA1 ee4b540e4897ee6637837a097658305d18345999 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428 |
25 |
-EBUILD cdrtools-3.01_alpha07.ebuild 4048 RMD160 e8b9ea26d71c1feff5c8412a535df25ab4ea5b57 SHA1 c9c2ae1fd147cc4dddbeb9b38ebaba5c270125c1 SHA256 2d85d25e875017a6ffb8e71c49da3392410fdec9031cc3b02f321fa50ebef068 |
26 |
|
27 |
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild |
28 |
deleted file mode 100644 |
29 |
index 042c1ac..0000000 |
30 |
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,133 +0,0 @@ |
33 |
-# Copyright 1999-2012 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
-# $Header: $ |
36 |
- |
37 |
-EAPI=4 |
38 |
- |
39 |
-inherit multilib eutils toolchain-funcs flag-o-matic |
40 |
- |
41 |
-MY_P="${P/_alpha/a}" |
42 |
- |
43 |
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" |
44 |
-HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html" |
45 |
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.tar.bz2" |
46 |
- |
47 |
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
50 |
-IUSE="acl unicode" |
51 |
- |
52 |
-DEPEND="acl? ( virtual/acl ) |
53 |
- >=sys-devel/gettext-0.18.1.1 |
54 |
- !app-cdr/cdrkit" |
55 |
-RDEPEND="${DEPEND}" |
56 |
- |
57 |
-S=${WORKDIR}/${P/_alpha[0-9][0-9]} |
58 |
- |
59 |
-src_prepare() { |
60 |
- use elibc_FreeBSD && epatch "${FILESDIR}"/${PN}-3.01_alpha07-fbsd.patch |
61 |
- |
62 |
- # Remove profiled make files. |
63 |
- rm -f $(find . -name '*_p.mk') || die "rm profiled" |
64 |
- |
65 |
- # Adjusting hardcoded paths. |
66 |
- sed -i -e 's:opt/schily:usr:' \ |
67 |
- $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ |
68 |
- || die "sed opt/schily" |
69 |
- |
70 |
- sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \ |
71 |
- $(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \ |
72 |
- || die "sed doc" |
73 |
- |
74 |
- # Respect libdir. |
75 |
- sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \ |
76 |
- $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ |
77 |
- || die "sed multilib" |
78 |
- |
79 |
- # Do not install static libraries. |
80 |
- sed -i -e 's:include\t\t.*rules.lib::' \ |
81 |
- $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ |
82 |
- || die "sed rules" |
83 |
- |
84 |
- # Respect CC/CXX variables. |
85 |
- cd "${S}"/RULES |
86 |
- local tcCC=$(tc-getCC) |
87 |
- local tcCXX=$(tc-getCXX) |
88 |
- sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ |
89 |
- rules1.top || die "sed rules1.top" |
90 |
- sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \ |
91 |
- -e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \ |
92 |
- -e "/COPTOPT=/s/-O//" \ |
93 |
- -e 's/$(GCCOPTOPT)//' \ |
94 |
- cc-gcc.rul || die "sed cc-gcc.rul" |
95 |
- sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \ |
96 |
- rules.cnf || die "sed rules.cnf" |
97 |
- |
98 |
- # Create additional symlinks needed for some archs (armv4l already created) |
99 |
- local t |
100 |
- for t in armv4tl armv5l armv5tel armv6l armv7l ppc64 s390x; do |
101 |
- ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die |
102 |
- ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die |
103 |
- done |
104 |
- |
105 |
- # Schily make setup. |
106 |
- cd "${S}"/DEFAULTS |
107 |
- local os="linux" |
108 |
- |
109 |
- sed -i \ |
110 |
- -e "s:/opt/schily:/usr:g" \ |
111 |
- -e "s:/usr/src/linux/include::g" \ |
112 |
- -e "s:bin:root:g" \ |
113 |
- Defaults.${os} || die "sed Schily make setup" |
114 |
-} |
115 |
- |
116 |
-# skip obsolete configure script |
117 |
-src_configure() { : ; } |
118 |
- |
119 |
-src_compile() { |
120 |
- if use unicode; then |
121 |
- local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" |
122 |
- if [[ -n ${flags} ]]; then |
123 |
- append-flags ${flags} |
124 |
- else |
125 |
- ewarn "Your compiler does not support the options required to build" |
126 |
- ewarn "cdrtools with unicode in USE. unicode flag will be ignored." |
127 |
- fi |
128 |
- fi |
129 |
- |
130 |
- if ! use acl; then |
131 |
- CFLAGS="${CFLAGS} -DNO_ACL" |
132 |
- fi |
133 |
- |
134 |
- # LIB_ACL_TEST removed to support x86-fbsd |
135 |
- # If not built with -j1, "sometimes" cdda2wav will not be built. |
136 |
- emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ |
137 |
- LDOPTX="${LDFLAGS}" \ |
138 |
- INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \ |
139 |
- RUNPATH="" GMAKE_NOWARN="true" |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- # If not built with -j1, "sometimes" manpages are not installed. |
144 |
- emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ |
145 |
- LDOPTX="${LDFLAGS}" \ |
146 |
- INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \ |
147 |
- RUNPATH="" GMAKE_NOWARN="true" install |
148 |
- |
149 |
- # These symlinks are for compat with cdrkit. |
150 |
- dosym schily /usr/include/scsilib |
151 |
- dosym ../scg /usr/include/schily/scg |
152 |
- |
153 |
- dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux |
154 |
- |
155 |
- cd "${S}"/cdda2wav |
156 |
- docinto cdda2wav |
157 |
- dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO |
158 |
- |
159 |
- cd "${S}"/mkisofs |
160 |
- docinto mkisofs |
161 |
- dodoc ChangeLog* TODO |
162 |
- |
163 |
- # Remove man pages related to the build system |
164 |
- rm -rvf "${D}"/usr/share/man/man5 |
165 |
-} |
166 |
|
167 |
diff --git a/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch b/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch |
168 |
deleted file mode 100644 |
169 |
index 2689074..0000000 |
170 |
--- a/app-cdr/cdrtools/files/cdrtools-3.01_alpha07-fbsd.patch |
171 |
+++ /dev/null |
172 |
@@ -1,13 +0,0 @@ |
173 |
-diff --git a/libschily/shlschily.mk b/libschily/shlschily.mk |
174 |
-index 3280b39..ea92050 100644 |
175 |
---- a/libschily/shlschily.mk |
176 |
-+++ b/libschily/shlschily.mk |
177 |
-@@ -14,7 +14,7 @@ CPPOPTS += -Istdio |
178 |
- CPPOPTS += -DUSE_SCANSTACK # Try to scan stack frames |
179 |
- CPPOPTS += -DPORT_ONLY # Add missing funcs line snprintf for porting |
180 |
- include Targets |
181 |
--LIBS= -lc |
182 |
-+LIBS= -lc $(LIB_INTL) |
183 |
- |
184 |
- ########################################################################### |
185 |
- include $(SRCROOT)/$(RULESDIR)/rules.shl |
186 |
|
187 |
diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh |
188 |
index 97bdb1c..c422076 100755 |
189 |
--- a/scripts/mkstages/stages_builder.sh |
190 |
+++ b/scripts/mkstages/stages_builder.sh |
191 |
@@ -56,7 +56,7 @@ prepare(){ |
192 |
mv gentoo-bsd-* ${WORKDIR}/portage.bsd-overlay |
193 |
|
194 |
echo "emerging catalyst..." |
195 |
- 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 |
196 |
+ 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 |
197 |
grep "^export MAKEOPTS" /etc/catalyst/catalystrc > /dev/null 2>&1 |
198 |
if [ $? -ne 0 ] ; then |
199 |
echo "export MAKEOPTS=\"-j`sysctl hw.ncpu | awk '{ print $2 + 1 }'`"\" >> /etc/catalyst/catalystrc |