Version bump to 1.5.8 Bug #310143

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 178 insertions, 3 deletions

diff --git a/media-libs/libjsw/ChangeLog b/media-libs/libjsw/ChangeLog
index 03066e60d3f2..9294818f571b 100644
--- a/media-libs/libjsw/ChangeLog
+++ b/media-libs/libjsw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libjsw
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.15 2007/08/13 21:00:45 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.16 2010/03/22 16:17:05 tupone Exp $
+
+*libjsw-1.5.8 (22 Mar 2010)
+
+  22 Mar 2010; Alfredo Tupone <tupone@gentoo.org> +libjsw-1.5.8.ebuild,
+  +files/libjsw-1.5.8-build.patch:
+  Version bump to 1.5.8 Bug #310143 by Lars Wendler (Polynomial-C)
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> libjsw-1.5.6.ebuild:
   ppc. stable
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index 0e8f1be2362c..c9a0dd11e880 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,5 +1,8 @@
 AUX libjsw-1.5.6-build.patch 3057 RMD160 765b3d16bb6c32767b07f0a353bd866cb81306d5 SHA1 d0f24db8053e37026fec7ca34bfef5004287cca5 SHA256 8209898b7e16de9567feb6c29096e094f68338f5454f139986ac192d79a64a83
+AUX libjsw-1.5.8-build.patch 3093 RMD160 d39841ab5df677a8c77f64cba9657970a6d8c182 SHA1 eb2c7ccd1ce82e3bf1fb68fa2189bfecc1b9009a SHA256 d3b9c9af7277085a7bef4316e0a9370025cb8389db92256b68b598e05951a67e
 DIST libjsw-1.5.6.tar.bz2 322826 RMD160 37d562beb1ebde7cede53daca2ef7d9237985db6 SHA1 bef77af685d90d95cbd5878b0f3c93f834a52832 SHA256 59495f4a1c090d32977da96300d17b165ad181518e4c3ac4702d3a8c7ed7ccc3
+DIST libjsw-1.5.8.tar.bz2 348121 RMD160 29024ae37a248ef8c5bc72a2542477d8bab87508 SHA1 9b13257616ede4587594fb3443b3ecc9e6afe78a SHA256 082461dbf67efbd7e682b0675b0ced36430c5b1abc152c977e41b98de68fc811
 EBUILD libjsw-1.5.6.ebuild 1343 RMD160 017bd44ba8ffb12b39b8156ff4093ba6d7fbc97c SHA1 af1f48b7f368bc9108948c932c82497afb9e3bb4 SHA256 ea5d02b004e69f01ae12543a1d17aadcaac146b1cc039ac2d89d9035ff45a482
