revision bump for amd64 only. 1.6.3-r1 was broken for amd64, so I masked it

5 files changed, 160 insertions, 4 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index c726cf9cf57d..32f64a6ae32d 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.41 2004/03/25 02:21:46 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.42 2004/03/25 15:41:17 jhuebel Exp $
+
+*pwlib-1.6.3-r2 (25 Mar 2004)
+
+  25 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> pwlib-1.6.3-r1.ebuild,
+  pwlib-1.6.3-r2.ebuild:
+  Revision bump for amd64 only. Masked 1.6.3-r1 for amd64 since it's broken
 
   24 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> pwlib-1.6.3-r1.ebuild:
   added ~amd64 to keywords
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index af9f3df936cf..8cf9e05455d1 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -8,7 +8,8 @@ MD5 3560f4dfcc2f3ec3c4ece621e407aed0 pwlib-1.5.2-r1.ebuild 2768
 MD5 fe04ae0e2b2d8b3b5c25962f236026a6 pwlib-1.5.2-r2.ebuild 2963
 MD5 9fff057a9b69b5bc5eae882c3d95b50d pwlib-1.5.2.ebuild 2604
 MD5 bc0174d1f8a78e55b2a8b3121b7eeb8d pwlib-1.6.3.ebuild 3819
-MD5 fd904bc1135d7c7164f2be6fb4f9814a pwlib-1.6.3-r1.ebuild 4014
+MD5 282a5a3da30400c2f439d490456f6135 pwlib-1.6.3-r2.ebuild 4114
+MD5 3420c4eb5a81b3cfe622e88635cc67c8 pwlib-1.6.3-r1.ebuild 4014
 MD5 0c5d290a2ad15d1e8b2ae85365a83bd6 files/digest-pwlib-1.3.11-r1 64
 MD5 c1a54c4c742e40812c02bea08e570604 files/digest-pwlib-1.4.11 64
 MD5 67bcec54ffa82d8da3b0c0e2f23daf7e files/digest-pwlib-1.5.0 64
@@ -20,3 +21,4 @@ MD5 91035c6391e112595e0003cebda275f6 files/pwlib-1.3.11-r1.diff 2260
 MD5 0a9a8c5a1417127269e2e0f24ded1b2c files/pwlib-1.5.0-r1-gentoo.diff 391
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3 64
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r1 64
+MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r2 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.6.3-r2 b/dev-libs/pwlib/files/digest-pwlib-1.6.3-r2
new file mode 100644
index 000000000000..863433eb2e70
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.6.3-r2
@@ -0,0 +1 @@
+MD5 c190324ded05c349cf50b0d37fe0c8a1 pwlib-1.6.3.tar.gz 1158037
diff --git a/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild b/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
index fc52f07ab251..6e44814629bb 100644
--- a/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild,v 1.4 2004/03/25 02:21:46 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r1.ebuild,v 1.5 2004/03/25 15:41:17 jhuebel Exp $
 
 IUSE="ssl sdl ieee1394 alsa esd"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~x86 ~sparc"
 
 DEPEND=">=sys-devel/bison-1.28
 	>=sys-devel/flex-2.5.4a
diff --git a/dev-libs/pwlib/pwlib-1.6.3-r2.ebuild b/dev-libs/pwlib/pwlib-1.6.3-r2.ebuild
new file mode 100644
index 000000000000..71fba4523b8e
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.6.3-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.6.3-r2.ebuild,v 1.1 2004/03/25 15:41:17 jhuebel Exp $
+
+IUSE="ssl sdl ieee1394 alsa esd"
+
+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="-* ~amd64"
+
+DEPEND=">=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	dev-libs/expat
+	>=sys-apps/sed-4
+	net-nds/openldap
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		sys-libs/libraw1394 )
+	esd? ( media-sound/esound )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/make
+
+	# filter out -O3 and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		unix.mak
+}
+
+src_compile() {
+	local plugins
+	local myconf
+
+	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"
+	myconf="${myconf} --enable-ipv6"
+
+	# plugins, oss and v4l are default
+	plugins="oss v4l"
+
+	use ieee1394 \
+		&& plugins="${plugins} avc"
+
+	use alsa \
+		&& plugins="${plugins} alsa"
+
+	if [ -n "`use esd`" ]; then
+		# fixes bug #45059
+		export ESDDIR=/usr
+	fi
+
+	# merge plugin options (safe way if default = "")
+	plugins="`echo ${plugins} | sed -e "y: :,:"`"
+
+	econf ${myconf} \
+		--enable-plugins \
+		--with-plugins=${plugins} || 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
+
+	# remove -fno-rtti, this breaks various things *grr*
+	sed -i -e "s:-fno-rtti::" \
+		make/ptbuildopts.mak
+	sed -i -e "s:-fno-rtti::" \
+		make/ptlib-config
+
+	emake opt || die "make failed"
+	emake PWLIBDIR=${S} -C plugins opt || die "make plugins failed"
+}
+
+src_install() {
+	# make these because the makefile isn't smart enough
+	dodir /usr/bin /usr/lib /usr/share /usr/include
+	make PREFIX=${D}/usr install || die "install failed"
+
+	# these are for compiling openh323
+	# NOTE: symlinks don't work when upgrading
+	# FIXME: probably should fix this with ptlib-config
+	dodir /usr/share/pwlib/include
+	cp -r ${D}/usr/include/* ${D}/usr/share/pwlib/include
+
+	dodir /usr/share/pwlib/lib
+	for x in ${D}/usr/lib/*; do
+		dosym /usr/lib/`basename ${x}` /usr/share/pwlib/lib/`basename ${x}`
+	done
+
+	# remove CVS dirs
+	find ${D} -name CVS -type d | xargs rm -rf
+
+	# fix symlink
+	rm ${D}/usr/lib/libpt.so
+	if [ ${ARCH} = "ppc" ] ; then
+		dosym /usr/lib/libpt_linux_ppc_r.so.${PV} /usr/lib/libpt.so
+	elif [ ${ARCH} = "sparc" ] ; then
+		dosym /usr/lib/libpt_linux_sparc_r.so.${PV} /usr/lib/libpt.so
+	elif [ ${ARCH} = "amd64" ] ; then
+		dosym /usr/lib/libpt_linux_x86_64_r.so.${PV} /usr/lib/libpt.so
+	else
+		dosym /usr/lib/libpt_linux_x86_r.so.${PV} /usr/lib/libpt.so
+	fi
+
+	# strip ${S} stuff
+	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/bin/ptlib-config
+	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/share/pwlib/make/ptbuildopts.mak
+
+	# dodgy configure/makefiles forget to expand this
+	dosed 's:${exec_prefix}:/usr:' /usr/bin/ptlib-config
+
+	# satisfy ptlib.mak's weird definition (should check if true for future versions)
+	cp ${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 History.txt
+}