From 718d74b1256f364514e3c4048b4f31a6f53f3fd3 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavoz@gentoo.org>
Date: Wed, 21 Mar 2007 17:30:35 +0000
Subject: [PATCH] Verbump wrt #167643 and #169066 Package-Manager:
 portage-2.1.2.2

---
 dev-libs/pwlib/ChangeLog                 |   7 +-
 dev-libs/pwlib/Manifest                  |  24 ++--
 dev-libs/pwlib/files/digest-pwlib-1.10.5 |   3 +
 dev-libs/pwlib/pwlib-1.10.5.ebuild       | 151 +++++++++++++++++++++++
 4 files changed, 176 insertions(+), 9 deletions(-)
 create mode 100644 dev-libs/pwlib/files/digest-pwlib-1.10.5
 create mode 100644 dev-libs/pwlib/pwlib-1.10.5.ebuild

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 28d46d57ef49..2709159279bf 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.127 2007/03/10 18:42:05 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.128 2007/03/21 17:30:35 gustavoz Exp $
+
+*pwlib-1.10.5 (21 Mar 2007)
+
+  21 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> +pwlib-1.10.5.ebuild:
+  Verbump wrt #167643 and #169066
 
   10 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> pwlib-1.10.4.ebuild:
   Stable on Alpha + IA64.
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index b8b7d679c99a..78814fb6d3aa 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -41,6 +41,7 @@ DIST pwlib-1.10.0.tar.gz 1480233 RMD160 5341a4d21996472665032b3cfcc184f04435ddab
 DIST pwlib-1.10.1.tar.gz 1485094 RMD160 860ce13ea7df77723c5697691602be4fe9087b5d SHA1 104e7fe42661b410749d19c90803715734bc1e3b SHA256 c7356f43f13995ece66e0becf84e38932b2e9f7a238b07f345c5b8fac6f823e3
 DIST pwlib-1.10.2.tar.gz 1485529 RMD160 d0af8b73131773eb95bd89bf03e024ba861f7982 SHA1 0dde7a7ef3ccd6a0f9b0e64b44d6b49ee843ae2d SHA256 a2981bee47971405098d39e9d518dcaeea84ccf9b49d46c2f8c35a84a8338e61
 DIST pwlib-1.10.4.tar.gz 2047300 RMD160 7f1326d6ac1ef17306cd233241151f924fa218bb SHA1 9b489fdf6ef7c10bdd0d8ae626fd16b2250926f3 SHA256 33a368df5a9156401a8a5190ebd5a6aac489ab2dae3eec1ff6f442f59681dd3d
+DIST pwlib-1.10.5.tar.gz 2050733 RMD160 6cc7eabf4bf00331db6f19f405710449b0ea861d SHA1 06ee165888da56f41cdda00c84d4b89f751ea6dd SHA256 bb758c9297273cdb4bbef495edf8de52713f9a54cc228e699d31c5ff01f16e1d
 DIST pwlib-1.6.3.tar.gz 1158037 RMD160 a8f52e7825106475ad23a312e38e7ab8ebcc929b SHA1 e40fd4e27f479652bf4c51978a5f9da212d0697e SHA256 c371238a4719c9fe53bf6b1a89f490fdc6b5ea834c610b88f7e944c681179d03
 DIST pwlib-1.8.4.tar.gz 1382438 RMD160 3848d47d3cb903444759ecf41c5fc4c716fadc8c SHA1 bf56dd1e2383c1c1f3bdf3a6424234c26550fed0 SHA256 08f204423cc4112794e6f031ba0b908c0d90cbefb58e83ea7c4b4e55643ebf01
 DIST pwlib-1.8.7.tar.gz 1900458 RMD160 b968571a6ffeb162e4b426e1588c82b490b8d7dc SHA1 9333edf45f1022ba2529f7e731db9e5ffa92a17f SHA256 120e95ba090f0c8fa8768e8241b98a711e88973cb625288c2616092061d08ff7
@@ -66,6 +67,10 @@ EBUILD pwlib-1.10.4.ebuild 4442 RMD160 54442080b85d9fad03a9eab9244d8284b8652ea6
 MD5 6cbce16287500bec94d1905a5c9ee862 pwlib-1.10.4.ebuild 4442
 RMD160 54442080b85d9fad03a9eab9244d8284b8652ea6 pwlib-1.10.4.ebuild 4442
 SHA256 fb246feac51abaf2b37fb2045c17ae5dc8647b29920e7b2d46ea4a485edabf67 pwlib-1.10.4.ebuild 4442
