summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-02-03 16:08:05 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-02-03 16:08:05 +0000
commit148f5d0a48fc2bb9bf14420c99180517b3e04cba (patch)
tree88c9df23fad105c2ed60f5d116e95bff68b2e65c
parentBump dbus, add 2 patches from upstream, one to fix a compilation issue (diff)
downloadgentoo-2-148f5d0a48fc2bb9bf14420c99180517b3e04cba.tar.gz
gentoo-2-148f5d0a48fc2bb9bf14420c99180517b3e04cba.tar.bz2
gentoo-2-148f5d0a48fc2bb9bf14420c99180517b3e04cba.zip
Fix automagic cddb again. And it looks this time it is in upstream repo.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
-rw-r--r--dev-libs/libcdio/ChangeLog7
-rw-r--r--dev-libs/libcdio/libcdio-0.82.ebuild29
2 files changed, 18 insertions, 18 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 61da22c0f1f9..1511331e14a0 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libcdio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.111 2009/10/27 15:08:31 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.112 2010/02/03 16:08:05 scarabeus Exp $
+
+ 03 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org> libcdio-0.82.ebuild:
+ Fix automagic cddb again. And it looks this time it is in upstream repo.
27 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
Give up maintainership.
diff --git a/dev-libs/libcdio/libcdio-0.82.ebuild b/dev-libs/libcdio/libcdio-0.82.ebuild
index 3f7fb27d06e4..f23934801ebc 100644
--- a/dev-libs/libcdio/libcdio-0.82.ebuild
+++ b/dev-libs/libcdio/libcdio-0.82.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.82.ebuild,v 1.1 2009/10/27 15:08:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.82.ebuild,v 1.2 2010/02/03 16:08:05 scarabeus Exp $
-EAPI=1
+EAPI=2
-inherit eutils libtool multilib autotools
+inherit eutils libtool multilib autotools base
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="http://www.gnu.org/software/libcdio/"
@@ -21,15 +21,18 @@ DEPEND="${RDEPEND}
sys-devel/gettext
dev-util/pkgconfig"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.80-automagic-cddb.patch
+)
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
- eautomake
+src_prepare() {
+ base_src_prepare
+ eautoreconf
elibtoolize
}
-src_compile() {
+src_configure() {
econf \
$(use_enable cddb) \
$(use_with !minimal cd-drive) \
@@ -44,13 +47,7 @@ src_compile() {
--with-cd-paranoia-name=libcdio-paranoia \
--disable-vcd-info \
--disable-dependency-tracking \
- --disable-maintainer-mode || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS
+ --disable-maintainer-mode
}
pkg_postinst() {