Add patch to compile on FreeBSD (bug #134083) and one to avoid automagic dependencies. Add a few more useflags.

Package-Manager: portage-2.1_rc2-r2

5 files changed, 173 insertions, 28 deletions

diff --git a/media-libs/tunepimp/ChangeLog b/media-libs/tunepimp/ChangeLog
index 64122d3cb16b..8160335bc04e 100644
--- a/media-libs/tunepimp/ChangeLog
+++ b/media-libs/tunepimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/tunepimp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.32 2006/05/21 23:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.33 2006/05/24 18:02:15 flameeyes Exp $
+
+  24 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tunepimp-0.4.2-libiconv.patch,
+  +files/tunepimp-0.4.2-noautomatic.patch, tunepimp-0.4.2.ebuild:
+  Add patch to compile on FreeBSD (bug #134083) and one to avoid automagic
+  dependencies. Add a few more useflags.
 
 *tunepimp-0.4.2 (21 May 2006)
 
diff --git a/media-libs/tunepimp/Manifest b/media-libs/tunepimp/Manifest
index ab1e95c639a5..da60d7ce95d4 100644
--- a/media-libs/tunepimp/Manifest
+++ b/media-libs/tunepimp/Manifest
@@ -1,42 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX thread.patch 393 RMD160 95c76483c012b6b5d2a530e188e87625b2453e6a SHA1 3c373adeaf774dde7a5df5d591177d9f33e4b5db SHA256 3b8a4ed180fb80f95973f58b3d4ff9f5fd213fd149ef344cbd7f47febce8aa38 size 393
+AUX thread.patch 393 RMD160 95c76483c012b6b5d2a530e188e87625b2453e6a SHA1 3c373adeaf774dde7a5df5d591177d9f33e4b5db SHA256 3b8a4ed180fb80f95973f58b3d4ff9f5fd213fd149ef344cbd7f47febce8aa38
 MD5 9df04c3c157b652e3e895eeabb7015e6 files/thread.patch 393
 RMD160 95c76483c012b6b5d2a530e188e87625b2453e6a files/thread.patch 393
 SHA256 3b8a4ed180fb80f95973f58b3d4ff9f5fd213fd149ef344cbd7f47febce8aa38 files/thread.patch 393
-AUX tunepimp-0.3.0-gcc41.patch 361 RMD160 8d3ae7e09790fc8c0c96fb0da5e2fc34ee4a077a SHA1 e64cbf44db66f5bbc4cf6e1a7040161ac07bc5a7 SHA256 2a23bd209b448f7a242188309dd778eeff9c72912e02a2adb3b451b37b95b2c4 size 361
+AUX tunepimp-0.3.0-gcc41.patch 361 RMD160 8d3ae7e09790fc8c0c96fb0da5e2fc34ee4a077a SHA1 e64cbf44db66f5bbc4cf6e1a7040161ac07bc5a7 SHA256 2a23bd209b448f7a242188309dd778eeff9c72912e02a2adb3b451b37b95b2c4
 MD5 b8bbfdc16fa6407291fc43d8c041f6dd files/tunepimp-0.3.0-gcc41.patch 361
 RMD160 8d3ae7e09790fc8c0c96fb0da5e2fc34ee4a077a files/tunepimp-0.3.0-gcc41.patch 361
 SHA256 2a23bd209b448f7a242188309dd778eeff9c72912e02a2adb3b451b37b95b2c4 files/tunepimp-0.3.0-gcc41.patch 361
-AUX tunepimp-0.4.0-gcc41.patch 2059 RMD160 2ca5cdd14b78b9e036d2cc3aa1f831b4e87c48ff SHA1 698f209cb9dfa89ebb406e06c5297c5fd14d7ddb SHA256 9f8dd7a99294950ddd27b3041ae7bdc803336fad1fafafca20070597759c6a68 size 2059
+AUX tunepimp-0.4.0-gcc41.patch 2059 RMD160 2ca5cdd14b78b9e036d2cc3aa1f831b4e87c48ff SHA1 698f209cb9dfa89ebb406e06c5297c5fd14d7ddb SHA256 9f8dd7a99294950ddd27b3041ae7bdc803336fad1fafafca20070597759c6a68
 MD5 ddfcf1401793f2157f523dd4445f2d6d files/tunepimp-0.4.0-gcc41.patch 2059
 RMD160 2ca5cdd14b78b9e036d2cc3aa1f831b4e87c48ff files/tunepimp-0.4.0-gcc41.patch 2059
 SHA256 9f8dd7a99294950ddd27b3041ae7bdc803336fad1fafafca20070597759c6a68 files/tunepimp-0.4.0-gcc41.patch 2059
-DIST libtunepimp-0.3.0.tar.gz 524889 RMD160 f471f96185aa79eff8a83fd5366904d009791628 SHA256 5fbfc6441f2bf34d5eed81ec77bf19469b53eb30f33575cab218aa8d587566d2 size 524889
-DIST libtunepimp-0.4.0.tar.gz 997748 size 997748
-DIST libtunepimp-0.4.2.tar.gz 1019995 RMD160 f4c7ebeb505c6b8b1dff284aebf6c9e249192765 SHA256 d3e0f66a92b9c54a388b9a55bcdcc98601e3f918e966f3362c3bd3b45f3936e4 size 1019995
-EBUILD tunepimp-0.3.0-r1.ebuild 1739 RMD160 d8e7e5d481f593251ee16e3f1843a802a07a5922 SHA1 4ffc8adb509e0d9ce8199565b8257d67c074c4e1 SHA256 f9011f0c92e377f4aa90d00f6ebb71954df889e95cc5d7dbb70830dfc8e1a613 size 1739
+AUX tunepimp-0.4.2-libiconv.patch 1656 RMD160 7299565e8e30ea5e0f0041bcda9df6096a9fecb4 SHA1 d93d29dac8ffafea4fcb8a0dd855d1d5d0c163ad SHA256 dfb469a166a95336af05c25fec6d9189c6daae45c273c6294eb98c2d5ac0aa6e
+MD5 24973c284318dcb55c435429ee7f52b9 files/tunepimp-0.4.2-libiconv.patch 1656
+RMD160 7299565e8e30ea5e0f0041bcda9df6096a9fecb4 files/tunepimp-0.4.2-libiconv.patch 1656
+SHA256 dfb469a166a95336af05c25fec6d9189c6daae45c273c6294eb98c2d5ac0aa6e files/tunepimp-0.4.2-libiconv.patch 1656
+AUX tunepimp-0.4.2-noautomatic.patch 2692 RMD160 e2fca778c4ad9e94e4ad9032881755dcce6a1f5b SHA1 d030a98db59d20c006335908b619a3bedc22e230 SHA256 239d259bebadd260a14c2a1e2e7e793fcaf8c9e514d6fbedfe46408166309e2f
+MD5 16d5b9d092b2f077d788807865cae603 files/tunepimp-0.4.2-noautomatic.patch 2692
+RMD160 e2fca778c4ad9e94e4ad9032881755dcce6a1f5b files/tunepimp-0.4.2-noautomatic.patch 2692
+SHA256 239d259bebadd260a14c2a1e2e7e793fcaf8c9e514d6fbedfe46408166309e2f files/tunepimp-0.4.2-noautomatic.patch 2692
+DIST libtunepimp-0.3.0.tar.gz 524889 RMD160 f471f96185aa79eff8a83fd5366904d009791628 SHA1 54c60232f3b06f2316e2b1130eb981352995dfc8 SHA256 5fbfc6441f2bf34d5eed81ec77bf19469b53eb30f33575cab218aa8d587566d2
+DIST libtunepimp-0.4.0.tar.gz 997748
+DIST libtunepimp-0.4.2.tar.gz 1019995 RMD160 f4c7ebeb505c6b8b1dff284aebf6c9e249192765 SHA1 deb7ac22e451b7512006e6f090333e14d4cbc78f SHA256 d3e0f66a92b9c54a388b9a55bcdcc98601e3f918e966f3362c3bd3b45f3936e4
+EBUILD tunepimp-0.3.0-r1.ebuild 1739 RMD160 d8e7e5d481f593251ee16e3f1843a802a07a5922 SHA1 4ffc8adb509e0d9ce8199565b8257d67c074c4e1 SHA256 f9011f0c92e377f4aa90d00f6ebb71954df889e95cc5d7dbb70830dfc8e1a613
 MD5 d320988ce3207a6902fa09cfef6a1df0 tunepimp-0.3.0-r1.ebuild 1739
 RMD160 d8e7e5d481f593251ee16e3f1843a802a07a5922 tunepimp-0.3.0-r1.ebuild 1739
 SHA256 f9011f0c92e377f4aa90d00f6ebb71954df889e95cc5d7dbb70830dfc8e1a613 tunepimp-0.3.0-r1.ebuild 1739
-EBUILD tunepimp-0.3.0.ebuild 1518 RMD160 2788fb970a613500628fe83b15101d2428db5719 SHA1 0eb95dcf10323056c569a5a93f9558d8e5ea5802 SHA256 76506613cbac9378aa7c10f6d38a6a7350744363957f00920314f4a53632e88a size 1518
+EBUILD tunepimp-0.3.0.ebuild 1518 RMD160 2788fb970a613500628fe83b15101d2428db5719 SHA1 0eb95dcf10323056c569a5a93f9558d8e5ea5802 SHA256 76506613cbac9378aa7c10f6d38a6a7350744363957f00920314f4a53632e88a
 MD5 87514ccfe6474baeda0cca5a197df66d tunepimp-0.3.0.ebuild 1518
 RMD160 2788fb970a613500628fe83b15101d2428db5719 tunepimp-0.3.0.ebuild 1518
 SHA256 76506613cbac9378aa7c10f6d38a6a7350744363957f00920314f4a53632e88a tunepimp-0.3.0.ebuild 1518
-EBUILD tunepimp-0.4.0.ebuild 1793 RMD160 db266fb93db4f1097a65d5c94385072983790977 SHA1 5efa0adc87f7800ae8fbb0348a8a5c3407c9d7e4 SHA256 1e3f44ffc375ef1d01135ee90b9339127706cb4f75ef16ccafba1328a99e50b6 size 1793
+EBUILD tunepimp-0.4.0.ebuild 1793 RMD160 db266fb93db4f1097a65d5c94385072983790977 SHA1 5efa0adc87f7800ae8fbb0348a8a5c3407c9d7e4 SHA256 1e3f44ffc375ef1d01135ee90b9339127706cb4f75ef16ccafba1328a99e50b6
 MD5 63aeac96217521c782011dd591dabd1d tunepimp-0.4.0.ebuild 1793
 RMD160 db266fb93db4f1097a65d5c94385072983790977 tunepimp-0.4.0.ebuild 1793
 SHA256 1e3f44ffc375ef1d01135ee90b9339127706cb4f75ef16ccafba1328a99e50b6 tunepimp-0.4.0.ebuild 1793
-EBUILD tunepimp-0.4.2.ebuild 1835 RMD160 8c9b6ce184dff6ae37259d0a8ee62441c5f2fc87 SHA1 f19a103a4fc285a22e47adc777140748cba20374 SHA256 f0f3bf51a8a8788270330d98eda02fa2ddb039009a7cda64334eb3e4fc91004b size 1835
-MD5 3bf460540f39e7a52bb28eee55d0e556 tunepimp-0.4.2.ebuild 1835
-RMD160 8c9b6ce184dff6ae37259d0a8ee62441c5f2fc87 tunepimp-0.4.2.ebuild 1835
-SHA256 f0f3bf51a8a8788270330d98eda02fa2ddb039009a7cda64334eb3e4fc91004b tunepimp-0.4.2.ebuild 1835
-MISC ChangeLog 3755 RMD160 2b7d854234167e803185459597eb236c87a0975f SHA1 2f300ec4a04dc4c058467d55e54577354991a8f5 SHA256 8f2d0b73af02731899d57e61da55e0a9bda3a4c386180610b5df069d3207f076 size 3755
-MD5 bb590b09d88d63ae86bab8c078b4a86e ChangeLog 3755
-RMD160 2b7d854234167e803185459597eb236c87a0975f ChangeLog 3755
-SHA256 8f2d0b73af02731899d57e61da55e0a9bda3a4c386180610b5df069d3207f076 ChangeLog 3755
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a size 156
+EBUILD tunepimp-0.4.2.ebuild 2211 RMD160 cc693f78d1c7c1893fd550a7982e1e55d188b0fd SHA1 a9c23e1a22cf7764ed23ce0cbbeb56a416e7f189 SHA256 b5caa56458a0caa7fc708bcd4f9e665c4e047749cf55420c37bb4048a5246101
+MD5 c0a4182280fd081bb682331e4b6d1d6e tunepimp-0.4.2.ebuild 2211
+RMD160 cc693f78d1c7c1893fd550a7982e1e55d188b0fd tunepimp-0.4.2.ebuild 2211
+SHA256 b5caa56458a0caa7fc708bcd4f9e665c4e047749cf55420c37bb4048a5246101 tunepimp-0.4.2.ebuild 2211
+MISC ChangeLog 4031 RMD160 50eb910a1e9d20f230247b6af593f7658936da55 SHA1 28942a26a7652c6fd400fe184fbe963b39cb2a40 SHA256 69449356d18cadafefc4d448dfee549bd1badc3b09baafec56a0a188f7199ca8
+MD5 4cfc108649465dc277b8cd8198bb1fa3 ChangeLog 4031
+RMD160 50eb910a1e9d20f230247b6af593f7658936da55 ChangeLog 4031
+SHA256 69449356d18cadafefc4d448dfee549bd1badc3b09baafec56a0a188f7199ca8 ChangeLog 4031
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
@@ -55,7 +63,7 @@ SHA256 e886386ed5b3a9d815965cf85956c26cedf5cccb047ef1b0694eb8597ff2191f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEcPNoAiZjviIA2XgRAg4PAJ9Rpwko/PZfvTbWTDir9JmzEVzKgACeIBV+
-uU7Nfg+wp0bcD4Jd0cnxWs4=
-=TJBH
+iD8DBQFEdJ+vAiZjviIA2XgRAuvQAJ4tjYoUFi4cgI89LxbONJnG06MJTQCg3SCH
+Oh5rtBUpan6zB9E1H54YhkM=
+=bwzw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/tunepimp/files/tunepimp-0.4.2-libiconv.patch b/media-libs/tunepimp/files/tunepimp-0.4.2-libiconv.patch
new file mode 100644
index 000000000000..a2e2e8b8cc26
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.4.2-libiconv.patch
@@ -0,0 +1,39 @@
+Index: libtunepimp-0.4.2/configure.in
+===================================================================
+--- libtunepimp-0.4.2.orig/configure.in
++++ libtunepimp-0.4.2/configure.in
+@@ -99,18 +99,19 @@ if test "x$ac_cv_header_iconv_h" = "xyes
+       AC_CHECK_LIB(iconv, libiconv, ac_found_iconv=yes)
+     fi
+     if test "x$ac_found_iconv" != "xno"; then
+-      LIBS="-liconv $LIBS"
++     LIBICONV="-liconv"
+     fi
+   else
+     dnl Handle case where there is a native iconv but iconv.h is from libiconv
+     AC_CHECK_DECL(_libiconv_version,
+-      [ AC_CHECK_LIB(iconv, libiconv, LIBS="-liconv $LIBS") ],,
++      [ AC_CHECK_LIB(iconv, libiconv, LIBICONV="-liconv") ],,
+       [ #include <iconv.h> ])
+   fi
+ fi
+ if test "x$ac_found_iconv" = xyes; then
+   AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ fi
++AC_SUBST(LIBICONV)
+ 
+ if test "x$use_lgpl" = "xno"; then
+     dnl Check for MAD decoder lib for mp3 support
+Index: libtunepimp-0.4.2/lib/Makefile.am
+===================================================================
+--- libtunepimp-0.4.2.orig/lib/Makefile.am
++++ libtunepimp-0.4.2/lib/Makefile.am
+@@ -49,7 +49,7 @@ libtunepimp_la_SOURCES = tunepimp.cpp fi
+ #  2:0:0 - TunePimp implementation for version 0.3.x
+ #  3:0:0 - TunePimp implementation for version 0.4.x
+ libtunepimp_la_LDFLAGS = -version-info 3:0:0
+-libtunepimp_la_LIBADD = threads/posix/libtpthread.la utf8/libutf8.la -lmusicbrainz -lz $(LIBLTDL) -lm
++libtunepimp_la_LIBADD = threads/posix/libtpthread.la utf8/libutf8.la -lmusicbrainz -lz $(LIBLTDL) -lm $(LIBICONV)
+ 
+ noinst_LTLIBRARIES = libpluginsupport.la
+ libpluginsupport_la_SOURCES = metadata.cpp fileio.cpp
diff --git a/media-libs/tunepimp/files/tunepimp-0.4.2-noautomatic.patch b/media-libs/tunepimp/files/tunepimp-0.4.2-noautomatic.patch
new file mode 100644
index 000000000000..f3b4f2b49028
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.4.2-noautomatic.patch
@@ -0,0 +1,78 @@
+Index: libtunepimp-0.4.2/configure.in
+===================================================================
+--- libtunepimp-0.4.2.orig/configure.in
++++ libtunepimp-0.4.2/configure.in
+@@ -64,7 +64,10 @@ AC_CHECK_LIB(z, compress,,
+ 	     ],)
+ 
+ dnl Check for readline. This is optional.
+-AC_CHECK_LIB(readline, readline,
++AC_ARG_WITH([readline], AC_HELP_STRING([--without-readline], [Disable readline support (default: check)]))
++
++if test "x$with_readline" != "xno"; then
++  AC_CHECK_LIB(readline, readline,
+              [READLINE_LIBS="-lreadline -lncurses"
+              AC_DEFINE(HAVE_LIBREADLINE,1,[Readline Support])],
+              [echo "*"
+@@ -73,22 +76,31 @@ AC_CHECK_LIB(readline, readline,
+              echo "*  have readline support."
+              echo "*"
+ 	     ],-ltermcap)
++fi
+ 
+ AC_CHECK_HEADERS(iconv.h)
+ 
+ dnl Check for TagLib 1.4
+-AC_CHECK_TAGLIB(1.4.0, 
++AC_ARG_WITH([taglib], AC_HELP_STRING([--with-taglib], [Enable taglib support (default: check)]))
++
++if test "x$with_taglib" != "xno"; then
++  AC_CHECK_TAGLIB(1.4.0, 
+                 [TP_PLUGINS="$TP_PLUGINS mpc wma"
+                 AC_DEFINE(HAVE_TAGLIB,1,[TagLib Support])],
+ 		[AC_MSG_RESULT([no])
+ 		echo "*** NOT compiling TagLib support"
+ 		])
++fi
+ 
+ dnl Check for mp4v2
+-AC_CHECK_LIB(mp4v2, MP4Read, 
++AC_ARG_WITH([mp4v2], AC_HELP_STRING([--with-mp4v2], [Enable MP4 support (default: check)]))
++
++if test "x$with_mp4v2" != "xno"; then
++  AC_CHECK_LIB(mp4v2, MP4Read, 
+              [TP_PLUGINS="$TP_PLUGINS mp4"
+ 	     AC_DEFINE(HAVE_MP4V2,1,[MP4 Support])],
+ 	     [echo "*** NOT compiling MP4 support"])
++fi
+ 
+ dnl Find iconv. It may be in libiconv and may be iconv() or libiconv()
+ if test "x$ac_cv_header_iconv_h" = "xyes"; then
+@@ -126,8 +138,12 @@ if test "x$use_lgpl" = "xno"; then
+                  ,-lm)
+ fi
+ 
+-AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
+-AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
++AC_ARG_WITH([vorbis], AC_HELP_STRING([--without-vorbis], [Disable Vorbis support (default: check)]))
++
++if test "x$with_vorbis" != "xno"; then
++  AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
++  AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
++fi
+ 
+ dnl Check for Ogg/Vorbis
+ if test "x$have_ogg" = "xyes"; then
+@@ -139,7 +155,11 @@ if test "x$have_ogg" = "xyes"; then
+   fi
+ fi
+ 
+-AC_CHECK_LIB(FLAC, FLAC__metadata_object_new, have_flac="yes",, -lFLAC -lm)
++AC_ARG_WITH([flac], AC_HELP_STRING([--without-flac], [Disable FLAC support (default: check)]))
++
++if test "x$with_flac" != "xno"; then
++  AC_CHECK_LIB(FLAC, FLAC__metadata_object_new, have_flac="yes",, -lFLAC -lm)
++fi
+ 
+ dnl Check for libFLAC
+ if test "x$have_flac" = "xyes"; then
diff --git a/media-libs/tunepimp/tunepimp-0.4.2.ebuild b/media-libs/tunepimp/tunepimp-0.4.2.ebuild
index 16ea11ff3f84..478f1e03f667 100644
--- a/media-libs/tunepimp/tunepimp-0.4.2.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.4.2.ebuild,v 1.1 2006/05/21 23:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.4.2.ebuild,v 1.2 2006/05/24 18:02:15 flameeyes Exp $
 
-inherit eutils distutils perl-app libtool
+inherit eutils distutils perl-app libtool autotools
 
 MY_P="lib${P}"
 S=${WORKDIR}/${MY_P}
@@ -14,13 +14,15 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples flac mp3 readline perl python vorbis"
+IUSE="examples flac mp3 readline perl python vorbis taglib aac"
 
 RDEPEND=">=media-libs/musicbrainz-2.1.0
 	flac? ( media-libs/flac )
 	vorbis? ( media-libs/libvorbis )
 	readline? ( sys-libs/readline )
 	mp3? ( media-libs/libmad )
+	taglib? ( >=media-libs/taglib-1.4 )
+	aac? ( media-libs/libmp4v2 )
 	!media-sound/trm"
 
 DEPEND="${RDEPEND}
@@ -30,16 +32,28 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-libiconv.patch"
+	epatch "${FILESDIR}/${P}-noautomatic.patch"
+
 	# do not try to link against obsolete libtermcap
-	sed -i -e 's,-ltermcap,-lncurses,' "${S}/configure"
+	sed -i -e 's,-ltermcap,-lncurses,' "${S}/configure.in"
 	# Link against libpthread on FreeBSD
-	sed -i -e 's:-lthr:-lpthread:g' "${S}/lib/threads/posix/Makefile.in"
+	sed -i -e 's:-lthr:-lpthread:g' "${S}/lib/threads/posix/Makefile.am"
 
+	eautoreconf
 	elibtoolize
 }
 
 src_compile() {
-	econf || die "configure failed"
+	econf \
+		$(use_with taglib) \
+		$(use_with aac mp4v2) \
+		$(use_enable !mp3 lgpl) \
+		$(use_with flac) \
+		$(use_with vorbis) \
+		$(use_with readline) \
+		--disable-dependency-tracking \
+		|| die "configure failed"
 	emake || die "emake failed"
 	if use perl; then
 		cd ${S}/perl/tunepimp-perl