Cleanup pwlib-1.9.2.ebuild, patches apply to configure.ac instead of configure

svn path=/trunk/; revision=97

6 files changed, 92 insertions, 18 deletions

diff --git a/dev-libs/pwlib/Credits b/dev-libs/pwlib/Credits
new file mode 100644
index 0000000..bc2acee
--- /dev/null
+++ b/dev-libs/pwlib/Credits
@@ -0,0 +1,8 @@
+
+Alessandro Guido <alessandro.guido@gmail.com>: original versions of 
+	pwlib-1.9.2-ldap-configure.patch - fix for "command not found" error in configure
+	pwlib-1.9.2-sdl-configure.patch - remove x11 libs from sdl detection code
+
+	both patches have been converted to apply to configure.ac instead of configure.
+	the sdl patch has been rewritten to use sdl-config if available
+
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 6a78ca0..9ccf319 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,8 +1,13 @@
-MD5 82886f6903aff217847b43066c8516fb pwlib-1.8.7.ebuild 4079
-MD5 c5e8aafcba9e2996b152a154b7c4cf82 pwlib-1.8.4.ebuild 4797
-MD5 ae3632ebd0872413284afc6c0f0e2fd7 pwlib-1.9.1.ebuild 4846
+MD5 e99fef4a8b677f44a0dc2f7ee71d3603 Credits 130
 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64
-MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
-MD5 cd832010589d81cab25d2523d62a3401 files/pwlib-1.8.7-instplugins.diff 1044
 MD5 a874e4383164981b3881c8f636ec842b files/digest-pwlib-1.8.7 64
 MD5 9a453a6b41e8aca4d29d93373e5e0fca files/digest-pwlib-1.9.1 69
+MD5 3e5b0444209d255c7ea6715e47fdca0f files/digest-pwlib-1.9.2 64
+MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
+MD5 cd832010589d81cab25d2523d62a3401 files/pwlib-1.8.7-instplugins.diff 1044
+MD5 da8502d5b18bd77cea009712eda82e2e files/pwlib-1.9.2-ldap-configure.patch 393
+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
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.9.2 b/dev-libs/pwlib/files/digest-pwlib-1.9.2
new file mode 100644
index 0000000..2a964e1
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.9.2
@@ -0,0 +1 @@
+MD5 64f7ee4062f507e871863680df5278b9 pwlib-1.9.2.tar.gz 1457871
diff --git a/dev-libs/pwlib/files/pwlib-1.9.2-ldap-configure.patch b/dev-libs/pwlib/files/pwlib-1.9.2-ldap-configure.patch
new file mode 100644
index 0000000..1ed6779
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.9.2-ldap-configure.patch
@@ -0,0 +1,11 @@
+--- pwlib-1.9.2/configure.ac.orig	2006-01-20 14:59:39.000000000 +0100
++++ pwlib-1.9.2/configure.ac	2006-01-20 14:59:49.000000000 +0100
+@@ -204,7 +204,7 @@
+ 
+ dnl solaris has it's own ldap library
+ if test ${OSTYPE} != solaris ; then
+-   LDAP_LIBRARIES = "-llber -lldap_r"
++   LDAP_LIBRARIES="-llber -lldap_r"
+ fi
+ 
+ dnl ########################################################################
diff --git a/dev-libs/pwlib/files/pwlib-1.9.2-sdl-configure.patch b/dev-libs/pwlib/files/pwlib-1.9.2-sdl-configure.patch
new file mode 100644
index 0000000..b216df0
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.9.2-sdl-configure.patch
@@ -0,0 +1,39 @@
+--- pwlib-1.9.2/configure.ac	2006-01-16 20:52:05.000000000 +0100
++++ pwlib-1.9.2/configure.ac	2006-01-20 14:36:33.000000000 +0100
+@@ -1490,13 +1490,22 @@
+     SDLLIB=SDL
+   fi
+ 
++  dnl check for sdl-config
++  AC_PATH_PROG([SDL_CONFIG], [sdl-config],, [$PATH:/usr/local/bin])
++
+   dnl Linux check
+   AC_CHECK_HEADERS(SDL/SDL.h, HAS_SDL=1)
+   if test "${HAS_SDL:-unset}" != "unset" ; then
+     if test "${X11LIBDIR:-unset}" == "unset" ; then
+ 	X11LIBDIR=/usr/X11R6/lib
+     fi
+-    AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext -laa)
++    if test "x${SDL_CONFIG}" = "x" ; then
++	SDL_LIBS="-L${X11LIBDIR} -lpthread -lX11 -lXext -laa"
++    else
++	SDL_LIBS="`${SDL_CONFIG} --libs`"
++    fi
++
++    AC_CHECK_LIB([SDL], [SDL_CreateYUVOverlay], [HAS_SDL=1], [HAS_SDL=], [$SDL_LIBS])
+   fi
+ 
+   dnl freeBSD SDL check
+@@ -1516,7 +1525,11 @@
+     if test ${SDLLIBDIR:-unset} != "unset" ; then
+       LDFLAGS="$LDFLAGS -L${SDLLIBDIR}"
+     fi
+-    ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}"
++    if test "x${SDL_CONFIG}" = "x" ; then
++    	ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}"
++    else
++	ENDLDLIBS="$ENDLDLIBS `${SDL_CONFIG} --libs`"
++    fi
+   fi
+ fi
+ AC_SUBST(HAS_SDL)
diff --git a/dev-libs/pwlib/pwlib-1.9.2.ebuild b/dev-libs/pwlib/pwlib-1.9.2.ebuild
index 9db6471..811a782 100644
--- a/dev-libs/pwlib/pwlib-1.9.2.ebuild
+++ b/dev-libs/pwlib/pwlib-1.9.2.ebuild
@@ -6,14 +6,13 @@ inherit eutils flag-o-matic multilib
 
 IUSE="alsa esd ieee1394 ipv6 oss sdl ssl v4l2"
 
-DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
+DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
 HOMEPAGE="http://www.voxgratia.org/"
-SRC_URI="http://www.voxgratia.org/releases/pwlib-v${PV//./_}-src-tar.gz"
+SRC_URI="http://www.ekiga.org/downloads/sources/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-KEYWORDS="-*"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/expat
@@ -33,17 +32,15 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a
 	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${PN}_v${PV//./_}"
-
 src_unpack() {
-	tar -xzf ${DISTDIR}/${A} -C ${WORKDIR} || die "Unpacking failed"
-
+	unpack ${A}
 	cd ${S}
 
-	# filter out -O3 and -mcpu embedded compiler flags
+	# 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
 
 	# newer esound package doesn't install libesd.a anymore,
@@ -52,6 +49,14 @@ src_unpack() {
 
 	# don't break make install if there are no plugins to install
 	epatch ${FILESDIR}/pwlib-1.8.7-instplugins.diff
+
+	# fix "command not found" error during configure run
+	epatch ${FILESDIR}/pwlib-1.9.2-ldap-configure.patch
+
+	# use sdl-config to query required libraries
+	epatch ${FILESDIR}/pwlib-1.9.2-sdl-configure.patch
+
+	autoconf || die "autoconf failed"
 }
 
 src_compile() {
@@ -126,7 +131,6 @@ src_install() {
 	libdir=$(get_libdir)
 
 	# makefile doesn't create ${D}/usr/bin
-#	dodir /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...
@@ -137,6 +141,9 @@ src_install() {
 	# 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}
 #
@@ -148,10 +155,9 @@ src_install() {
 	## ^^ bad stuff
 
 	# fix symlink
-	rm ${D}/usr/${libdir}/libpt.so
-
 	libname=$(basename `ls ${D}/usr/${libdir}/libpt_*_*_r.so.${PV}`)
-	dosym /usr/${libdir}/${libname} /usr/${libdir}/libpt.so
+	rm ${D}/usr/${libdir}/libpt.so
+	dosym ${libname} /usr/${libdir}/libpt.so
 
 	# strip ${S} stuff
 #	sed -i -e "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" \
@@ -161,12 +167,16 @@ src_install() {
 
 	# 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