Diff vcdimager-0.7.24 with a vcdimager-2.0.1

/usr/portage/media-video/vcdimager/vcdimager-2.0.1.ebuild 2019-10-11 19:11:00.000000000 +0300
1
# Copyright 1999-2018 Gentoo Authors
1
# Copyright 1999-2019 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=6
5 5

  
6
inherit multilib-minimal
6
inherit autotools multilib-minimal
7 7

  
8 8
DESCRIPTION="GNU VCDimager"
9
HOMEPAGE="http://www.vcdimager.org/"
9
HOMEPAGE="https://www.gnu.org/software/vcdimager/"
10 10
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
11 11

  
12 12
LICENSE="GPL-2"
13 13
SLOT="0"
14
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
15
IUSE="+xml static-libs"
14
KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86"
15
IUSE="static-libs +xml"
16 16

  
17 17
RDEPEND="
18
	>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
19
	<dev-libs/libcdio-1.0
18
	>=dev-libs/libcdio-2.0.0:0=[-minimal,${MULTILIB_USEDEP}]
20 19
	dev-libs/popt
21 20
	xml? ( dev-libs/libxml2:2 )
22 21
"
23 22
DEPEND="${RDEPEND}
24
	virtual/pkgconfig
23
	virtual/pkgconfig[${MULTILIB_USEDEP}]
25 24
"
26 25

  
27 26
DOCS=( AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO )
28 27

  
29
PATCHES=( "${FILESDIR}/${P}-libcdio-1.0.0.patch" )
28
PATCHES=("${FILESDIR}/${P}-pkg-config.patch")
30 29

  
31 30
src_prepare() {
32 31
	default
......
35 34
	sed -i \
36 35
		-e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
37 36
		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
38
		test/Makefile.in || die
37
		test/Makefile.am || die
39 38
	sed -i \
40 39
		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
41
		example/Makefile.in || die
40
		example/Makefile.am || die
41

  
42
	eautoreconf
42 43
}
43 44

  
44 45
multilib_src_configure() {
45
	# We disable the xmltest because the configure script includes differently
46
	# than the actual XML-frontend C files.
47
	local myconf
48
	if use xml && multilib_is_native_abi ; then
49
		myconf="--with-xml-prefix=${EPREFIX}/usr --disable-xmltest"
50
	else
51
		myconf="--without-xml-frontend"
46
	local myeconfargs=(
47
		$(use_enable static-libs static)
48
	)
49
	multilib_is_native_abi || myeconfargs+=( --without-cli-frontend )
50
	if ! use xml || ! multilib_is_native_abi ; then
51
		myeconfargs+=( --without-xml-frontend )
52 52
	fi
53
	multilib_is_native_abi || myconf="${myconf} --without-cli-frontend"
53

  
54 54
	ECONF_SOURCE="${S}" \
55
		econf $(use_enable static-libs static) ${myconf}
55
		econf ${myeconfargs[@]}
56 56
}
57 57

  
58 58
multilib_src_install_all() {
59
	find "${D}" -name '*.la' -delete
59
	find "${D}" -name '*.la' -delete || die
60 60
	einstalldocs
61 61
}
Thank you!