Version bump, finally removed /usr/share/pwlib/{lib,lib32,lib64,include} symlinks and other little cleanups.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 202 insertions, 13 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 2587172925ac..b876fa27d33a 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.91 2005/09/12 15:49:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.92 2005/09/12 20:03:09 stkn Exp $
+
+*pwlib-1.8.7 (12 Sep 2005)
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/pwlib-1.8.7-instplugins.diff, +pwlib-1.8.7.ebuild:
+  Version bump, finally removed /usr/share/pwlib/{lib,lib32,lib64,include}
+  symlinks and other little cleanups.
 
   12 Sep 2005; Aron Griffis <agriffis@gentoo.org> pwlib-1.8.4.ebuild:
   Mark 1.8.4 stable on alpha
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index c03e3ec7bfd2..996a2139d09f 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,22 +1,25 @@
+MD5 7b71ebcce6d852f0dc6738ee8b77ea49 pwlib-1.5.0-r1.ebuild 2403
+MD5 9cb5e3302d0aa5f69c8c289646c93891 pwlib-1.8.7.ebuild 4075
 MD5 00ce2a439ee24cd57f8c947d8fcadea1 pwlib-1.8.3-r1.ebuild 4465
 MD5 cad8c6f27ca92756b593272323ca3d25 pwlib-1.8.4.ebuild 4341
-MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 7b71ebcce6d852f0dc6738ee8b77ea49 pwlib-1.5.0-r1.ebuild 2403
-MD5 e3641897be9ec76aa18283ae29a48540 ChangeLog 14511
 MD5 233dc6b0601309ce4da5385aa36e5bdc pwlib-1.6.6-r2.ebuild 4546
-MD5 8a3df2068f3fa7e096c3dc77cc28e7ea pwlib-1.5.2-r3.ebuild 2993
-MD5 4690d9e7395046ed1c573e68a47bd053 pwlib-1.5.0.ebuild 2304
 MD5 ae4e2d28a1696afcf545ed158be25bd7 pwlib-1.6.3-r3.ebuild 4338
-MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r2 69
+MD5 4690d9e7395046ed1c573e68a47bd053 pwlib-1.5.0.ebuild 2304
+MD5 8a3df2068f3fa7e096c3dc77cc28e7ea pwlib-1.5.2-r3.ebuild 2993
+MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
+MD5 ff43fe815f60d248e2434d1ed1135bd6 ChangeLog 14758
+MD5 a874e4383164981b3881c8f636ec842b files/digest-pwlib-1.8.7 64
+MD5 6aa40def4f33c78a2c05f91aeda058c1 files/pwlib-1.8.4-gcc4.diff 1574
+MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3-r1 69
+MD5 cd832010589d81cab25d2523d62a3401 files/pwlib-1.8.7-instplugins.diff 1044
+MD5 ef62669acbbbc63a30d475ca9865adb6 files/pwlib-1.6.6-ieee1394dc-fix.diff 7207
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r3 64
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0-r1 64
 MD5 8c6469f000dea2a13869631fcedbe0ff files/pwlib-1.5.2-asnparser-secfix.diff 1299
-MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
-MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
-MD5 ef62669acbbbc63a30d475ca9865adb6 files/pwlib-1.6.6-ieee1394dc-fix.diff 7207
-MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r3 64
-MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3-r1 69
 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64
-MD5 6aa40def4f33c78a2c05f91aeda058c1 files/pwlib-1.8.4-gcc4.diff 1574
 MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
 MD5 0fbee42a70e13b6fe530a1f1ca8086ac files/pwlib-1.6.6-alsa_dmix.diff 7450
+MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
+MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r2 69
+MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r3 64
+MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.7 b/dev-libs/pwlib/files/digest-pwlib-1.8.7
new file mode 100644
index 000000000000..61aaaa871be9
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.8.7
@@ -0,0 +1 @@
+MD5 ba4fddd6cb8d4420cc18f308ccf48e00 pwlib-1.8.7.tar.gz 1900458
diff --git a/dev-libs/pwlib/files/pwlib-1.8.7-instplugins.diff b/dev-libs/pwlib/files/pwlib-1.8.7-instplugins.diff
new file mode 100644
index 000000000000..bd59a4b9d6a7
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.8.7-instplugins.diff
@@ -0,0 +1,27 @@
+--- pwlib-1.8.7/Makefile.in.orig	2004-06-24 12:46:48.000000000 +0000
++++ pwlib-1.8.7/Makefile.in	2005-09-09 15:48:10.000000000 +0000
+@@ -268,14 +268,16 @@
+ 		ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
+ 	)
+ ifeq (1, $(HAS_PLUGINS))
+-	cd plugins/pwlib/device/ ; \
+-	( for dir in ./* ;\
+-		do mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
+-		chmod 755 $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
+-		(for fn in ./$$dir/*.so ; \
+-			do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir; \
+-		done ); \
+-	done )
++	if [ -d plugins/pwlib/device ] ; then \
++		cd plugins/pwlib/device/ ; \
++		( for dir in ./* ;\
++			do mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
++			chmod 755 $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
++			(for fn in ./$$dir/*.so ; \
++				do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir; \
++			done ); \
++		done ) \
++	fi
+ endif
+ 	$(INSTALL) -m 444 include/ptlib.h                $(DESTDIR)$(PREFIX)/include
+ 	$(INSTALL) -m 444 include/ptbuildopts.h          $(DESTDIR)$(PREFIX)/include
diff --git a/dev-libs/pwlib/pwlib-1.8.7.ebuild b/dev-libs/pwlib/pwlib-1.8.7.ebuild
new file mode 100644
index 000000000000..5e23bc9df447
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.8.7.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.7.ebuild,v 1.1 2005/09/12 20:03:09 stkn Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE="alsa esd ieee1394 oss sdl ssl v4l2"
+
+DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	net-nds/openldap
+	esd? ( media-sound/esound )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+		<media-libs/libdc1394-1.9.9
+		!>=media-libs/libdc1394-2.0.0_pre0 )"
+
+DEPEND="${REDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# filter out -O3 and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		make/unix.mak
+
+	# newer esound package doesn't install libesd.a anymore,
+	# use dynamic library instead (fixes #100432)
+	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
+
+	# don't break make install if there are no plugins to install
+	epatch ${FILESDIR}/pwlib-1.8.7-instplugins.diff
+}
+
+src_compile() {
+	local myconf
+
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+
+	if use ssl; then
+		export OPENSSLFLAG=1
+		export OPENSSLDIR="/usr"
+		export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	## gnomemeeting-1.00 requires pwlib to be built w/ IPV6 support
+	## (even if itself is built without...)
+	#use ipv6 \
+	#	&& myconf="${myconf} --enable-ipv6" \
+	#	|| myconf="${myconf} --disable-ipv6"
+
+	# enable default plugins and force ipv6
+	myconf="--enable-ipv6 --enable-v4l"
+
+	use ieee1394 \
+		&& myconf="${myconf} --enable-avc --enable-dc" \
+		|| myconf="${myconf} --disable-avc --disable-dc"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa"
+
+	if use esd; then
+		# fixes bug #45059
+		export ESDDIR=/usr
+
+		# ESD includes are in /usr/include?
+		# remove include path, bad things may happen if we leave it in there
+		sed -i -e "s:-I\$(ESDDIR)/include::" \
+			${S}/make/unix.mak
+	fi
+
+	econf \
+		--enable-plugins \
+		$(use_enable v4l2) \
+		$(use_enable sdl) \
+		$(use_enable oss) \
+		${myconf} || die "configure failed"
+
+	# Horrible hack to strip out -L/usr/lib to allow upgrades
+	# problem is it adds -L/usr/lib before -L${S} when SSL is
+	# enabled.  Same thing for -I/usr/include.
+	sed -i  -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" \
+		-e "s:^\(STDCCFLAGS.*\)-I/usr/include:\1:" \
+		${S}/make/ptbuildopts.mak
+
+	sed -i  -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" \
+		-e "s:^\(LDFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+		-e "s:^\(CCFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+		${S}/make/ptlib-config
+
+	emake -j1 opt || die "make failed"
+}
+
+src_install() {
+	local libdir libname
+
+	libdir=$(get_libdir)
+
+	# makefile doesn't create ${D}/usr/bin
+	dodir /usr/bin
+	make PREFIX=/usr DESTDIR=${D} install || die "install failed"
+
+	# fix symlink
+	rm ${D}/usr/${libdir}/libpt.so
+
+	libname=$(basename `ls ${D}/usr/${libdir}/libpt_*_*_r.so.${PV}`)
+	dosym /usr/${libdir}/${libname} /usr/${libdir}/libpt.so
+
+	# strip ${S} stuff
+	sed -i -e "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" \
+		${D}/usr/bin/ptlib-config \
+		${D}/usr/share/pwlib/make/ptlib-config \
+		${D}/usr/share/pwlib/make/ptbuildopts.mak
+
+	# fix makefiles to use headers from /usr/include and libs from /usr/lib
+	# instead of /usr/share/pwlib
+	sed -i  -e "s:-I\$(PWLIBDIR)\(/include[a-zA-Z0-9_/-]\+\):-I/usr/include\1:g" \
+		-e "s:-I\$(PWLIBDIR)/include::g" \
+		-e "s:^\(PW_LIBDIR[ \t]\+=\).*:\1 /usr/${libdir}:" \
+		${D}/usr/share/pwlib/make/*.mak
+
+	# dodgy configure/makefiles forget to expand this
+	sed -i -e "s:\${exec_prefix}:/usr:" \
+		${D}/usr/bin/ptlib-config \
+		${D}/usr/share/pwlib/make/ptlib-config
+
+	# copy version.h
+	insinto /usr/share/pwlib
+	doins version.h
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt mpl-1.0.htm
+}