summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-08-02 21:08:12 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-08-02 21:08:12 +0000
commite4666581667da132c8691c462259d12d61686fe6 (patch)
tree159de8be2f3a864d5ad17083bda09ce28b65049b /media-libs/libipoddevice
parentVersion bumped. This has changes to shutdown and locale handling. Ebuild clea... (diff)
downloadhistorical-e4666581667da132c8691c462259d12d61686fe6.tar.gz
historical-e4666581667da132c8691c462259d12d61686fe6.tar.bz2
historical-e4666581667da132c8691c462259d12d61686fe6.zip
Fix building with >=sys-apps/sg3_utils-1.26, bug 229641. Ed Catmur <ed@catmur.co.uk> supplied the patch. Again.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25.8 i686
Diffstat (limited to 'media-libs/libipoddevice')
-rw-r--r--media-libs/libipoddevice/ChangeLog7
-rw-r--r--media-libs/libipoddevice/Manifest5
-rw-r--r--media-libs/libipoddevice/files/libipoddevice-0.5.3-libsgutils2.patch13
-rw-r--r--media-libs/libipoddevice/libipoddevice-0.5.3.ebuild9
4 files changed, 29 insertions, 5 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/Manifest b/media-libs/libipoddevice/Manifest
index e1ba2dda7776..5bf4415dbc3c 100644
--- a/media-libs/libipoddevice/Manifest
+++ b/media-libs/libipoddevice/Manifest
@@ -1,4 +1,5 @@
+AUX libipoddevice-0.5.3-libsgutils2.patch 439 RMD160 07a8f8b481156d48e4dd5549b8ed2de33d636332 SHA1 ba4169fce715c2d452944185a45a4498aea4fc92 SHA256 b833806c9e4c74da7a605f35c80c8eb9dbf5585dbf200da6eb30583fae43cee0
DIST libipoddevice-0.5.3.tar.gz 357888 RMD160 7881f6736158dd922299b81284e5eb309199e1ec SHA1 233283b9cdb02369dfa77867df12732dcc2ac2f8 SHA256 2f5f716f87e9f62482c70fa18540c4e49477a59f326db6af292d0752ee78f9db
-EBUILD libipoddevice-0.5.3.ebuild 929 RMD160 1f22bd7bd0667ac821566fd667295ebced42f19b SHA1 c51ff65f925ec3eb920771e77adbf038017da584 SHA256 20d8665267b70c08469d920912071ad5f15762de673ce17c0664e6b0fac18006
-MISC ChangeLog 3293 RMD160 c68338ce1b3775a180a5f9a1d36af503687bd47e SHA1 69e1595f81540442d84b8ddefb1a0d3c452ae76b SHA256 7404ab1470bf9523edc48420abbdadbb5d34f3e7f425b174925d65aa82207a0b
+EBUILD libipoddevice-0.5.3.ebuild 1024 RMD160 984dd2f5b1e47861236e3067d69d7a0c7d3cce12 SHA1 4d15cdb0e8251b3a7b359090a556d462919624a1 SHA256 5912c64e4c7019cfad9f14ca7c91ff6832e5d50b4b0766934a2e6d510b55aa33
+MISC ChangeLog 3543 RMD160 2fbac21af9fd598ab5fb1d42f80fa848f98cb0c0 SHA1 3addad9284ab95e631efcb848342ba296d07fd76 SHA256 8a2bf59a694e71a03839bac2a4bd1d71057e25ccb425ce85de688784d278434c
MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
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() {