Version bump

(Portage version: 2.1.2-r7)

6 files changed, 172 insertions, 1 deletions

diff --git a/media-libs/libjackasyn/ChangeLog b/media-libs/libjackasyn/ChangeLog
index 752a7eebb5fc..34fbcad98f1a 100644
--- a/media-libs/libjackasyn/ChangeLog
+++ b/media-libs/libjackasyn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libjackasyn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/ChangeLog,v 1.12 2007/02/03 23:19:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/ChangeLog,v 1.13 2007/02/04 13:26:58 aballier Exp $
+
+*libjackasyn-0.13 (04 Feb 2007)
+
+  04 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/libjackasyn-0.13-libdir.patch, +files/libjackasyn-0.13-pic.patch,
+  +files/libjackasyn-0.13-qa.patch, +libjackasyn-0.13.ebuild:
+  Version bump
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> libjackasyn-0.10.ebuild:
   Update src_uri
diff --git a/media-libs/libjackasyn/files/digest-libjackasyn-0.13 b/media-libs/libjackasyn/files/digest-libjackasyn-0.13
new file mode 100644
index 000000000000..e6c01b9e4078
--- /dev/null
+++ b/media-libs/libjackasyn/files/digest-libjackasyn-0.13
@@ -0,0 +1,3 @@
+MD5 7f82157b64aa4936e695b923a75df291 libjackasyn-0.13.tar.gz 74041
+RMD160 0f02cf2d91d5c5b9be26bae706b538a9da38f92d libjackasyn-0.13.tar.gz 74041
+SHA256 77cf477815a054d508b0bdd34ffcedfe22c091bfbd4367c55c7e33e29089a902 libjackasyn-0.13.tar.gz 74041
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch
new file mode 100644
index 000000000000..d6a855bda6b8
--- /dev/null
+++ b/media-libs/libjackasyn/files/libjackasyn-0.13-libdir.patch
@@ -0,0 +1,27 @@
+diff -u -r libjackasyn-0.13.old/jacklaunch.in libjackasyn-0.13/jacklaunch.in
+--- libjackasyn-0.13.old/jacklaunch.in	2007-02-04 14:07:28.000000000 +0100
++++ libjackasyn-0.13/jacklaunch.in	2007-02-04 14:08:17.000000000 +0100
+@@ -26,18 +26,20 @@
+ 
+ PREFIX=@prefix@
+ 
++LIBDIR=@libdir@
++
+ LD_PRELOAD_OLD=""
+ 
+ if test "$LD_PRELOAD" != ""
+ then
+  LD_PRELOAD_OLD=$LD_PRELOAD
+- PRELOAD=$LD_PRELOAD:$PREFIX/lib/libjackasyn.so.0
++ PRELOAD=$LD_PRELOAD:$LIBDIR/libjackasyn.so.0
+ else
+- PRELOAD=$PREFIX/lib/libjackasyn.so.0
++ PRELOAD=$LIBDIR/libjackasyn.so.0
+ fi
+ 
+ 
+-if test -f $PREFIX/lib/libjackasyn.so.0 -a "$jackcnt" != "0"
++if test -f $LIBDIR/libjackasyn.so.0 -a "$jackcnt" != "0"
+ then 
+   export LD_PRELOAD=$PRELOAD
+ fi
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch
new file mode 100644
index 000000000000..c52d6b65a6b1
--- /dev/null
+++ b/media-libs/libjackasyn/files/libjackasyn-0.13-pic.patch
@@ -0,0 +1,47 @@
+diff -u -r libjackasyn-0.13.old/Makefile.in libjackasyn-0.13/Makefile.in
+--- libjackasyn-0.13.old/Makefile.in	2007-02-04 14:17:35.000000000 +0100
++++ libjackasyn-0.13/Makefile.in	2007-02-04 14:18:05.000000000 +0100
+@@ -5,10 +5,11 @@
+ 
+ TARGET = libjackasyn
+ 
+-SRC_FILES = libjackasyn.c libjackoss.c clientfuncs.c
++SRC_FILES = libjackasyn.c libjackoss.c 
+ OBJ_FILES = $(SRC_FILES:.c=.o) libjackoss_pl.o
++OBJ_PIC = $(OBJ_FILES:.o=.opic)
+ HEADERS = libjackasyn.h libjackoss.h
+-CFLAGS = -O2 -Wall -I. -fPIC -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@
++CFLAGS_ADD = -I. -rdynamic -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) @DEBUG@
+ LIBS =  -lc @LIBS@
+ 
+ 
+@@ -18,12 +19,17 @@
+ 
+ all: static shared
+ 
++%.o : %.c
++	$(CC) $(CFLAGS) $(CFLAGS_ADD) -c $< -o $@
++
++%.opic : %.c
++	$(CC) $(CFLAGS) $(CFLAGS_ADD) -fPIC -c $< -o $@
+ 
+ static: $(OBJ_FILES)
+-	ar cr libjackasyn.a *.o 
++	ar cr libjackasyn.a $(OBJ_FILES)
+ 
+-shared:
+-	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) *.o $(LIBS)
++shared: $(OBJ_PIC)
++	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) $(OBJ_PIC) $(LIBS)
+ 
+ install:
+ 	-install -d $(DESTDIR)/$(libdir)
+@@ -58,4 +64,7 @@
+ $(OBJ_FILES) : $(HEADERS)
+ 
+ libjackoss_pl.o: libjackoss.c
+-	$(CC) -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
++	$(CC) -c $(CFLAGS) $(CFLAGS_ADD) -DLD_PRELOAD -o $@ $<
++
++libjackoss_pl.opic: libjackoss.c
++	$(CC) -c $(CFLAGS) $(CFLAGS_ADD) -fPIC -DLD_PRELOAD -o $@ $<
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch b/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch
new file mode 100644
index 000000000000..437faa9a6adf
--- /dev/null
+++ b/media-libs/libjackasyn/files/libjackasyn-0.13-qa.patch
@@ -0,0 +1,48 @@
+diff -u -r libjackasyn-0.13.old/Makefile.in libjackasyn-0.13/Makefile.in
+--- libjackasyn-0.13.old/Makefile.in	2007-02-04 13:26:52.000000000 +0100
++++ libjackasyn-0.13/Makefile.in	2007-02-04 13:27:14.000000000 +0100
+@@ -14,6 +14,7 @@
+ 
+ prefix = @prefix@
+ 
++libdir = @libdir@
+ 
+ all: static shared
+ 
+@@ -22,22 +23,21 @@
+ 	ar cr libjackasyn.a *.o 
+ 
+ shared:
+-	gcc -shared -Wl,-soname=libjackasyn.so.0 -o libjackasyn.so.$(VERSION) *.o $(LIBS)
++	$(CC) -shared -Wl,-soname=libjackasyn.so.0 $(LDFLAGS) -o libjackasyn.so.$(VERSION) *.o $(LIBS)
+ 
+ install:
+-	-rm $(DESTDIR)/$(prefix)/lib/libjackasyn.so*
+-	-install -d $(DESTDIR)/$(prefix)/lib
++	-install -d $(DESTDIR)/$(libdir)
+ 	-install -d $(DESTDIR)/$(prefix)/include
+-	install -m 644 libjackasyn.a $(DESTDIR)/$(prefix)/lib
+-	install -m 644 libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib
++	install -m 644 libjackasyn.a $(DESTDIR)/$(libdir)
++	install -m 644 libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)
+ 	install -m 644 libjackoss.h $(DESTDIR)/$(prefix)/include
+-	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib/libjackasyn.so.0
+-	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(prefix)/lib/libjackasyn.so
++	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)/libjackasyn.so.0
++	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)/$(libdir)/libjackasyn.so
+ 	-install -d $(DESTDIR)/$(prefix)/bin
+ 	install -m 755 jacklaunch $(DESTDIR)/$(prefix)/bin
+ 
+ test:
+-	gcc -o test test.c libjackasyn.a -ljack -ldl -lm
++	$(CC) -o test test.c libjackasyn.a -ljack -ldl -lm
+ 
+ clean:
+ 	-rm *~ $(OBJ_FILES)
+@@ -58,4 +58,4 @@
+ $(OBJ_FILES) : $(HEADERS)
+ 
+ libjackoss_pl.o: libjackoss.c
+-	gcc -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
++	$(CC) -c $(CFLAGS) -DLD_PRELOAD -o $@ $<
+Only in libjackasyn-0.13.old: Makefile.in.orig
diff --git a/media-libs/libjackasyn/libjackasyn-0.13.ebuild b/media-libs/libjackasyn/libjackasyn-0.13.ebuild
new file mode 100644
index 000000000000..11efa59f1f3e
--- /dev/null
+++ b/media-libs/libjackasyn/libjackasyn-0.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/libjackasyn-0.13.ebuild,v 1.1 2007/02/04 13:26:58 aballier Exp $
+
+
+inherit eutils toolchain-funcs
+
+IUSE="debug"
+
+DESCRIPTION="An application/library for connecting OSS apps to Jackit."
+HOMEPAGE="http://gige.xdv.org/soft/libjackasyn"
+SRC_URI="http://gige.xdv.org/soft/libjackasyn/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DEPEND="media-sound/jack-audio-connection-kit
+	media-libs/libsamplerate"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-qa.patch"
+	epatch "${FILESDIR}/${P}-pic.patch"
+	epatch "${FILESDIR}/${P}-libdir.patch"
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="--enable-debug"
+	econf ${myconf} || die
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS CHANGELOG WORKING TODO README
+}