summaryrefslogtreecommitdiff
path: root/media-libs/libcddb
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-29 11:38:31 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-29 11:38:31 +0100
commit90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree83fc5facb6b12be510a37bc3d241cc63e965b13a /media-libs/libcddb
parentfeb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
gentoo resync : 29.06.2020
Diffstat (limited to 'media-libs/libcddb')
-rw-r--r--media-libs/libcddb/Manifest2
-rw-r--r--media-libs/libcddb/libcddb-1.3.2-r1.ebuild43
2 files changed, 29 insertions, 16 deletions
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index a4e3afeb353e..6fbe1eb87c19 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,3 +1,3 @@
DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 997 BLAKE2B 285ca275be6fe12a60906145a9a8cc8be86cf0aa7f4634d890e9b31268d044011b1095ab62375ad204b6e58b5d8f29d148ed6d1cd7fd62c34df5a41de9afce3e SHA512 67a1d9935dd81d06bdf9db2b18c42f324176bf0d38e8f03b91579c453450475a39ca566c705dc314461e588f806a11982138f3e550d09cce54e68b3075aa2c4c
+EBUILD libcddb-1.3.2-r1.ebuild 1205 BLAKE2B 0ae70b3aa111f95641b4089de2a1e781b3dd5616fbdba2d9c736c4da4f91e86033acff1826caf164d34149857780d780b17ac10fd2829174b4f3d9709609ccfd SHA512 3729f7eb3f98a9e5ad90955793cd3d6069a01c3796e7eb0bf69e71df360d97942d9e880ff76dc6688e131bb0b11300502862d04e6f8a36ae0dd0df7a3f4a45bd
MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 06c26b854504..527e22390ba0 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit autotools-multilib
+inherit autotools multilib-minimal
DESCRIPTION="A library for accessing a CDDB server"
HOMEPAGE="http://libcddb.sourceforge.net/"
@@ -17,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin
IUSE="doc static-libs"
RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
RESTRICT="test"
@@ -25,22 +24,36 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
MULTILIB_WRAPPED_HEADERS=( /usr/include/cddb/version.h )
-src_configure() {
- local myeconfargs=( --without-cdio )
- autotools-multilib_src_configure
+src_prepare() {
+ default
+ # Required for CONFIG_SHELL != bash (bug #528012)
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --without-cdio
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
-src_compile() {
- autotools-multilib_src_compile
+multilib_src_compile() {
+ default
- if use doc; then
- cd "${S}"/doc
+ if use doc ; then
+ cd "${S}"/doc || die
doxygen doxygen.conf || die
fi
}
-src_install() {
- autotools-multilib_src_install
+multilib_src_install_all() {
+ default
- use doc && dohtml "${S}"/doc/html/*
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use doc ; then
+ docinto html
+ dodoc "${S}"/doc/html/*
+ fi
}