Bump, and fix bug #110789 about online help

Package-Manager: portage-2.1_rc2-r3

5 files changed, 204 insertions, 15 deletions

diff --git a/media-libs/libjsw/ChangeLog b/media-libs/libjsw/ChangeLog
index 61ead0d07629..402459b453a8 100644
--- a/media-libs/libjsw/ChangeLog
+++ b/media-libs/libjsw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libjsw
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.10 2006/04/25 00:04:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.11 2006/05/29 18:01:24 tupone Exp $
+
+*libjsw-1.5.6 (29 May 2006)
+
+  29 May 2006; <Tupone@gentoo.org> +files/libjsw-1.5.6-build.patch,
+  +libjsw-1.5.6.ebuild:
+  Bump version.
+  Fix online help, bug #110789 by Toralf Förster
+  Fix compiling without the jsw.h header file already in
 
   25 Apr 2006; Mike Frysinger <vapier@gentoo.org>
   +files/libjsw-1.5.5-build.patch, files/libjsw-1.5.5-gcc33.patch,
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index de48d86d565f..3eab836d0ae8 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,38 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libjsw-1.5.5-build.patch 3065 RMD160 1288670ceb0b3118c5e7fa0592033a3843a23e61 SHA1 f9486aa283637486af247ab78fb0d5f595235866 SHA256 43e11096411c00f11e6d1c6c0d86a71d58fcf942bb96f8c3e4fa81aaeacba297 size 3065
+AUX libjsw-1.5.5-build.patch 3065 RMD160 1288670ceb0b3118c5e7fa0592033a3843a23e61 SHA1 f9486aa283637486af247ab78fb0d5f595235866 SHA256 43e11096411c00f11e6d1c6c0d86a71d58fcf942bb96f8c3e4fa81aaeacba297
 MD5 fa2c3427b3a8b4b2643017e53a616589 files/libjsw-1.5.5-build.patch 3065
 RMD160 1288670ceb0b3118c5e7fa0592033a3843a23e61 files/libjsw-1.5.5-build.patch 3065
 SHA256 43e11096411c00f11e6d1c6c0d86a71d58fcf942bb96f8c3e4fa81aaeacba297 files/libjsw-1.5.5-build.patch 3065
-AUX libjsw-1.5.5-gcc33.patch 1249 RMD160 7868e11d2f2af71d0077e62f595f6d64fe04695f SHA1 a59d46f165663e3c01d59577bab5d91326081ca9 SHA256 42eafc62248d408b5cac6c1e61554f74ea40c41014edeb56ed88d7f820d8e750 size 1249
+AUX libjsw-1.5.5-gcc33.patch 1249 RMD160 7868e11d2f2af71d0077e62f595f6d64fe04695f SHA1 a59d46f165663e3c01d59577bab5d91326081ca9 SHA256 42eafc62248d408b5cac6c1e61554f74ea40c41014edeb56ed88d7f820d8e750
 MD5 e30e8ea272facf8c6ad0cf0a2f80c400 files/libjsw-1.5.5-gcc33.patch 1249
 RMD160 7868e11d2f2af71d0077e62f595f6d64fe04695f files/libjsw-1.5.5-gcc33.patch 1249
 SHA256 42eafc62248d408b5cac6c1e61554f74ea40c41014edeb56ed88d7f820d8e750 files/libjsw-1.5.5-gcc33.patch 1249
-AUX libjsw-1.5.5-headers.patch 177 RMD160 99048db9d04f7a477fb6061489870c2caa78cccc SHA1 3121c92f4d654922a432afe147abb477b96b8b19 SHA256 5971ed5f1e8d1859a49de5954172c8b40be1d8b6b1ae3207500b84a30c314f2e size 177
+AUX libjsw-1.5.5-headers.patch 177 RMD160 99048db9d04f7a477fb6061489870c2caa78cccc SHA1 3121c92f4d654922a432afe147abb477b96b8b19 SHA256 5971ed5f1e8d1859a49de5954172c8b40be1d8b6b1ae3207500b84a30c314f2e
 MD5 f111e5b2936ab4023a2ae4c4d605f811 files/libjsw-1.5.5-headers.patch 177
 RMD160 99048db9d04f7a477fb6061489870c2caa78cccc files/libjsw-1.5.5-headers.patch 177
 SHA256 5971ed5f1e8d1859a49de5954172c8b40be1d8b6b1ae3207500b84a30c314f2e files/libjsw-1.5.5-headers.patch 177
