fixes and made lib build with -fPIC

Package-Manager: portage-2.0.51-r15

6 files changed, 78 insertions, 10 deletions

diff --git a/media-sound/ptabtools/ChangeLog b/media-sound/ptabtools/ChangeLog
index 72999fc03030..55f5a15998b0 100644
--- a/media-sound/ptabtools/ChangeLog
+++ b/media-sound/ptabtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ptabtools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ChangeLog,v 1.4 2004/12/19 06:15:33 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ChangeLog,v 1.5 2005/02/20 19:19:11 pkdawson Exp $
+
+*ptabtools-0.3.1-r1 (20 Feb 2005)
+
+  20 Feb 2005; Patrick Dawson <pkdawson@gentoo.org>
+  +files/ptabtools-0.3.1-fPIC.patch, +ptabtools-0.3.1-r1.ebuild:
+  Fixed a few problems, made library build with -fPIC.
+  Closes bug #81955. Thanks to Yaakov S.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   ptabtools-0.3.1.ebuild:
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
index cf63426f64a6..dd5c74b8f9a6 100644
--- a/media-sound/ptabtools/Manifest
+++ b/media-sound/ptabtools/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 55265d869b8ad3e09f57c26ebe04b7b5 ChangeLog 701
+MD5 778a7bacb2b422b592fa142d214ad181 ptabtools-0.3.1-r1.ebuild 1036
+MD5 e771ed0f3861a459b8284228765bf9ce ptabtools-0.3.1.ebuild 755
+MD5 daa14ba441e1063d35cad44d5dc4f380 ChangeLog 948
 MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 382c82a17ddb813a3381a1ce1efef868 ptabtools-0.3.1.ebuild 757
+MD5 c2c473c8b1b1caabcadd86a480b1e098 files/ptabtools-0.3.1-fPIC.patch 586
 MD5 24b33a79baff0ec4ed867727fb49fc36 files/digest-ptabtools-0.3.1 66
+MD5 24b33a79baff0ec4ed867727fb49fc36 files/digest-ptabtools-0.3.1-r1 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBxRybArHZZzCEUG0RAqW5AKCLQBdasikv3vls+U16+Q+QeBpNgQCfczh7
-plLCaOIvRpbB5RYCTdXF6Yg=
-=subY
+iD8DBQFCGOK445JRcz4sDuoRAjehAJ4i2ny62K+34u6PtEqYbrKFuKphMACfUIqz
+RJfpOd+ApXImZTxa3R3xrTo=
+=3fBe
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ptabtools/files/digest-ptabtools-0.3.1-r1 b/media-sound/ptabtools/files/digest-ptabtools-0.3.1-r1
new file mode 100644
index 000000000000..73541fcb20b5
--- /dev/null
+++ b/media-sound/ptabtools/files/digest-ptabtools-0.3.1-r1
@@ -0,0 +1 @@
+MD5 2eb803142b04f6a4b4b4e8e96f96b865 ptabtools_0.3-1.tar.gz 66984
diff --git a/media-sound/ptabtools/files/ptabtools-0.3.1-fPIC.patch b/media-sound/ptabtools/files/ptabtools-0.3.1-fPIC.patch
new file mode 100644
index 000000000000..7165f19cf0d8
--- /dev/null
+++ b/media-sound/ptabtools/files/ptabtools-0.3.1-fPIC.patch
@@ -0,0 +1,12 @@
+diff -ur ptabtools-0.3.orig/Makefile ptabtools-0.3/Makefile
+--- ptabtools-0.3.orig/Makefile	2005-02-19 20:07:47.000000000 -0500
++++ ptabtools-0.3/Makefile	2005-02-19 20:10:27.951481769 -0500
+@@ -26,7 +26,7 @@
+ 	$(CC) $(CFLAGS) -c $< `pkg-config --cflags glib-2.0`
+ 
+ libptb-$(PTB_VERSION).so: $(PTBSO_OBJS)
+-	$(CC) -shared $(CFLAGS) -o $@ $(PTBSO_OBJS) `pkg-config --libs glib-2.0`
++	$(CC) -shared -fPIC $(CFLAGS) -o $@ $(PTBSO_OBJS) `pkg-config --libs glib-2.0`
+ 
+ ptb2xml: $(PTB2XML_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(PTB2XML_OBJS) `pkg-config --libs glib-2.0 libxml-2.0 libxslt` -lpopt
diff --git a/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild b/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..f57219ab9313
--- /dev/null
+++ b/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ptabtools-0.3.1-r1.ebuild,v 1.1 2005/02/20 19:19:11 pkdawson Exp $
+
+inherit eutils
+
+MY_PV=${PV%.*}-${PV##*.}
+
+DESCRIPTION="A set of utilities to use powertab files (.ptb)"
+HOMEPAGE="http://jelmer.vernstok.nl/oss/ptabtools/"
+SRC_URI="http://jelmer.vernstok.nl/releases/${PN}_${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE="xml2"
+
+DEPEND="dev-libs/popt
+	dev-libs/libxml2
+	xml2? ( dev-libs/libxml2
+		dev-libs/libxslt )"
+
+S=${WORKDIR}/${PN}-${PV%.*}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
+src_compile() {
+	sed -i "s:CFLAGS =:CFLAGS = ${CFLAGS}:" Makefile
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/lib/pkgconfig
+	dodir /usr/include
+	dodoc AUTHORS ChangeLog README TODO
+
+	sed -i "s:/usr/local:/usr:" ptabtools.pc
+	sed -i "s:-lptb:-lptb-0.2:" ptabtools.pc
+	einstall || die
+}
diff --git a/media-sound/ptabtools/ptabtools-0.3.1.ebuild b/media-sound/ptabtools/ptabtools-0.3.1.ebuild
index ea0b155ff905..7dd6e370f55e 100644
--- a/media-sound/ptabtools/ptabtools-0.3.1.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ptabtools-0.3.1.ebuild,v 1.4 2004/12/19 06:15:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ptabtools/ptabtools-0.3.1.ebuild,v 1.5 2005/02/20 19:19:11 pkdawson Exp $
 
 IUSE=""