cleanup, SRC_URI changed, include order fix, see ebuild for details

4 files changed, 27 insertions, 25 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index e56dc7983e47..1be66d7530f6 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.68 2004/12/28 03:50:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.69 2004/12/29 03:49:47 stkn Exp $
+
+  29 Dec 2004; Stefan Knoblich <stkn@gentoo.org> pwlib-1.8.3.ebuild:
+  cleanup, SRC_URI changed, include order fix
 
 *pwlib-1.8.3 (28 Dec 2004)
 
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index fe251355373e..06f3e2220d6f 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -4,10 +4,10 @@ MD5 0c85c6b3395f056fd849c9ae7eb71ed2 pwlib-1.5.2-r2.ebuild 2955
 MD5 0a7cb3a48c160df6883e6d0c53b3d38b pwlib-1.5.2-r3.ebuild 2997
 MD5 0b165d3dab2c13782ff4c738cd7f60d9 pwlib-1.5.0-r1.ebuild 2403
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
-MD5 a0c6013a56e44d3f40f96f2fef7d808f pwlib-1.8.3.ebuild 3966
+MD5 f93495cfeaa1f0e332c55be267d15095 pwlib-1.8.3.ebuild 3925
 MD5 8dbc8816810f569b5bec54514e1177d8 pwlib-1.5.2.ebuild 2596
 MD5 21199978809de871ebcfbedc9bdedca8 pwlib-1.6.3.ebuild 3806
-MD5 9482957c3b82ae39dd524ed08b227712 ChangeLog 10863
+MD5 320b64955d7c47289321a5b8fc4e34bd ChangeLog 10979
 MD5 bbcfc0106fe98eae9b5a6327850ea97f pwlib-1.5.0.ebuild 2308
 MD5 36ce467ec9ddfceb3ab08750dde508c2 pwlib-1.5.2-r1.ebuild 2760
 MD5 1e445af737490687247c95904ad89f24 pwlib-1.3.11-r1.ebuild 1834
@@ -29,7 +29,7 @@ MD5 0c5d290a2ad15d1e8b2ae85365a83bd6 files/digest-pwlib-1.3.11-r1 64
 MD5 c1a54c4c742e40812c02bea08e570604 files/digest-pwlib-1.4.11 64
 MD5 6702f9a296ccf661275cf6a2284bf6bf files/digest-pwlib-1.6.3-r1 64
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r1 64
-MD5 d3e3a9aa6757ee13444a3273de6beba9 files/digest-pwlib-1.8.3 69
+MD5 66bc7e154effc3454029566adff8a2f7 files/digest-pwlib-1.8.3 69
 MD5 8c6469f000dea2a13869631fcedbe0ff files/pwlib-1.5.2-asnparser-secfix.diff 1299
 MD5 3057a7e05b6e701041865f26fd1fb8c3 files/digest-pwlib-1.6.6-r1 69
 MD5 4fc6a7891d23db3dc2837f825afa2324 files/digest-pwlib-1.5.2-r2 64
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.3 b/dev-libs/pwlib/files/digest-pwlib-1.8.3
index 816332f1819b..bd4b079020d8 100644
--- a/dev-libs/pwlib/files/digest-pwlib-1.8.3
+++ b/dev-libs/pwlib/files/digest-pwlib-1.8.3
@@ -1 +1 @@
-MD5 082e0ca640c3dd81c637b6d6a3c9b4b3 pwlib-v1_8_3-src.tar.gz 1900922
+MD5 082e0ca640c3dd81c637b6d6a3c9b4b3 pwlib-v1_8_3-src-tar.gz 1900922
diff --git a/dev-libs/pwlib/pwlib-1.8.3.ebuild b/dev-libs/pwlib/pwlib-1.8.3.ebuild
index b64a1f104e72..6d595cd60b3c 100644
--- a/dev-libs/pwlib/pwlib-1.8.3.ebuild
+++ b/dev-libs/pwlib/pwlib-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.3.ebuild,v 1.1 2004/12/28 03:50:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.3.ebuild,v 1.2 2004/12/29 03:49:47 stkn Exp $
 
 inherit eutils
 
@@ -9,8 +9,9 @@ IUSE="ssl sdl ieee1394 alsa esd"
 MY_P="${PN}-v${PV//./_}"
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://dev.gentoo.org/~stkn/openh323/${MY_P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/openh323/${MY_P}-src-tar.gz"
 
+RESTRICT="nomirror"
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="-*"
@@ -33,7 +34,9 @@ MAKEOPTS="${MAKEOPTS} -j1"
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack ${A}
+	# currently complaining to upstream about new naming scheme
+	tar -C ${WORKDIR} -xzf ${DISTDIR}/${MY_P}-src-tar.gz || die "Unpacking of ${PF} failed"
+
 	cd ${S}/make
 
 	# filter out -O3 and -mcpu embedded compiler flags
@@ -72,10 +75,15 @@ src_compile() {
 	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
 
 	# merge plugin options (safe way if default = "")
-	plugins="`echo ${plugins} | sed -e "y: :,:"`"
+	plugins="$(echo ${plugins} | sed -e "y: :,:")"
 
 	econf ${myconf} \
 		--enable-plugins \
@@ -92,21 +100,16 @@ src_compile() {
 		-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
+	# makefile doesn't create ${D}/usr/bin
+	dodir /usr/bin
 	make PREFIX=${D}/usr install || die "install failed"
 
+	## vv will try to fix the mess below, requires a lot of patching though...
+
 	# these are for compiling openh323
 	# NOTE: symlinks don't work when upgrading
 	# FIXME: probably should fix this with ptlib-config
@@ -118,13 +121,12 @@ src_install() {
 		dosym /usr/lib/`basename ${x}` /usr/share/pwlib/lib/`basename ${x}`
 	done
 
-	# remove CVS dirs
-	find ${D} -name CVS -type d | xargs rm -rf
+	## ^^ bad stuff
 
 	# fix symlink
 	# only amd64 needs special handling, afaiks
 	rm ${D}/usr/lib/libpt.so
-	if [ ${ARCH} = "amd64" ] ; then
+	if use amd64; then
 		dosym /usr/lib/libpt_linux_x86_64_r.so.${PV} /usr/lib/libpt.so
 	else
 		dosym /usr/lib/libpt_linux_${ARCH}_r.so.${PV} /usr/lib/libpt.so
@@ -137,12 +139,9 @@ src_install() {
 	# 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
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt ChangeLog mpl-1.0.htm
 }