Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/taglib/
Date: Sat, 14 Oct 2017 00:13:46
Message-Id: 1507939804.d68e6c03460539eb97f782bfb46fa894d843841d.asturm@gentoo
1 commit: d68e6c03460539eb97f782bfb46fa894d843841d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 14 00:10:04 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 14 00:10:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68e6c03
7
8 media-libs/taglib: Security cleanup
9
10 Gentoo-bug: 627296
11 Package-Manager: Portage-2.3.11, Repoman-2.3.3
12
13 media-libs/taglib/Manifest | 1 -
14 media-libs/taglib/metadata.xml | 1 -
15 media-libs/taglib/taglib-1.11.1.ebuild | 54 --------------------------
16 media-libs/taglib/taglib-1.9.1-r2.ebuild | 65 --------------------------------
17 4 files changed, 121 deletions(-)
18
19 diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
20 index c681c95b835..893cea44b90 100644
21 --- a/media-libs/taglib/Manifest
22 +++ b/media-libs/taglib/Manifest
23 @@ -1,2 +1 @@
24 DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
25 -DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
26
27 diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
28 index 6322822c753..cabb8e8cf5a 100644
29 --- a/media-libs/taglib/metadata.xml
30 +++ b/media-libs/taglib/metadata.xml
31 @@ -6,7 +6,6 @@
32 <name>Gentoo KDE Project</name>
33 </maintainer>
34 <use>
35 - <flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
36 <flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
37 </use>
38 <upstream>
39
40 diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
41 deleted file mode 100644
42 index d064b14e30f..00000000000
43 --- a/media-libs/taglib/taglib-1.11.1.ebuild
44 +++ /dev/null
45 @@ -1,54 +0,0 @@
46 -# Copyright 1999-2017 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=6
50 -
51 -inherit cmake-multilib
52 -
53 -DESCRIPTION="A library for reading and editing audio meta data"
54 -HOMEPAGE="https://taglib.github.io/"
55 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
56 -
57 -LICENSE="LGPL-2.1 MPL-1.1"
58 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
59 -SLOT="0"
60 -IUSE="boost debug examples test"
61 -
62 -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
63 - boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
64 -DEPEND="${RDEPEND}
65 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
66 - test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
67 -"
68 -
69 -PATCHES=(
70 - "${FILESDIR}"/${PN}-1.11-install-examples.patch
71 -)
72 -
73 -MULTILIB_CHOST_TOOLS=(
74 - /usr/bin/taglib-config
75 -)
76 -
77 -src_prepare() {
78 - cmake-utils_src_prepare
79 -
80 - sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
81 - -i CMakeLists.txt \
82 - -i ConfigureChecks.cmake || die
83 -}
84 -
85 -multilib_src_configure() {
86 - local mycmakeargs=(
87 - -DBUILD_EXAMPLES=$(multilib_native_usex examples)
88 - $(cmake-utils_use_find_package boost Boost)
89 - -DBUILD_SHARED_LIBS=ON
90 - -DBUILD_TESTS=$(usex test)
91 - )
92 -
93 - cmake-utils_src_configure
94 -}
95 -
96 -multilib_src_test() {
97 - # ctest does not work
98 - emake -C "${BUILD_DIR}" check
99 -}
100
101 diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
102 deleted file mode 100644
103 index 807331a20de..00000000000
104 --- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
105 +++ /dev/null
106 @@ -1,65 +0,0 @@
107 -# Copyright 1999-2017 Gentoo Foundation
108 -# Distributed under the terms of the GNU General Public License v2
109 -
110 -EAPI=5
111 -
112 -inherit cmake-multilib
113 -
114 -DESCRIPTION="A library for reading and editing audio meta data"
115 -HOMEPAGE="https://taglib.github.io/"
116 -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
117 -
118 -LICENSE="LGPL-2.1 MPL-1.1"
119 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
120 -SLOT="0"
121 -IUSE="+asf debug examples +mp4 test"
122 -
123 -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
124 -DEPEND="${RDEPEND}
125 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
126 - test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
127 -"
128 -RDEPEND="${RDEPEND}
129 - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
130 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
131 -
132 -PATCHES=(
133 - "${FILESDIR}"/${PN}-1.6.1-install-examples.patch
134 - "${FILESDIR}"/${P}-missing-deletes.patch
135 - "${FILESDIR}"/${P}-order-big-endian.patch
136 - "${FILESDIR}"/${P}-abi-breakage.patch
137 - "${FILESDIR}"/${P}-bytevector-simpler.patch
138 -)
139 -
140 -DOCS=( AUTHORS NEWS )
141 -
142 -MULTILIB_CHOST_TOOLS=(
143 - /usr/bin/taglib-config
144 -)
145 -
146 -multilib_src_configure() {
147 - mycmakeargs=(
148 - $(multilib_is_native_abi && cmake-utils_use_build examples)
149 - $(cmake-utils_use_build test TESTS)
150 - $(cmake-utils_use_with asf)
151 - $(cmake-utils_use_with mp4)
152 - )
153 -
154 - cmake-utils_src_configure
155 -}
156 -
157 -multilib_src_test() {
158 - # ctest does not work
159 - emake -C "${BUILD_DIR}" check
160 -}
161 -
162 -pkg_postinst() {
163 - if ! use asf; then
164 - elog "You've chosen to disable the asf use flag, thus taglib won't include"
165 - elog "support for Microsoft's 'advanced systems format' media container"
166 - fi
167 - if ! use mp4; then
168 - elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
169 - elog "support for the MPEG-4 part 14 / MP4 media container"
170 - fi
171 -}