From f8f8c161ac0edacbbe46531fd5dd6e9354e323c1 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 14 Apr 2007 08:57:51 +0000 Subject: [PATCH] Version bump, fix ldap depend Package-Manager: portage-2.1.2.3 --- dev-libs/pwlib/ChangeLog | 8 +- dev-libs/pwlib/Manifest | 24 ++-- dev-libs/pwlib/files/digest-pwlib-1.10.7 | 3 + dev-libs/pwlib/pwlib-1.10.5.ebuild | 4 +- dev-libs/pwlib/pwlib-1.10.7.ebuild | 151 +++++++++++++++++++++++ 5 files changed, 179 insertions(+), 11 deletions(-) create mode 100644 dev-libs/pwlib/files/digest-pwlib-1.10.7 create mode 100644 dev-libs/pwlib/pwlib-1.10.7.ebuild diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog index bf2cde062705..0d6e116840ee 100644 --- a/dev-libs/pwlib/ChangeLog +++ b/dev-libs/pwlib/ChangeLog @@ -1,6 +1,12 @@ # 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.133 2007/04/14 08:16:57 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.134 2007/04/14 08:57:51 genstef Exp $ + +*pwlib-1.10.7 (14 Apr 2007) + + 14 Apr 2007; Stefan Schweizer pwlib-1.10.5.ebuild, + +pwlib-1.10.7.ebuild: + Version bump, fix ldap depend 14 Apr 2007; Stefan Schweizer -files/pwlib-1.6.3-dyn-esd.patch, -files/pwlib-1.6.6-alsa_dmix.diff, diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest index 9119b2064cf9..a0444a2c239e 100644 --- a/dev-libs/pwlib/Manifest +++ b/dev-libs/pwlib/Manifest @@ -11,14 +11,19 @@ MD5 e6f4109b8afd168be571ddc00b16707b files/pwlib-1.9.3-sdl-configure.patch 1403 RMD160 240822a74944a5f54f147023b50966c72a232f24 files/pwlib-1.9.3-sdl-configure.patch 1403 SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052 files/pwlib-1.9.3-sdl-configure.patch 1403 DIST pwlib-1.10.5.tar.gz 2050733 RMD160 6cc7eabf4bf00331db6f19f405710449b0ea861d SHA1 06ee165888da56f41cdda00c84d4b89f751ea6dd SHA256 bb758c9297273cdb4bbef495edf8de52713f9a54cc228e699d31c5ff01f16e1d -EBUILD pwlib-1.10.5.ebuild 4445 RMD160 9c442b13ca61a7b57444339144413bd4564a113a SHA1 a22fdfa1dc20a52d5c409fa427460a42c81d3452 SHA256 b5b5788b6f53ad81089a62b34e7c465e7f031180b7bf852166680b26c728395d -MD5 d696df72222b7fa87388942c49d426f3 pwlib-1.10.5.ebuild 4445 -RMD160 9c442b13ca61a7b57444339144413bd4564a113a pwlib-1.10.5.ebuild 4445 -SHA256 b5b5788b6f53ad81089a62b34e7c465e7f031180b7bf852166680b26c728395d pwlib-1.10.5.ebuild 4445 -MISC ChangeLog 20230 RMD160 1e418600651b66f42a56761152b0a9350ee9135c SHA1 39d717724303ab733637b351bf9cac2688a553f5 SHA256 3f0c3c6eb2a5acc762d161baf5b84b614bebc0014e1988ea4883c7fb87dc9701 -MD5 aaf5237c269d5d2c6f12c72c5316addc ChangeLog 20230 -RMD160 1e418600651b66f42a56761152b0a9350ee9135c ChangeLog 20230 -SHA256 3f0c3c6eb2a5acc762d161baf5b84b614bebc0014e1988ea4883c7fb87dc9701 ChangeLog 20230 +DIST pwlib-1.10.7.tar.gz 2051682 RMD160 e1c9f98c48deb944c4c8714c33a322834d7a8c94 SHA1 524d71be5ce0c9089af7f99392400bce3175b263 SHA256 07a0b0e7e13d9356693317fdcef7ee8dfc0675f57ec7a99a8f3d9f968c44602c +EBUILD pwlib-1.10.5.ebuild 4452 RMD160 f4aafe3e4cc9cc3d28f39427ce724b674efa2074 SHA1 abf6e7284811abb211e31cf3e3695456ff7dec5a SHA256 f9b1317d61cbe03004b4900e1efe272a8a26310e416433fdb6ed7887e6ad0478 +MD5 e6154e05859d83a29e474c439aed6018 pwlib-1.10.5.ebuild 4452 +RMD160 f4aafe3e4cc9cc3d28f39427ce724b674efa2074 pwlib-1.10.5.ebuild 4452 +SHA256 f9b1317d61cbe03004b4900e1efe272a8a26310e416433fdb6ed7887e6ad0478 pwlib-1.10.5.ebuild 4452 +EBUILD pwlib-1.10.7.ebuild 4460 RMD160 285c23bef4d0de6cda031ae76150f446cd9c8ee5 SHA1 3d8a09b296be6b8a72770af8c5cc273b45ec821c SHA256 23572b35f57563ff324d5726243cd2a0c8684302826dbe0336e5c67459d72366 +MD5 e9e298190b820a7969db45667a48ba42 pwlib-1.10.7.ebuild 4460 +RMD160 285c23bef4d0de6cda031ae76150f446cd9c8ee5 pwlib-1.10.7.ebuild 4460 +SHA256 23572b35f57563ff324d5726243cd2a0c8684302826dbe0336e5c67459d72366 pwlib-1.10.7.ebuild 4460 +MISC ChangeLog 20390 RMD160 43f4451708357a3c3873b7565c6d2f851c02b075 SHA1 d324dcbfa96c6b19dc8848e20ef23ccff16b982e SHA256 eb4155aaac5d62b31d71940cf15ce01cfaca4b919b2fd8f5853c2e8162499bd1 +MD5 827970737e7c4f22d7d84f7306781b53 ChangeLog 20390 +RMD160 43f4451708357a3c3873b7565c6d2f851c02b075 ChangeLog 20390 +SHA256 eb4155aaac5d62b31d71940cf15ce01cfaca4b919b2fd8f5853c2e8162499bd1 ChangeLog 20390 MISC metadata.xml 235 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 SHA1 be1055e9141769fc4e44c3cc9026c635aa97d8cc SHA256 6b190d921eb507c8ae01261acc24b4c26d9a7efdd79e244efda043d8d0b66756 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 metadata.xml 235 @@ -26,3 +31,6 @@ SHA256 6b190d921eb507c8ae01261acc24b4c26d9a7efdd79e244efda043d8d0b66756 metadata 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 e45aa5143261a417220b5bbc453dde3d files/digest-pwlib-1.10.7 241 +RMD160 b54aec17555c4a1b67e213f81078f56aa16719e6 files/digest-pwlib-1.10.7 241 +SHA256 60ea11cd9a1317adfb5a3c28865bf1413c9c62885df42342a2e91bb44bfca754 files/digest-pwlib-1.10.7 241 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.7 b/dev-libs/pwlib/files/digest-pwlib-1.10.7 new file mode 100644 index 000000000000..e449053dae21 --- /dev/null +++ b/dev-libs/pwlib/files/digest-pwlib-1.10.7 @@ -0,0 +1,3 @@ +MD5 29c061328e93bda77423edb8bdabbddd pwlib-1.10.7.tar.gz 2051682 +RMD160 e1c9f98c48deb944c4c8714c33a322834d7a8c94 pwlib-1.10.7.tar.gz 2051682 +SHA256 07a0b0e7e13d9356693317fdcef7ee8dfc0675f57ec7a99a8f3d9f968c44602c pwlib-1.10.7.tar.gz 2051682 diff --git a/dev-libs/pwlib/pwlib-1.10.5.ebuild b/dev-libs/pwlib/pwlib-1.10.5.ebuild index d7061edcba56..506a5495a4ae 100644 --- a/dev-libs/pwlib/pwlib-1.10.5.ebuild +++ b/dev-libs/pwlib/pwlib-1.10.5.ebuild @@ -1,6 +1,6 @@ # 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.5 2007/03/23 20:37:40 killerfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.5.ebuild,v 1.6 2007/04/14 08:57:51 genstef Exp $ inherit eutils flag-o-matic multilib autotools @@ -19,7 +19,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) sys-libs/libavc1394 sys-libs/libraw1394 =net-nds/openldap-2.3.30 ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl ) diff --git a/dev-libs/pwlib/pwlib-1.10.7.ebuild b/dev-libs/pwlib/pwlib-1.10.7.ebuild new file mode 100644 index 000000000000..a2477211a821 --- /dev/null +++ b/dev-libs/pwlib/pwlib-1.10.7.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.7.ebuild,v 1.1 2007/04/14 08:57:51 genstef 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 + =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 + + 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