Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libcdio: ChangeLog libcdio-0.80.ebuild
Date: Sat, 21 Jun 2008 10:28:42
Message-Id: E1KA0Ki-0004qh-OD@stork.gentoo.org
1 flameeyes 08/06/21 10:28:36
2
3 Modified: ChangeLog libcdio-0.80.ebuild
4 Log:
5 Fix pkg-config installation for once. Closes bug #228185.
6 (Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64)
7
8 Revision Changes Path
9 1.100 dev-libs/libcdio/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/ChangeLog?rev=1.100&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/ChangeLog?rev=1.100&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/ChangeLog?r1=1.99&r2=1.100
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v
18 retrieving revision 1.99
19 retrieving revision 1.100
20 diff -u -r1.99 -r1.100
21 --- ChangeLog 14 Jun 2008 11:05:39 -0000 1.99
22 +++ ChangeLog 21 Jun 2008 10:28:36 -0000 1.100
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-libs/libcdio
25 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.99 2008/06/14 11:05:39 flameeyes Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.100 2008/06/21 10:28:36 flameeyes Exp $
28 +
29 + 21 Jun 2008; Diego Pettenò <flameeyes@g.o>
30 + +files/libcdio-0.80-fix-pkgconfig.patch, libcdio-0.80.ebuild:
31 + Fix pkg-config installation for once. Closes bug #228185.
32
33 14 Jun 2008; Diego Pettenò <flameeyes@g.o> ChangeLog:
34 Force manifest regen (Attic/ issue).
35
36
37
38 1.5 dev-libs/libcdio/libcdio-0.80.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild?r1=1.4&r2=1.5
43
44 Index: libcdio-0.80.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- libcdio-0.80.ebuild 14 Jun 2008 11:02:00 -0000 1.4
51 +++ libcdio-0.80.ebuild 21 Jun 2008 10:28:36 -0000 1.5
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2008 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.4 2008/06/14 11:02:00 flameeyes Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.5 2008/06/21 10:28:36 flameeyes Exp $
57
58 EAPI=1
59
60 @@ -13,12 +13,12 @@
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
64 -IUSE="cddb minimal nls +cxx"
65 +IUSE="cddb minimal +cxx"
66
67 RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
68 - nls? ( virtual/libintl )"
69 + virtual/libintl"
70 DEPEND="${RDEPEND}
71 - nls? ( sys-devel/gettext )
72 + sys-devel/gettext
73 dev-util/pkgconfig"
74
75 src_unpack() {
76 @@ -26,6 +26,7 @@
77 cd "${S}"
78
79 epatch "${FILESDIR}"/${P}-minimal.patch
80 + epatch "${FILESDIR}"/${P}-fix-pkgconfig.patch
81
82 sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
83 || die "unable to remove testdefault build"
84 @@ -36,7 +37,6 @@
85
86 src_compile() {
87 econf \
88 - $(use_enable nls) \
89 $(use_enable cddb) \
90 $(use_with !minimal cd-drive) \
91 $(use_with !minimal cd-info) \
92 @@ -57,12 +57,6 @@
93 src_install() {
94 emake DESTDIR="${D}" install || die "make install failed"
95 dodoc AUTHORS ChangeLog NEWS README THANKS
96 -
97 - # maybe next version is fixed
98 - # yes it's a different one than before
99 - if ! use cxx; then
100 - rm "${D}"/usr/$(get_libdir)/pkgconfig/{libcdio,libiso9660}++.pc
101 - fi
102 }
103
104 pkg_postinst() {
105
106
107
108 --
109 gentoo-commits@l.g.o mailing list