Added fix for bug #160975, thanks to Ed Catmur for reporting.

Package-Manager: portage-2.1.2_rc4-r4

diff --git a/sys-fs/hfsplusutils/ChangeLog b/sys-fs/hfsplusutils/ChangeLog
index 579976d029a3fa170848a97f7cb50a0aa11374bc..da80ad35bcb7b336ef59b4cc165af451dc0c6411 100644 (file)
--- a/sys-fs/hfsplusutils/ChangeLog
+++ b/sys-fs/hfsplusutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/hfsplusutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/ChangeLog,v 1.8 2007/01/04 18:23:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/ChangeLog,v 1.9 2007/01/08 22:21:44 josejx Exp $
+
+  08 Jan 2007; Joseph Jezak <josejx@gentoo.org>
+  +files/hfsplusutils-1.0.4-string.patch, hfsplusutils-1.0.4-r1.ebuild:
+  Added fix for bug #160975, thanks to Ed Catmur for reporting.
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   hfsplusutils-1.0.4-r1.ebuild:

diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index 96d4d7cc29cb57e409fce5dd91de69b4952c13c2..647b2f03118db9edda4c6a6a1f18d68c418f4f21 100644 (file)
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -13,15 +13,19 @@ AUX hfsplusutils-1.0.4-glob.patch 288 RMD160 879f375052f4f4490059daee6df5a875803
 MD5 04d73b3a534085a657c52eee99c5e1d4 files/hfsplusutils-1.0.4-glob.patch 288
 RMD160 879f375052f4f4490059daee6df5a87580317ded files/hfsplusutils-1.0.4-glob.patch 288
 SHA256 e1ccfa1de86ec3378ed91a318488392c090f432c63e78b8c304175cb90ed3c9b files/hfsplusutils-1.0.4-glob.patch 288
+AUX hfsplusutils-1.0.4-string.patch 305 RMD160 7503312125e2001901c94d19bc4c4a2a96c6a484 SHA1 3d1dce2ad48e5b3825c29bb065b97eefe953cae7 SHA256 51835b0dbac46fcdb389b69f0a0e29a849057ced764c07fefd44a04bc4feb195
+MD5 d4f6537b7b4cc42a19e96a461aece808 files/hfsplusutils-1.0.4-string.patch 305
+RMD160 7503312125e2001901c94d19bc4c4a2a96c6a484 files/hfsplusutils-1.0.4-string.patch 305
+SHA256 51835b0dbac46fcdb389b69f0a0e29a849057ced764c07fefd44a04bc4feb195 files/hfsplusutils-1.0.4-string.patch 305
 DIST hfsplus_1.0.4.src.tar.bz2 185461 RMD160 4aa92c2429dbba7d7da81c525004cc46a0f8fb7c SHA1 dfaea9a7e09133377a028dd7a0b6135b43e5d0fd SHA256 032b1c663b1400f3ea1c2ec1a03adebd6e57e51fd38e997befdd223448a10c6d
