add 1.10.10-r2 ebuild with disabled avc plugin, bug 272848

Package-Manager: portage-13805-svn/cvs/Linux i686

3 files changed, 166 insertions, 13 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 7159bb1ec611..059b9c13c9d5 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/pwlib
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.146 2008/08/16 15:31:09 tove Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.147 2009/07/10 15:48:55 volkmar Exp $
+
+*pwlib-1.10.10-r2 (10 Jul 2009)
+
+  10 Jul 2009; Mounir Lamouri <volkmar@gentoo.org> +pwlib-1.10.10-r2.ebuild:
+  Add 1.10.10-r2 ebuild with disabled avc plugin. Fix bug 272848
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove stkn from metadata.xml (#27693)
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index cdf3f1c9a311..0426e3351568 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pwlib-1.10.1-vsprintf.patch 405 RMD160 83d78ae27b7813ca7fb82c9fb46ff90d8feff911 SHA1 94de3a7a19482a8cda6844e72a19b6738ae3987c SHA256 1bc01ffe75840552d115737a7b68a35e9e02cc88518e82eff127c57c50155d14
 AUX pwlib-1.10.2-asm.patch 986 RMD160 9884754a5d29c34c9b030f95c528c67c41ea3eb5 SHA1 d3ea2aaca29edc3c0861cafbad1db0a4bab80d16 SHA256 52099f9eba393af85ceac985ad284b20bfa052a39219607bb51d7e169c240dc2
 AUX pwlib-1.8.7-instplugins.diff 1044 RMD160 722bc5e665f787e14f9d0e54679c8ba3fcc5e7e6 SHA1 90ccb7e33024dbb36e635b5b47ee0f67a9af7c05 SHA256 39e0b892ae1aa82af87a92a71c8ba78a84ee18984732856ce2f228a6d4340552
 AUX pwlib-1.9.3-sdl-configure.patch 1403 RMD160 240822a74944a5f54f147023b50966c72a232f24 SHA1 4d65a4a4c0663ac3c8a281ad6bfbe06a86727f1c SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052
 DIST pwlib-1.10.10.tar.gz 2266255 RMD160 b9e2f3f79911c377dc2d2fbef62d3628aa8364f7 SHA1 ebadd7403695c73fae69488a50a34d15763fd245 SHA256 90a04544e1a6eb4957f92f4845c94950ec3612e0378d1e281c3607548f5092f6
 EBUILD pwlib-1.10.10-r1.ebuild 4607 RMD160 4578f5f5cb31ed68397b13defdd689e6d6e4a419 SHA1 af87b89431854c08521f0324b0039f2d3d5d878b SHA256 a6c219493fdc3bda081326e4c8be509254bc6d7134197aefa20943f0d5d9a2eb
-MISC ChangeLog 21715 RMD160 a7c88dae681ac0765d43f85c0aae1012a68a9b52 SHA1 00ce7ee5ba4b652156ca23afaf7be7695479da23 SHA256 25b362a73b706e10a22545ba6a2ec5a8efe4c31c03d0b79421bc2c0162a3091b
+EBUILD pwlib-1.10.10-r2.ebuild 4611 RMD160 0a07e5f1641d4265dec3dd31c6b99509001419c5 SHA1 47df0fdd71b5d5338f307001d5e78f430ad0ea13 SHA256 766354a7e698fd37f3c2f3601d7ecae7effe04857aed7c420617424d03fc2b8c
+MISC ChangeLog 21894 RMD160 593bc8a71ae0bbacef3aaf14db20efbb4726f15c SHA1 04871ee1b857649af558fc6636f1fd6e0088f0f8 SHA256 f91758bb60870aec9952bd733fddb119232a59b3bb7657c8545441d03d14fa82
 MISC metadata.xml 180 RMD160 0b6819d0803da88fe59d34e2ac87c912f3f394b4 SHA1 ea8327baa11d4021618e506d58ba07697e66af2a SHA256 1645c6addf8e8d8229a395cdeb8b13ab70607d30a2e14cec3d0de29b60ea37c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkim8rEACgkQV3J2n04EauyldgCfeMHnduCvkTjyuKv6HrYfaSSU
-MlgAn2kpalcFijgTVRUWL1Qq96S5gCKO
-=Zlvv
------END PGP SIGNATURE-----
diff --git a/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild b/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
new file mode 100644
index 000000000000..6f63c221f25c
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild,v 1.1 2009/07/10 15:48:55 volkmar Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib autotools toolchain-funcs
+
+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/libraw1394
+		media-libs/libdc1394:1 )
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	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
+
+	# security - we obviousl need to patch..
+	epatch "${FILESDIR}"/pwlib-1.10.1-vsprintf.patch
+
+	eautoconf || die "autoconf failed"
+}
+
+src_compile() {
+	tc-export CC CXX
+	local myconf=""
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+	# disable-alsa breaks oss, see bug 127677
+	use alsa && myconf="--enable-alsa"
+
+	# disabling avc, bug 272848
+	econf \
+		--enable-plugins \
+		--disable-avc \
+		$(use_enable v4l2) \
+		$(use_enable v4l) \
+		$(use_enable ieee1394 dc) \
+		$(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
+}