Remove unused parts from pwlib-1.9.2 ebuild; esound support seems to have vanished, remove it too

svn path=/trunk/; revision=98

2 files changed, 7 insertions, 50 deletions

diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 9ccf319..14c1dd7 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,4 +1,4 @@
-MD5 e99fef4a8b677f44a0dc2f7ee71d3603 Credits 130
+MD5 38c8d9bfecf638ef091e5f0609bd43b9 Credits 376
 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64
 MD5 a874e4383164981b3881c8f636ec842b files/digest-pwlib-1.8.7 64
 MD5 9a453a6b41e8aca4d29d93373e5e0fca files/digest-pwlib-1.9.1 69
@@ -10,4 +10,4 @@ MD5 7ed29358f47f15f2e488d2ee4dd887f2 files/pwlib-1.9.2-sdl-configure.patch 1202
 MD5 c5e8aafcba9e2996b152a154b7c4cf82 pwlib-1.8.4.ebuild 4797
 MD5 82886f6903aff217847b43066c8516fb pwlib-1.8.7.ebuild 4079
 MD5 ae3632ebd0872413284afc6c0f0e2fd7 pwlib-1.9.1.ebuild 4846
-MD5 5ea96ef2e7ab2f860953bc5b5f51de89 pwlib-1.9.2.ebuild 5402
+MD5 2fc08ea65dd031cf5fbfe94b39609a8c pwlib-1.9.2.ebuild 4175
diff --git a/dev-libs/pwlib/pwlib-1.9.2.ebuild b/dev-libs/pwlib/pwlib-1.9.2.ebuild
index 811a782..67518c2 100644
--- a/dev-libs/pwlib/pwlib-1.9.2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.9.2.ebuild
@@ -4,7 +4,7 @@
 
 inherit eutils flag-o-matic multilib
 
-IUSE="alsa esd ieee1394 ipv6 oss sdl ssl v4l2"
+IUSE="alsa ieee1394 ipv6 oss sdl ssl v4l v4l2"
 
 DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
 HOMEPAGE="http://www.voxgratia.org/"
@@ -24,8 +24,7 @@ RDEPEND="
 		sys-libs/libavc1394
 		sys-libs/libraw1394
 		<media-libs/libdc1394-1.9.99
-		!>=media-libs/libdc1394-2.0.0_pre1 )
-	esd? ( media-sound/esound )"
+		!>=media-libs/libdc1394-2.0.0_pre1 )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.28
@@ -43,10 +42,6 @@ src_unpack() {
 		-e "s:-Os::" \
 		make/unix.mak
 
-	# newer esound package doesn't install libesd.a anymore,
-	# use dynamic library instead (fixes #100432)
-	epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch
-
 	# don't break make install if there are no plugins to install
 	epatch ${FILESDIR}/pwlib-1.8.7-instplugins.diff
 
@@ -65,37 +60,17 @@ src_compile() {
 	# may cause ICE (bug #70638)
 	filter-flags -fstack-protector
 
-#	if use ssl; then
-#		export OPENSSLFLAG=1
-#		export OPENSSLDIR="/usr"
-#		export OPENSSLLIBS="-lssl -lcrypt"
-#	fi
-
-	## gnomemeeting-1.00 requires pwlib to be built w/ IPV6 support
-	## (even if itself is built without...)
-	#use ipv6 \
-	#	&& myconf="${myconf} --enable-ipv6" \
-	#	|| myconf="${myconf} --disable-ipv6"
-#	myconf="--enable-ipv6"
-
-	if use esd; then
-		# fixes bug #45059
-		export ESDDIR=/usr
-
-		# ESD includes are in /usr/include?
-		# remove include path, bad things may happen if we leave it in there
-		sed -i -e "s:-I\$(ESDDIR)/include::" \
-			${S}/make/unix.mak
-	fi
-
 	econf \
 		--enable-plugins \
 		$(use_enable v4l2) \
+		$(use_enable v4l) \
 		$(use_enable ieee1394 dc) \
 		$(use_enable ieee1394 avc) \
 		$(use_enable oss) \
 		$(use_enable alsa) \
 		$(use_enable ipv6) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
 		${myconf} || die "configure failed"
 
 	# Horrible hack to strip out -L/usr/lib to allow upgrades
@@ -113,18 +88,6 @@ src_compile() {
 	emake -j1 opt || die "make failed"
 }
 
-#pkg_preinst() {
-#	# remove {lib,include} directories in /usr/share/pwlib
-#	# they are getting replaced by symlinks in src_install
-#
-#	if [[ -d ${ROOT}usr/share/pwlib/include ]]; then
-#		rm -rf ${ROOT}usr/share/pwlib/include
-#	fi
-#	if [[ -d ${ROOT}usr/share/pwlib/$(get_libdir) ]]; then
-#		rm -rf ${ROOT}usr/share/pwlib/$(get_libdir)
-#	fi
-#}
-
 src_install() {
 	local libdir libname
 
@@ -159,12 +122,6 @@ src_install() {
 	rm ${D}/usr/${libdir}/libpt.so
 	dosym ${libname} /usr/${libdir}/libpt.so
 
-	# strip ${S} stuff
-#	sed -i -e "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" \
-#		${D}/usr/bin/ptlib-config \
-#		${D}/usr/share/pwlib/make/ptlib-config \
-#		${D}/usr/share/pwlib/make/ptbuildopts.mak
-
 	# 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)