Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio-paranoia/files/, dev-libs/libcdio-paranoia/
Date: Wed, 28 Apr 2021 18:04:19
Message-Id: 1619633049.8e88f05c0aa70d573259cec690e67149aa5ca346.fordfrog@gentoo
1 commit: 8e88f05c0aa70d573259cec690e67149aa5ca346
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 28 17:53:14 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 28 18:04:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e88f05c
7
8 dev-libs/libcdio-paranoia: removed obsolete 0.94_p2-r2
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-libs/libcdio-paranoia/Manifest | 1 -
14 .../files/libcdio-paranoia-0.90-oos-tests.patch | 48 -------------
15 .../libcdio-paranoia-0.94_p2-r2.ebuild | 81 ----------------------
16 3 files changed, 130 deletions(-)
17
18 diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
19 index 7f8154dd458..658f8249733 100644
20 --- a/dev-libs/libcdio-paranoia/Manifest
21 +++ b/dev-libs/libcdio-paranoia/Manifest
22 @@ -1,2 +1 @@
23 -DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
24 DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
25
26 diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch
27 deleted file mode 100644
28 index 86cf9da8d0f..00000000000
29 --- a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-oos-tests.patch
30 +++ /dev/null
31 @@ -1,48 +0,0 @@
32 -From 4803c621d4f907402f29eba8cc3a6515bdda2ee2 Mon Sep 17 00:00:00 2001
33 -From: Sergei Trofimovich <slyfox@g.o>
34 -Date: Mon, 12 Jun 2017 21:20:35 +0100
35 -Subject: [PATCH] configure.ac: fix out-of-tree tests
36 -
37 -To reproduce the test failure one needs to run
38 -configure using absolute path in a directory
39 -outside source tree. For example:
40 -
41 - $ $(pwd)/../libcdio-paranoia/configure
42 - $ make
43 - $ make check
44 -
45 -This will cause 'native_abs_top_srcdir' to contain wrong path.
46 -
47 -It happens because '[]' is an escape in autoconf.
48 -As a the following configure.ac snippet:
49 - [\\/]* | ?:[\\/]* ) # Absolute name.
50 -gets translated into the following shell code:
51 - \\/* | ?:\\/* ) # Absolute name.
52 -
53 -The fix is to change quotes from '[]' for a short while.
54 -
55 -Reported-by: eroen
56 -Reported-by: Paolo Pedroni
57 -Bug: https://bugs.gentoo.org/546388
58 -Signed-off-by: Sergei Trofimovich <slyfox@g.o>
59 ----
60 - configure.ac | 2 ++
61 - 1 file changed, 2 insertions(+)
62 -
63 -diff --git a/configure.ac b/configure.ac
64 -index a502273..608277b 100644
65 ---- a/configure.ac
66 -+++ b/configure.ac
67 -@@ -243,7 +243,9 @@ dnl native_abs_top_srcdir is used here.
68 - case $srcdir in
69 - .) # We are building in place.
70 - native_abs_top_srcdir=$ac_pwd ;;
71 -+ changequote(`,')
72 - [\\/]* | ?:[\\/]* ) # Absolute name.
73 -+ changequote([,])
74 - native_abs_top_srcdir=$srcdir ;;
75 - *) # Relative name.
76 - native_abs_top_srcdir=$ac_pwd/$srcdir ;;
77 ---
78 -2.13.1
79 -
80
81 diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
82 deleted file mode 100644
83 index 5e6a4e8da4e..00000000000
84 --- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
85 +++ /dev/null
86 @@ -1,81 +0,0 @@
87 -# Copyright 1999-2021 Gentoo Authors
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=6
91 -
92 -MY_P=${PN}-10.2+${PV/_p/+}
93 -
94 -inherit autotools multilib-minimal flag-o-matic
95 -
96 -DESCRIPTION="an advanced CDDA reader with error correction"
97 -HOMEPAGE="https://www.gnu.org/software/libcdio/"
98 -SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
99 -
100 -# COPYING-GPL from cdparanoia says "2 or later"
101 -# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
102 -# clause "or later" so we use LGPL-2.1 without +
103 -LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
104 -SLOT="0"
105 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
106 -IUSE="+cxx static-libs test"
107 -
108 -RDEPEND="app-eselect/eselect-cdparanoia
109 - >=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
110 - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
111 -"
112 -
113 -DEPEND="${RDEPEND}
114 - sys-devel/gettext
115 - virtual/pkgconfig
116 - test? ( dev-lang/perl )"
117 -
118 -RESTRICT="!test? ( test )"
119 -
120 -S="${WORKDIR}/${MY_P}"
121 -
122 -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
123 -
124 -PATCHES=(
125 - "${FILESDIR}"/${PN}-0.90-oos-tests.patch
126 -)
127 -
128 -src_prepare() {
129 - default
130 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
131 - eautoreconf
132 -
133 - [[ ${CC} == *clang* ]] && append-flags -std=gnu89
134 -}
135 -
136 -multilib_src_configure() {
137 - local myeconfargs=(
138 - --disable-maintainer-mode
139 - --disable-example-progs
140 - $(use_enable cxx)
141 - --disable-cpp-progs
142 - --with-cd-paranoia-name=libcdio-paranoia
143 - # upstream accidentally default-disabled it
144 - # reenable it to preserve ABI compat with previous versions
145 - # https://bugs.gentoo.org/616054
146 - # https://savannah.gnu.org/bugs/index.php?50978
147 - --enable-ld-version-script
148 - $(use_enable static-libs static)
149 - )
150 - # Darwin linker doesn't get this
151 - [[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
152 - ECONF_SOURCE="${S}" \
153 - econf "${myeconfargs[@]}"
154 -}
155 -
156 -multilib_src_install_all() {
157 - einstalldocs
158 - find "${D}" -type f -name '*.la' -delete || die
159 -}
160 -
161 -pkg_postinst() {
162 - eselect cdparanoia update ifunset
163 -}
164 -
165 -pkg_postrm() {
166 - eselect cdparanoia update ifunset
167 -}