bumping pwlib to 1.10.4

Package-Manager: portage-2.1.2-r9

4 files changed, 171 insertions, 5 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index a18242e7c3d2..b1f57eea61e4 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.119 2007/01/19 01:15:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.120 2007/02/21 22:55:24 remi Exp $
+
+*pwlib-1.10.4 (21 Feb 2007)
+
+  21 Feb 2007; Remi Cardona <remi@gentoo.org> +pwlib-1.10.4.ebuild:
+  bumping pwlib to 1.10.4
 
   19 Jan 2007; Jeroen Roovers <jer@gentoo.org> pwlib-1.10.2-r1.ebuild:
   Stable for HPPA (bug #147751).
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 55c9f53061c8..f6287fd0e9d7 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -37,6 +37,7 @@ SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052 files/pw
 DIST pwlib-1.10.0.tar.gz 1480233 RMD160 5341a4d21996472665032b3cfcc184f04435ddab SHA1 ce8be112cbb0f88ab33be0c4061d18d4bfa967dd SHA256 3bcbb47600061b6872215fbc68e7f04566a93bc602fa008636c85d47be5f5c00
 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.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
@@ -58,6 +59,10 @@ EBUILD pwlib-1.10.2.ebuild 4456 RMD160 fc0d573cb2b56640e675b3008021080cd36557b2
 MD5 8d25095e317ee96692c1479f5abaf5c7 pwlib-1.10.2.ebuild 4456
 RMD160 fc0d573cb2b56640e675b3008021080cd36557b2 pwlib-1.10.2.ebuild 4456
 SHA256 0c4a7edbcd967c03b65f7652ca05ed069822836b3f3c4a737be8091673324d8c pwlib-1.10.2.ebuild 4456
+EBUILD pwlib-1.10.4.ebuild 4440 RMD160 beac01be535ffdf8faa410212db192396b8eb9c0 SHA1 196b3c46dcf4f72dbc75f8bc0d728e3e2c0e42d8 SHA256 892987a9be5a2e293edd3a3499124f901ac77b2b49fd16f0f66378d427adb20f
+MD5 225d4b7a7af3ce64b4313b19d8a30c6d pwlib-1.10.4.ebuild 4440
+RMD160 beac01be535ffdf8faa410212db192396b8eb9c0 pwlib-1.10.4.ebuild 4440
+SHA256 892987a9be5a2e293edd3a3499124f901ac77b2b49fd16f0f66378d427adb20f pwlib-1.10.4.ebuild 4440
 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
@@ -78,10 +83,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 18251 RMD160 784bd0ae0c54f0d410a6e769f5a89be5bf2f23bc SHA1 a0218fb16cfd2f2e1832a695cfeae5e5829e313e SHA256 9676985440d44fe6e593af0fe2028aee5e378ed4ddd99b69560d55bd7c247da6
-MD5 8be9ecf7d72b7be88d5da01fe23e2284 ChangeLog 18251
-RMD160 784bd0ae0c54f0d410a6e769f5a89be5bf2f23bc ChangeLog 18251
-SHA256 9676985440d44fe6e593af0fe2028aee5e378ed4ddd99b69560d55bd7c247da6 ChangeLog 18251
+MISC ChangeLog 18376 RMD160 97432e32f0740ae4940dec4479c897ff018fc750 SHA1 76a09673fd27a2316b0a68d13661a44ebd3b80e2 SHA256 0a5ce60a66ee2426c95eba300362ad99956f7723442e2cf545eb5aba96af2e01
+MD5 c7486c766e6a88b1591e5df7ab6034b9 ChangeLog 18376
+RMD160 97432e32f0740ae4940dec4479c897ff018fc750 ChangeLog 18376
+SHA256 0a5ce60a66ee2426c95eba300362ad99956f7723442e2cf545eb5aba96af2e01 ChangeLog 18376
 MISC metadata.xml 235 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 SHA1 be1055e9141769fc4e44c3cc9026c635aa97d8cc SHA256 6b190d921eb507c8ae01261acc24b4c26d9a7efdd79e244efda043d8d0b66756
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 metadata.xml 235
@@ -98,6 +103,9 @@ SHA256 4c05999a32f13fdc9c6142e50af7668d3041ccad27b7f28459dc413f47381949 files/di
 MD5 92fa0564cc1a4b24702bccb63267d039 files/digest-pwlib-1.10.2-r1 241
 RMD160 6520f87a105b63fe7ae4a841a4c851701494af59 files/digest-pwlib-1.10.2-r1 241
 SHA256 4c05999a32f13fdc9c6142e50af7668d3041ccad27b7f28459dc413f47381949 files/digest-pwlib-1.10.2-r1 241
+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 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
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.4 b/dev-libs/pwlib/files/digest-pwlib-1.10.4
new file mode 100644
index 000000000000..f573b78d338f
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.10.4
@@ -0,0 +1,3 @@
+MD5 a9b71fec93079ff15374b26db71defab pwlib-1.10.4.tar.gz 2047300
+RMD160 7f1326d6ac1ef17306cd233241151f924fa218bb pwlib-1.10.4.tar.gz 2047300
+SHA256 33a368df5a9156401a8a5190ebd5a6aac489ab2dae3eec1ff6f442f59681dd3d pwlib-1.10.4.tar.gz 2047300
diff --git a/dev-libs/pwlib/pwlib-1.10.4.ebuild b/dev-libs/pwlib/pwlib-1.10.4.ebuild
new file mode 100644
index 000000000000..494571cf8bac
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.10.4.ebuild
@@ -0,0 +1,150 @@
+# 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.4.ebuild,v 1.1 2007/02/21 22:55:24 remi 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 mpl-1.0.htm
+}