-MISC ChangeLog 2201 RMD160 477679de7ad90eaec5966ea4833d05ca4c23fe13 SHA1 d0344a4a67c1e611d429fbfe61a0ff9f0f03ae75 SHA256 1b6791667fc59f5572aa17e64f3ff5287f66177df7f3e915d0aacfa7c8fed6de
+EBUILD libjsw-1.5.8.ebuild 1335 RMD160 82bb1072a12f0f224ee098673b926791ea44ab3a SHA1 76ed54e13f0670f8bb8ec33161368d5e46f431cf SHA256 178a79b6b8f62c2938c5383c854a9f26c61c78aa1d0b338b5e44a07ffaa2bd40
+MISC ChangeLog 2401 RMD160 6cce309ee72d4527d1aaacbbfbcbf174973d6baa SHA1 c91ca8f811d39b9ef0e9c3f973c1728e5ac031ab SHA256 f9b25b50bfafa775127e676f0ac3b107400ff18a0dfb3a7a22a3dcb2232ac3b1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/media-libs/libjsw/files/libjsw-1.5.8-build.patch b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
new file mode 100644
index 000000000000..d786195058c1
--- /dev/null
+++ b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
@@ -0,0 +1,110 @@
+--- libjsw/Makefile.old	2010-03-22 17:03:21.000000000 +0100
++++ libjsw/Makefile	2010-03-22 17:07:02.000000000 +0100
+@@ -51,10 +51,10 @@
+ #                               to debug the program.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
+-CFLAGS += -ffast-math
++CFLAGS += -fPIC
++CXXFLAGS += -fPIC
+ 
+-CPPFLAGS = -D__cplusplus
++CPPFLAGS += -D__cplusplus
+ 
+ 
+ # ########################################################################
+@@ -82,11 +82,9 @@
+ OBJ_C   = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+ .cpp.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
++	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
+ 
+ 
+ # ########################################################################
+@@ -95,13 +93,7 @@
+ $(LIB): prebuild modules postbuild
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+-	@echo  -n "Linking modules..."
+-	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+-	@echo -n "   "
+-	@$(RM) $(RMFLAGS) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so.1
+-	@-$(LS) $(LSFLAGS) $(LIB)
++	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS)
+ 
+ prebuild:
+ 	@echo "Building library \"$(LIB)\"..."
+--- jscalibrator/Makefile.old	2010-03-22 17:08:07.000000000 +0100
++++ jscalibrator/Makefile	2010-03-22 17:11:26.000000000 +0100
+@@ -59,9 +59,6 @@
+ #CFLAGS = -Wall -O -g \
+ #         `gtk-config --cflags`
+ 
+-CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops -ffast-math \
+-         `gtk-config --cflags`
+-
+ CPPFLAGS = -D__cplusplus
+ 
+ 
+@@ -76,7 +73,7 @@
+ #   to the LIB line depending on what you have set in the CFLAGS line
+ #   farther above.
+ #
+-LIBS = -ljsw `gtk-config --libs`
++LIBS := -ljsw $(shell gtk-config --libs)
+ 
+ # Library Directories:
+ #
+@@ -85,7 +82,7 @@
+ #   Each argument is of the format -L<dir> where <dir> is the full
+ #   path to the directory.
+ #
+-LIB_DIRS =
++LIB_DIRS = -L../libjsw
+ 
+ # Header File Directories:
+ #
+@@ -95,7 +92,7 @@
+ #   Each argument is of the format -I<dir> where <dir> is the full
+ #   path to the directory.
+ #
+-INC_DIRS =
++INC_DIRS = $(shell gtk-config --cflags) -I../libjsw
+ 
+ 
+ # ########################################################################
+@@ -117,11 +114,9 @@
+ OBJ_C   = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+ .cpp.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
++	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
+ 
+ 
+ # ########################################################################
+@@ -130,10 +125,7 @@
+ $(BIN): prebuild modules postbuild
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+-	@echo  -n "Linking modules..."
+-	@$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+-	@echo -n "   "
+-	@-$(LS) $(LSFLAGS) $(BIN)
++	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LDFLAGS) $(LIB_DIRS) $(LIBS)
+ 
+ prebuild:
+ 	@echo "Building program \"$(BIN)\"..."
diff --git a/media-libs/libjsw/libjsw-1.5.8.ebuild b/media-libs/libjsw/libjsw-1.5.8.ebuild
new file mode 100644
index 000000000000..847f20db12ed
--- /dev/null
+++ b/media-libs/libjsw/libjsw-1.5.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.8.ebuild,v 1.1 2010/03/22 16:17:05 tupone Exp $
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers"
+HOMEPAGE="http://freshmeat.net/projects/libjsw/"
+SRC_URI="http://wolfsinger.com/~wolfpack/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="gtk"
+
+DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+
+src_prepare() {
+	cp include/jsw.h libjsw/
+	epatch "${FILESDIR}"/${P}-build.patch
+	bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed"
+}
+
+src_compile() {
+	cd libjsw
+	emake || die "main build failed"
+	ln -s libjsw.so.${PV} libjsw.so
+
+	if use gtk ; then
+		cd ../jscalibrator
+		emake || die "jscalibrator failed"
+	fi
+}
+
+src_install() {
+	insinto /usr/include
+	doins include/jsw.h || die "doins jsw.h failed"
+
+	dodoc AUTHORS README
+	docinto jswdemos
+	dodoc jswdemos/*
+
+	cd "${S}"/libjsw
+	dolib.so libjsw.so.${PV} || die "dolib.so"
+	dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so
+	doman man/*
+
+	if use gtk ; then
+		cd "${S}"/jscalibrator
+		dobin jscalibrator || die
+		doman jscalibrator.1
+		insinto /usr/share/${PN}
+		doins -r data/help
+	fi
+}