From 1c20c4b4bfaf16033957991a6027e8bd946abb87 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 9 Jul 2017 21:06:23 +0200
Subject: [PATCH] libid3tag, fix missing pkg-config file (#1502)

---
 media-libs/libid3tag/libid3tag-0.15.1b.recipe | 16 +++--
 .../patches/libid3tag-0.15.1b.patchset        | 65 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index a56fa8a8f..e8e3b5f7d 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -4,12 +4,12 @@ ID3v1 and the various versions of ID3v2."
 HOMEPAGE="http://www.underbit.com/products/mad/"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz"
 CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 PATCHES="libid3tag-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -43,9 +43,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal-1.13
-	autoconf
+	touch AUTHORS ChangeLog NEWS
+	autoreconf -vfi
 	runConfigure ./configure
 	make
 }
@@ -53,8 +52,13 @@ BUILD()
 INSTALL()
 {
 	make install
+
 	prepareInstalledDevelLib libid3tag
-	packageEntries devel $developDir
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
diff --git a/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
index bc3650265..c159960d8 100644
--- a/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
+++ b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
@@ -1,4 +1,4 @@
-From 2e29df8743bf7230cc122b0a6a255f625e8f46a7 Mon Sep 17 00:00:00 2001
+From e862dbaf6c43a65bd7ea7c1ff9c07939ab6e7fb3 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 30 Mar 2014 13:20:55 +0200
 Subject: AM_CONFIG_HEADER > AC_CONFIG_HEADER
@@ -18,5 +18,66 @@ index a0a0237..a754f06 100644
  dnl System type.
  
 -- 
-1.8.3.4
+2.7.0
+
+
+From 1961200ab30344b03e6067dd1082e23caf0812ca Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 9 Jul 2017 18:29:40 +0200
+Subject: libid3tag, fix missing pkg-config file
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 3ee9aa6..78af912 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -21,7 +21,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS =		
++SUBDIRS =
+ DIST_SUBDIRS =		msvc++
+ 
+ lib_LTLIBRARIES =	libid3tag.la
+@@ -94,6 +94,9 @@ libid3tag_la_LDFLAGS =	-version-info $(version_info)
+ 
+ BUILT_SOURCES =		frametype.c compat.c genre.dat
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = id3tag.pc
++
+ $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
+ 	cd $(srcdir) &&  \
+ 	gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*'  \
+diff --git a/configure.ac b/configure.ac
+index a754f06..c8d828d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -201,5 +201,5 @@ dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libid3tag.list])
++	libid3tag.list id3tag.pc])
+ AC_OUTPUT
+diff --git a/id3tag.pc.in b/id3tag.pc.in
+new file mode 100644
+index 0000000..2d98ddd
+--- /dev/null
++++ b/id3tag.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: id3tag
++Description: ID3 tag reading library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lid3tag -lz
++Cflags: -I${includedir}
+-- 
+2.7.0