[This is a placeholder. Please ignore.]

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

3 files changed, 8 insertions, 165 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 47b44d2d9a3a..de73e27807d2 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.159 2011/09/13 18:21:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.160 2011/09/13 18:21:57 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -pwlib-1.10.10-r2.ebuild:
+  [This is a placeholder. Please ignore.]
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> pwlib-1.10.10-r3.ebuild:
   Stabilize for everyone.
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 4c2b1c080965..dcecce0d5190 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -7,14 +7,13 @@ AUX pwlib-1.10.2-asm.patch 986 RMD160 9884754a5d29c34c9b030f95c528c67c41ea3eb5 S
 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-r2.ebuild 4649 RMD160 b4dda3d8f8bc8f2dee43e254057625e81a3e1ef1 SHA1 6b07d18e7740a6414f1f80d6eac68207ef66806f SHA256 825caa4be37741d5ea0fb7667649e7b36ee090f086937af0c8a6db223ac37c73
 EBUILD pwlib-1.10.10-r3.ebuild 4667 RMD160 d9e026fe11b974db096da34c4dee14ddbbf262c0 SHA1 d76bd60e4bfd5fd63b7a8069b7643ff002727619 SHA256 22c7c0707b3a181b6897fa2d9f86b24c7578a08831f20b2e0678acd8fc82cf42
-MISC ChangeLog 23364 RMD160 8c36ed8c3511fa4acaad97f62a84f210d214bf81 SHA1 410f0c23896c7f7e6f45e40365659ab8c9a4b394 SHA256 7242a5fc28e1e698dd4c9304be9904122c306f71ef4dbe91ae27cf9ca4b1d4b2
+MISC ChangeLog 23487 RMD160 b78ca4175758bd8cbef68a742a07425e7a7bd3a9 SHA1 880ae3111644b792ec56c4d4ce33dd1fbfc2357f SHA256 ed5e12fc591541b92e4851c210c8ac41131ddd1297f62dbe905b0a5404a40480
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5vn0kACgkQXkR9YqOcLPFARgD9HDbr9P01uDmpf3e2h8BwIzRv
-U21eO9t/YU4rD5rXl/QA/2u+Xokv0d6k0AJGWMzoHFSBlt+0+BK6jpfT2XuhWG2Q
-=g5Ut
+iF4EAREIAAYFAk5vn3oACgkQXkR9YqOcLPGDiAD+J0Tsvo43kvkZPgli7bSYXC4Y
+kFP2fQS57zC9/H0mN84BAKVd8HIZBdUFpw2e1mMDTWSMDms1+5G3fyOfjyZmDLOh
+=ZI7O
 -----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
deleted file mode 100644
index 2de54d6e899b..000000000000
--- a/dev-libs/pwlib/pwlib-1.10.10-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2010 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.8 2010/07/11 03:01:48 ssuominen 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
-
-	epatch "${FILESDIR}"/${P}-openssl-1.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
-}