diff options
author | 2008-06-14 11:04:51 +0000 | |
---|---|---|
committer | 2008-06-14 11:04:51 +0000 | |
commit | dfa6c0d314477f600b10420762ebdfc07c182efc (patch) | |
tree | d32cda888495a129d0a15443739638a206fd2e5f /dev-libs | |
parent | Bug #226505 - For compatibity with phase execution order in >=portage-2.1.5, (diff) | |
download | gentoo-2-dfa6c0d314477f600b10420762ebdfc07c182efc.tar.gz gentoo-2-dfa6c0d314477f600b10420762ebdfc07c182efc.tar.bz2 gentoo-2-dfa6c0d314477f600b10420762ebdfc07c182efc.zip |
Restore ebuild I removed by mistake. Sorry Mike (only your arches are involved).
(Portage version: 2.1.5.5, RepoMan options: --force)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libcdio/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch | 25 | ||||
-rw-r--r-- | dev-libs/libcdio/libcdio-0.78.2-r3.ebuild | 64 |
3 files changed, 95 insertions, 1 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog index 13e5cd8f6d91..287b47c61e8a 100644 --- a/dev-libs/libcdio/ChangeLog +++ b/dev-libs/libcdio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libcdio # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.97 2008/06/14 11:02:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.98 2008/06/14 11:04:50 flameeyes Exp $ + + 14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> + +files/libcdio-0.78.2-bug203777.patch, +libcdio-0.78.2-r3.ebuild: + Restore ebuild I removed by mistake. Sorry Mike (only your arches are + involved). 14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> -files/libcdio-0.77-nocxx.patch, -files/libcdio-0.78.2-bug203777.patch, diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch new file mode 100644 index 000000000000..9458eb4d3029 --- /dev/null +++ b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch @@ -0,0 +1,25 @@ +diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c +--- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c 2006-03-17 14:37:08.000000000 -0500 ++++ libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c 2007-12-30 10:49:40.000000000 -0500 +@@ -539,7 +539,7 @@ + iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); + char *psz_iso_name = p_statbuf->filename; + char _fullname[4096] = { 0, }; +- char translated_name[MAX_ISONAME+1]; ++ char *translated_name = (char *) alloca(strlen(psz_iso_name)+1); + + if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { + iso9660_name_translate_ext(psz_iso_name, translated_name, +diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c +--- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c 2006-03-17 14:37:08.000000000 -0500 ++++ libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c 2007-12-30 10:49:50.000000000 -0500 +@@ -224,7 +224,8 @@ + iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode); + char *psz_iso_name = p_statbuf->filename; + char _fullname[4096] = { 0, }; +- char translated_name[MAX_ISONAME+1]; ++ char *translated_name = (char *) alloca(strlen(psz_iso_name)+1); ++ + + if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) { + iso9660_name_translate_ext(psz_iso_name, translated_name, diff --git a/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild b/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild new file mode 100644 index 000000000000..04e378003e1a --- /dev/null +++ b/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild,v 1.4 2008/06/14 11:04:50 flameeyes Exp $ + +inherit eutils libtool multilib + +DESCRIPTION="A library to encapsulate CD-ROM reading and control" +HOMEPAGE="http://www.gnu.org/software/libcdio/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="cddb minimal nls nocxx" + +RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + dev-util/pkgconfig" + +RESTRICT="test" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch" + epatch "${FILESDIR}/${P}-bug203777.patch" + elibtoolize +} + +src_compile() { + econf \ + $(use_enable nls) \ + $(use_enable cddb) \ + $(use_with !minimal cd-drive) \ + $(use_with !minimal cd-info) \ + $(use_with !minimal cd-paranoia) \ + $(use_with !minimal cdda-player) \ + $(use_with !minimal cd-read) \ + $(use_with !minimal iso-info) \ + $(use_with !minimal iso-read) \ + $(use_enable !nocxx cxx) \ + --with-cd-paranoia-name=libcdio-paranoia \ + --disable-vcd-info \ + --disable-dependency-tracking || die "configure failed" + emake || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README THANKS + + # maybe next version is fixed + if use minimal; then + rm -f "${D}/usr/$(get_libdir)/pkgconfig/libcdio_cdda.pc" + rm -f "${D}/usr/include/cdio/cdda.h" + fi +} + +pkg_postinst() { + ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge" + ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:" + ewarn "\trevdep-rebuild" +} |