+EBUILD pwlib-1.10.5.ebuild 4451 RMD160 0fbcb98933a82cd3f43c96fe56bd9db402b75c6a SHA1 93de4a71bd0cf0b9c2823fbf2080c5598fe91e9a SHA256 405e1f42915c641be255d5865601473b9ad1c71f45591db1333673d986e32acc
+MD5 0084c2e2c73a28bd6b0e22b590f4156c pwlib-1.10.5.ebuild 4451
+RMD160 0fbcb98933a82cd3f43c96fe56bd9db402b75c6a pwlib-1.10.5.ebuild 4451
+SHA256 405e1f42915c641be255d5865601473b9ad1c71f45591db1333673d986e32acc pwlib-1.10.5.ebuild 4451
 EBUILD pwlib-1.6.3-r3.ebuild 4338 RMD160 cf7d20715361a0f456c265bb893660697d1dfa5f SHA1 4d686788293f723fa5af9c6bb8029f509e0f8ebb SHA256 4849929f966e3a73f7fbb103dc4751fb46bbf19258d951e7a0d3121868b4c3b9
 MD5 ae4e2d28a1696afcf545ed158be25bd7 pwlib-1.6.3-r3.ebuild 4338
 RMD160 cf7d20715361a0f456c265bb893660697d1dfa5f pwlib-1.6.3-r3.ebuild 4338
@@ -86,10 +91,10 @@ EBUILD pwlib-1.8.7.ebuild 4227 RMD160 269a4562b172061bae69b9d8d4d9f91504dd8aa4 S
 MD5 972beed85f1d3fca3d08d31a77a7c158 pwlib-1.8.7.ebuild 4227
 RMD160 269a4562b172061bae69b9d8d4d9f91504dd8aa4 pwlib-1.8.7.ebuild 4227
 SHA256 5645f6e21003d7a267c3e80f8e9e29021a8cfb1fd71fb87ea07bc41800aad3e1 pwlib-1.8.7.ebuild 4227
-MISC ChangeLog 19120 RMD160 cc0f79a4d30a942abb00ad8b8fb3bf74588fe107 SHA1 3859db102729559a5df6843ee549efa894d46b9d SHA256 150ef61256d6057c49c582e849614ad508869bd013d54328185ec1ed0fbc153e
-MD5 24cf5f8ed709abbcaf8038697e282f18 ChangeLog 19120
-RMD160 cc0f79a4d30a942abb00ad8b8fb3bf74588fe107 ChangeLog 19120
-SHA256 150ef61256d6057c49c582e849614ad508869bd013d54328185ec1ed0fbc153e ChangeLog 19120
+MISC ChangeLog 19262 RMD160 b0505b6bbcc1182bfee74878747c48541c687280 SHA1 8efeb3be1a29f62724421d0e064b9a7cb372153b SHA256 bfdc037a1be2926a6d6b12e55f699132e5f519ea25207d9510c42b93e692a372
+MD5 d58dba72e89786ad378a9a599b0b75b1 ChangeLog 19262
+RMD160 b0505b6bbcc1182bfee74878747c48541c687280 ChangeLog 19262
+SHA256 bfdc037a1be2926a6d6b12e55f699132e5f519ea25207d9510c42b93e692a372 ChangeLog 19262
 MISC metadata.xml 235 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 SHA1 be1055e9141769fc4e44c3cc9026c635aa97d8cc SHA256 6b190d921eb507c8ae01261acc24b4c26d9a7efdd79e244efda043d8d0b66756
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 metadata.xml 235
@@ -109,6 +114,9 @@ SHA256 4c05999a32f13fdc9c6142e50af7668d3041ccad27b7f28459dc413f47381949 files/di
 MD5 fb9ce31a2e446807e2c5a7e287032af7 files/digest-pwlib-1.10.4 241
 RMD160 a7debadeeb973cd43bc5bcdc8280e5cf1358062c files/digest-pwlib-1.10.4 241
 SHA256 26fd738e50219ec3bfb961adb399208e2675c9eead74fb5b7a21e9d357a14661 files/digest-pwlib-1.10.4 241
+MD5 2a48df6813a546c8d6f6a36f1c695bd9 files/digest-pwlib-1.10.5 241
+RMD160 f4cdcdbff467844c4b36e46036b7820b051fb22a files/digest-pwlib-1.10.5 241
+SHA256 1cda179e09f89a736321ee5c4435834bbaa00dac2cf4ea2d5df9d069f69867b1 files/digest-pwlib-1.10.5 241
 MD5 e152a7da0e17cbe3bfe81b70a4317aaa files/digest-pwlib-1.6.3-r3 238
 RMD160 bf1648783e58c17f7a58df993c9d30a5445805f9 files/digest-pwlib-1.6.3-r3 238
 SHA256 96045bfb873ec80294c191733dc7cac35530674f1256554728c9e621bcc0c1af files/digest-pwlib-1.6.3-r3 238