-DIST libjsw-1.5.5.tar.bz2 317027 RMD160 bb693cdba0adc527f9f16b106a1d01cc2062e574 SHA256 43f2cc14d9caf37645ec4f06ad7de2b9fc2515cd7fdaf6dff56563bd01744c5c size 317027
-EBUILD libjsw-1.5.5.ebuild 1418 RMD160 abb2fdebc4c6bc2b29243bc0c00a73afc80af88c SHA1 78dd64b6d6d0829ad6c4466bd0ef889f760443e9 SHA256 06f2cba43a4917fa17bfbdcbe5aacd33d0b0133415f57257e59754077e300733 size 1418
+AUX libjsw-1.5.6-build.patch 3057 RMD160 765b3d16bb6c32767b07f0a353bd866cb81306d5 SHA1 d0f24db8053e37026fec7ca34bfef5004287cca5 SHA256 8209898b7e16de9567feb6c29096e094f68338f5454f139986ac192d79a64a83
+MD5 2dde76f94de0127ca7d5ce28d2dcddc7 files/libjsw-1.5.6-build.patch 3057
+RMD160 765b3d16bb6c32767b07f0a353bd866cb81306d5 files/libjsw-1.5.6-build.patch 3057
+SHA256 8209898b7e16de9567feb6c29096e094f68338f5454f139986ac192d79a64a83 files/libjsw-1.5.6-build.patch 3057
+DIST libjsw-1.5.5.tar.bz2 317027 RMD160 bb693cdba0adc527f9f16b106a1d01cc2062e574 SHA1 3a3d3bb90fac80bac5da76deccc8623e671214b5 SHA256 43f2cc14d9caf37645ec4f06ad7de2b9fc2515cd7fdaf6dff56563bd01744c5c
+DIST libjsw-1.5.6.tar.bz2 322826 RMD160 37d562beb1ebde7cede53daca2ef7d9237985db6 SHA1 bef77af685d90d95cbd5878b0f3c93f834a52832 SHA256 59495f4a1c090d32977da96300d17b165ad181518e4c3ac4702d3a8c7ed7ccc3
+EBUILD libjsw-1.5.5.ebuild 1418 RMD160 abb2fdebc4c6bc2b29243bc0c00a73afc80af88c SHA1 78dd64b6d6d0829ad6c4466bd0ef889f760443e9 SHA256 06f2cba43a4917fa17bfbdcbe5aacd33d0b0133415f57257e59754077e300733
 MD5 932e59a053ca577c19420d4164d335eb libjsw-1.5.5.ebuild 1418
 RMD160 abb2fdebc4c6bc2b29243bc0c00a73afc80af88c libjsw-1.5.5.ebuild 1418
 SHA256 06f2cba43a4917fa17bfbdcbe5aacd33d0b0133415f57257e59754077e300733 libjsw-1.5.5.ebuild 1418
