diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-08-02 21:08:12 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-08-02 21:08:12 +0000 |
| commit | 456c0f6db9636f7ec95272493445c2800ae34712 (patch) | |
| tree | 747137329a2c9b2ffd4145efe72018014063a492 /media-libs/libipoddevice | |
| parent | Version bumped. This has changes to shutdown and locale handling. Ebuild clea... (diff) | |
| download | gentoo-2-456c0f6db9636f7ec95272493445c2800ae34712.tar.gz gentoo-2-456c0f6db9636f7ec95272493445c2800ae34712.tar.bz2 gentoo-2-456c0f6db9636f7ec95272493445c2800ae34712.zip | |
Fix building with >=sys-apps/sg3_utils-1.26, bug 229641. Ed Catmur <ed@catmur.co.uk> supplied the patch. Again.
(Portage version: 2.2_rc6/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'media-libs/libipoddevice')
| -rw-r--r-- | media-libs/libipoddevice/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libipoddevice/files/libipoddevice-0.5.3-libsgutils2.patch | 13 | ||||
| -rw-r--r-- | media-libs/libipoddevice/libipoddevice-0.5.3.ebuild | 9 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-libs/libipoddevice/ChangeLog b/media-libs/libipoddevice/ChangeLog index f4d9c737f0dd..82590ac09375 100644 --- a/media-libs/libipoddevice/ChangeLog +++ b/media-libs/libipoddevice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libipoddevice # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/ChangeLog,v 1.19 2008/01/10 18:19:36 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/ChangeLog,v 1.20 2008/08/02 21:08:11 loki_val Exp $ + + 02 Aug 2008; Peter Alfredsen <loki_val@gentoo.org> + +files/libipoddevice-0.5.3-libsgutils2.patch, libipoddevice-0.5.3.ebuild: + Fix building with >=sys-apps/sg3_utils-1.26, bug 229641. Ed Catmur + <ed@catmur.co.uk> supplied the patch. Again. 10 Jan 2008; Samuli Suominen <drac@gentoo.org> libipoddevice-0.5.3.ebuild: Fix depends wrt #204868 diff --git a/media-libs/libipoddevice/files/libipoddevice-0.5.3-libsgutils2.patch b/media-libs/libipoddevice/files/libipoddevice-0.5.3-libsgutils2.patch new file mode 100644 index 000000000000..1dc75ca0493d --- /dev/null +++ b/media-libs/libipoddevice/files/libipoddevice-0.5.3-libsgutils2.patch @@ -0,0 +1,13 @@ +--- configure.ac 2008/06/26 23:06:04 1.1 ++++ configure.ac 2008/06/26 23:06:38 +@@ -49,7 +49,9 @@ if test "x$hal_eject" = "xyes"; then + fi + + AC_CHECK_LIB(sgutils, sg_ll_inquiry, HAL_IPOD_INFO_LIBS="-lsgutils", +- AC_MSG_ERROR([Error! You need to have libsgutils.]) ++AC_CHECK_LIB(sgutils2, sg_ll_inquiry, HAL_IPOD_INFO_LIBS="-lsgutils2", ++ AC_MSG_ERROR([Error! You need to have libsgutils/libsgutils2.]) ++) + ) + + AC_SUBST(HAL_IPOD_INFO_LIBS) diff --git a/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild b/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild index 5967ad4d3c82..835d84c6fca2 100644 --- a/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild +++ b/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild,v 1.6 2008/01/10 18:19:36 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libipoddevice/libipoddevice-0.5.3.ebuild,v 1.7 2008/08/02 21:08:11 loki_val Exp $ + +inherit base autotools DESCRIPTION="device-specific layer for the Apple iPod" HOMEPAGE="http://banshee-project.org/Libipoddevice" @@ -20,12 +22,15 @@ RDEPEND=">=dev-libs/dbus-glib-0.71 DEPEND="${RDEPEND} dev-util/pkgconfig" +PATCHES=( "${FILESDIR}/${P}-libsgutils2.patch" ) + src_unpack() { - unpack ${A} + base_src_unpack cd "${S}" # use correct libdir in pkgconfig file sed -i -e 's:^libdir=.*:libdir=@libdir@:' \ ipoddevice.pc.in || die "sed failed." + eautoreconf } src_install() { |