@@ -125,9 +133,9 @@ MD5 fa4bf5181ae19decd0c4c4b6364e0468 files/digest-pwlib-1.8.7 238
 RMD160 2ee9e56a4822094c7398583124fdfe1b51bbcbaa files/digest-pwlib-1.8.7 238
 SHA256 56d302889c4df1d12b155e947d06dd1484c7eae0b49c0838825aa1f0bc0b01e2 files/digest-pwlib-1.8.7 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFF8vvjugEuf3OQ0akRAvThAJ99FtOwYZdH4yBqYgGu0L5WQPkkFACfcaXn
-8JcftWRvHrPJA0dxWEJ74q4=
-=0M/H
+iD8DBQFGAWvGKRy60XGEcJIRAr60AJ9+zczsh0IHA6JkI9WLHdjr3HY8kACgoZil
+AIJtCPCaw0YAFjxGmcJ6JfU=
+=tRaG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.5 b/dev-libs/pwlib/files/digest-pwlib-1.10.5
new file mode 100644
index 000000000000..7e241574fe85
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.10.5
@@ -0,0 +1,3 @@
+MD5 1d5f444aedc56f7936bb87ccf21549e7 pwlib-1.10.5.tar.gz 2050733
+RMD160 6cc7eabf4bf00331db6f19f405710449b0ea861d pwlib-1.10.5.tar.gz 2050733
+SHA256 bb758c9297273cdb4bbef495edf8de52713f9a54cc228e699d31c5ff01f16e1d pwlib-1.10.5.tar.gz 2050733
diff --git a/dev-libs/pwlib/pwlib-1.10.5.ebuild b/dev-libs/pwlib/pwlib-1.10.5.ebuild
new file mode 100644
index 000000000000..4656a2d4de67
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.10.5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.5.ebuild,v 1.1 2007/03/21 17:30:35 gustavoz Exp $
+
+inherit eutils flag-o-matic multilib autotools
+
+IUSE="alsa debug ieee1394 ipv6 ldap oss sasl sdl ssl v4l v4l2 xml"
+
+DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
+HOMEPAGE="http://www.ekiga.org"
+SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+		<media-libs/libdc1394-1.9.99 )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# filter out -O3, -Os and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		-e "s:-Os::" \
+		make/unix.mak
+
+	# don't break make install if there are no plugins to install
+	epatch ${FILESDIR}/pwlib-1.8.7-instplugins.diff
+
+	# use sdl-config to query required libraries
+	epatch ${FILESDIR}/pwlib-1.9.3-sdl-configure.patch
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch ${FILESDIR}/${PN}-1.10.2-asm.patch
+
+	eautoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf=""
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+	# disable-alsa breaks oss, see bug 127677
+	use alsa && myconf="--enable-alsa"
+
+	econf \
+		--enable-plugins \
+		$(use_enable v4l2) \
+		$(use_enable v4l) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ieee1394 avc) \
+		$(use_enable oss) \
+		$(use_enable ipv6) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable ldap openldap) \
+		$(use_enable sasl) \
+		$(use_enable xml expat) \
+		${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
+	make PREFIX=/usr DESTDIR=${D} install || die "install failed"
+
+	## vv will try to fix the mess below, requires a lot of patching though...
+
+	# update 2005/08/22:
+	#
+	# locations in *.mak files haven been fixed
+	# directories have been replaced w/ symlinks
+	# (left to not break things, doing some testing atm)
+
+	# Note: reactivating this seems to be the only easy solution to slot pwlib ebuild
+	#       and keep applications happy (e.g. gnomemeeting / ekiga)
+
+#	dosym /usr/include /usr/share/pwlib/include
+#	dosym /usr/${libdir} /usr/share/pwlib/${libdir}
+#
+#	# just in case...
+#	if [[ "${libdir}" = "lib64" ]]; then
+#		dosym /usr/share/pwlib/lib64 /usr/share/pwlib/lib
+#	fi
+
+	## ^^ bad stuff
+
+	# fix symlink
+	libname=$(basename `ls ${D}/usr/${libdir}/libpt_*_*_r.so.${PV}`)
+	rm ${D}/usr/${libdir}/libpt.so
+	dosym ${libname} /usr/${libdir}/libpt.so
+
+	# fix makefiles to use headers from /usr/include and libs from /usr/lib
+	# instead of /usr/share/pwlib
+	# Note: change to /usr/include/pwlib-${PV} (or whereever includes will be)
+	#       once pwlib ebuilds get slotted
+	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
+	# Note: change to /usr/share/pwlib/${PV} (or whatever PWLIBDIR should point to)
+	#       once pwlib ebuilds get slotted
+	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
+	dohtml mpl-1.0.htm
+}
-- 
2.26.2