-MISC ChangeLog 1563 RMD160 a0c6050e6db46d2b87f618d88e55492333052127 SHA1 9ee511094b46e2f3edf9ca2eb9d8e818dd74b2bd SHA256 8cee99c44a8d2357c4be368e899e378fa7a5be13705124b9f508c0b11750e84b size 1563
-MD5 5b136167eaffa455d69b6f2a63ae52be ChangeLog 1563
-RMD160 a0c6050e6db46d2b87f618d88e55492333052127 ChangeLog 1563
-SHA256 8cee99c44a8d2357c4be368e899e378fa7a5be13705124b9f508c0b11750e84b ChangeLog 1563
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+EBUILD libjsw-1.5.6.ebuild 1326 RMD160 42ddc84626b9e20b98dfa198f2f4320aef394faf SHA1 b260085cd07c4b064ff556e21590a85166ec5154 SHA256 0148da1463bbee5f3a93e00fd2478ddb6991e42e29239f8783417510aff367e1
+MD5 2c2310a96d1ee05d65ebab6fceb132f4 libjsw-1.5.6.ebuild 1326
+RMD160 42ddc84626b9e20b98dfa198f2f4320aef394faf libjsw-1.5.6.ebuild 1326
+SHA256 0148da1463bbee5f3a93e00fd2478ddb6991e42e29239f8783417510aff367e1 libjsw-1.5.6.ebuild 1326
+MISC ChangeLog 1808 RMD160 51acab9a704236eac76d93bfe724bd5d5715fa4c SHA1 9d018cc6b7e93fca192a4518bc69dab973690c89 SHA256 cac0e378b02ef051c24348fa525523064e255429cb7a2f93c274812e1fa91e95
+MD5 c4963b5c2ac917594a756678c40c0b87 ChangeLog 1808
+RMD160 51acab9a704236eac76d93bfe724bd5d5715fa4c ChangeLog 1808
+SHA256 cac0e378b02ef051c24348fa525523064e255429cb7a2f93c274812e1fa91e95 ChangeLog 1808
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 299a7f3799a6ca27e93eead44605e7b1 files/digest-libjsw-1.5.5 241
 RMD160 b1a2eddeed2cd4e1a277a64fa5079b7f0513e124 files/digest-libjsw-1.5.5 241
 SHA256 a5b2226795fa2e838918fb8917a761017f9d48f98ea41a2176ad458a4953fc04 files/digest-libjsw-1.5.5 241
+MD5 17d5e219ec4034b3aa608352a04ccbc4 files/digest-libjsw-1.5.6 241
+RMD160 5d6f5794b5e7532755d7780f02851588e9e0f79d files/digest-libjsw-1.5.6 241
+SHA256 e3a7ba37a7747bcfeee9998067d196c16915364984b28bd0c80a2ac46e664f73 files/digest-libjsw-1.5.6 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETWeN2+ySkm8kpY0RAsJdAKCJSWNWANnEy60hik5DcCpWzIo3NACeIgUs
-mfGnwCbfWB+ppzpa32pzBhU=
-=CYHm
+iD8DBQFEezcD2CTtIKiFlQIRAhdDAJ94gr0F7sF2JLOll7YVFVJxr0QV1QCgjBo7
+Sz1JrLPesne9AxFcao/7hrs=
+=Ib9a
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libjsw/files/digest-libjsw-1.5.6 b/media-libs/libjsw/files/digest-libjsw-1.5.6
new file mode 100644
index 000000000000..bda76eb0e15d
--- /dev/null
+++ b/media-libs/libjsw/files/digest-libjsw-1.5.6
@@ -0,0 +1,3 @@
+MD5 d75948b7ff464982cc6e1de4c94008be libjsw-1.5.6.tar.bz2 322826
+RMD160 37d562beb1ebde7cede53daca2ef7d9237985db6 libjsw-1.5.6.tar.bz2 322826
+SHA256 59495f4a1c090d32977da96300d17b165ad181518e4c3ac4702d3a8c7ed7ccc3 libjsw-1.5.6.tar.bz2 322826
diff --git a/media-libs/libjsw/files/libjsw-1.5.6-build.patch b/media-libs/libjsw/files/libjsw-1.5.6-build.patch
new file mode 100644
index 000000000000..2f554fd332c3
--- /dev/null
+++ b/media-libs/libjsw/files/libjsw-1.5.6-build.patch
@@ -0,0 +1,109 @@
+--- libjsw/Makefile.old	2006-05-29 18:49:16.000000000 +0200
++++ libjsw/Makefile	2006-05-29 18:58:27.000000000 +0200
+@@ -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,12 +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
+-	@-$(LS) $(LSFLAGS) $(LIB)
++	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS)
+ 
+ prebuild:
+ 	@echo "Building library \"$(LIB)\"..."
+--- jscalibrator/Makefile.old	2006-05-29 19:01:28.000000000 +0200
++++ jscalibrator/Makefile	2006-05-29 19:05:54.000000000 +0200
+@@ -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.6.ebuild b/media-libs/libjsw/libjsw-1.5.6.ebuild
new file mode 100644
index 000000000000..fb9146aa35fa
--- /dev/null
+++ b/media-libs/libjsw/libjsw-1.5.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.6.ebuild,v 1.1 2006/05/29 18:01:24 tupone Exp $
+
+inherit eutils
+
+DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers"
+HOMEPAGE="http://wolfpack.twu.net/libjsw/"
+SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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
+}