-EBUILD hfsplusutils-1.0.4-r1.ebuild 1089 RMD160 79905098bdf2d9488d8f12793735268fd2186210 SHA1 67e7652282739786382739c4c71efdd12a285067 SHA256 8509c9e54e0cc3b6d89ac463a0a39cd8e67260916931ea5d11545a55bbf903bd
-MD5 cc57e88ac6c6d29c8a9a7f081776cd8d hfsplusutils-1.0.4-r1.ebuild 1089
-RMD160 79905098bdf2d9488d8f12793735268fd2186210 hfsplusutils-1.0.4-r1.ebuild 1089
-SHA256 8509c9e54e0cc3b6d89ac463a0a39cd8e67260916931ea5d11545a55bbf903bd hfsplusutils-1.0.4-r1.ebuild 1089
-MISC ChangeLog 2101 RMD160 7c8ff21407538a8d9e5741329539112b7133ac99 SHA1 c70ac8a89b7a6e54f0e3ccfbea83e26d6353e5b4 SHA256 d67809fc96fc98df5aa5df4502332a1e6a4f2abb1327ba9473448dc5ba96ade6
-MD5 201317792d562f030d15baf77b462c2f ChangeLog 2101
-RMD160 7c8ff21407538a8d9e5741329539112b7133ac99 ChangeLog 2101
-SHA256 d67809fc96fc98df5aa5df4502332a1e6a4f2abb1327ba9473448dc5ba96ade6 ChangeLog 2101
+EBUILD hfsplusutils-1.0.4-r1.ebuild 1280 RMD160 c6bbafaf4d412fcd896ea1aa6eed7f2febfaa50f SHA1 71dd6c45e3eacace1604853b9bcab6975dd6a559 SHA256 3bec4546e754777f173eae58d64377c2be737946cad784d8a333a2ad88afbc13
+MD5 527ef4be0e1318519d89da91d2f7c92c hfsplusutils-1.0.4-r1.ebuild 1280
+RMD160 c6bbafaf4d412fcd896ea1aa6eed7f2febfaa50f hfsplusutils-1.0.4-r1.ebuild 1280
+SHA256 3bec4546e754777f173eae58d64377c2be737946cad784d8a333a2ad88afbc13 hfsplusutils-1.0.4-r1.ebuild 1280
+MISC ChangeLog 2283 RMD160 2d2cb60fad77b8d5b5cfe78d6eb805ffb95bde7e SHA1 fc37b11d53b3eeb90a0c024b516343401615a9b3 SHA256 3ec035abdbe278e98311b8a87fe272caac7333cd82bbd30afbf02df4aaf6ec3b
+MD5 4440dac1b68717d051d21d3e75948109 ChangeLog 2283
+RMD160 2d2cb60fad77b8d5b5cfe78d6eb805ffb95bde7e ChangeLog 2283
+SHA256 3ec035abdbe278e98311b8a87fe272caac7333cd82bbd30afbf02df4aaf6ec3b ChangeLog 2283
 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156
@@ -32,7 +36,7 @@ SHA256 c504e555987a6c2c067027a36a8cf0c2ff6d00636f06a222e2a9f9bbc37e0987 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnUYPAiZjviIA2XgRAhGKAJ43JQUs+TQzaPuY7iYtqEaVJ+CQFQCfdOPZ
-10THPeiwIu+Pzfn+KG91OqY=
-=AV2f
+iD8DBQFFosOLcsIHjyDViGQRAvwwAJ9qP3hQeOfag5cIbOqTLvT3cKONXQCgwpww
+46riJN7vhA5E+ps+Vbt7/tQ=
+=r0rs
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch
new file mode 100644 (file)
index 0000000..2602876
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-string.patch
@@ -0,0 +1,11 @@
+--- libhfsp/src/unicode.c.bak  2007-01-08 17:14:44.000000000 -0500
++++ libhfsp/src/unicode.c      2007-01-08 17:14:52.000000000 -0500
+@@ -16,7 +16,7 @@
+ #include <stdlib.h>
+ #include <endian.h>
+ #include <byteswap.h>
+-#include <linux/string.h>
++#include <string.h>
+ 
+ #define __USE_GNU
+     /* need wcsrtomb */

diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
index 044e77a5b1c8ec957600f77c874501bffec80eb4..9d41a34ca303c00ccb1df6deb6d02e47494bb084 100644 (file)
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.12 2007/01/04 18:23:05 flameeyes Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.13 2007/01/08 22:21:44 josejx Exp $
 
+WANT_AUTOMAKE=1.6
 inherit autotools eutils libtool
 
 MY_P="hfsplus_${PV}"
@@ -25,11 +23,24 @@ S=${WORKDIR}/hfsplus-${PV}
 src_unpack() {
        unpack ${A}
        cd ${S}
-       epatch ${FILESDIR}/hfsplusutils-1.0.4-glob.patch
-       epatch ${FILESDIR}/hfsplusutils-1.0.4-errno.patch
-       epatch ${FILESDIR}/hfsplusutils-1.0.4-gcc4.patch
+       epatch ${FILESDIR}/${P}-glob.patch
+       epatch ${FILESDIR}/${P}-errno.patch
+       epatch ${FILESDIR}/${P}-gcc4.patch
+       epatch ${FILESDIR}/${P}-string.patch
+       #let's avoid the Makefile.cvs since isn't working for us
+       export WANT_AUTOCONF=2.5
+       export WANT_AUTOMAKE=1.6
+       aclocal
+       autoconf
+       autoheader
+       automake -a
+       libtoolize --force --copy
+       elibtoolize
+}
 
-       eautoreconf
+src_compile() {
+       econf || die
+       emake || die
 }
 
 src_install() {