[patch] diff between current and modified pwlib-1.8.4 ebuild

pwlib-1.8.4.ebuild.diff (text/plain), 5.12 KB, created by Stefan Knoblich (RETIRED) on 2005-08-28 13:56:27 UTC

--- /usr/portage/dev-libs/pwlib/pwlib-1.8.4.ebuild	2005-08-26 16:09:14.000000000 +0000
+++ gentoo-voip/dev-libs/pwlib/pwlib-1.8.4.ebuild	2005-08-28 19:51:54.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.5 2005/08/26 16:01:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.2 2005/07/10 01:11:05 swegener Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -12,7 +12,7 @@
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ppc ~amd64"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 DEPEND=">=sys-devel/bison-1.28
 	>=sys-devel/flex-2.5.4a
@@ -25,7 +25,7 @@
 	ieee1394? ( media-libs/libdv
 		sys-libs/libavc1394
 		sys-libs/libraw1394
-		media-libs/libdc1394 )
+		media-plugins/libdc1394 )
 	esd? ( media-sound/esound )"
 
 src_unpack() {
@@ -38,15 +38,10 @@
 		-e "s:-mcpu=\$(CPUTYPE)::" \
 		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
 		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
 }
 
 src_compile() {
-	local plugins
-	local myconf
+	local plugins myconf
 
 	# may cause ICE (bug #70638)
 	filter-flags -fstack-protector
@@ -62,7 +57,7 @@
 	#use ipv6 \
 	#	&& myconf="${myconf} --enable-ipv6" \
 	#	|| myconf="${myconf} --disable-ipv6"
-	myconf="${myconf} --enable-ipv6"
+	myconf="--enable-ipv6"
 
 	# plugins, oss and v4l are default
 	plugins="oss v4l"
@@ -98,10 +93,11 @@
 	# 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:" \
+	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:" \
+
+	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
@@ -109,46 +105,68 @@
 	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
+
+	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...
 
-	# these are for compiling openh323
-	# NOTE: symlinks don't work when upgrading
-	# FIXME: probably should fix this with ptlib-config
-	dodir /usr/share/pwlib/include
-	cp -r ${D}/usr/include/* ${D}/usr/share/pwlib/include
-
-	dodir /usr/share/pwlib/$(get_libdir)
-	for x in ${D}/usr/$(get_libdir)/*; do
-		dosym /usr/$(get_libdir)/`basename ${x}` /usr/share/pwlib/$(get_libdir)/`basename ${x}`
-	done
-
-	# just in case...
-	if [[ "$(get_libdir)" = "lib64" ]]; then
-		dosym /usr/share/pwlib/$(get_libdir) /usr/share/pwlib/lib
-	fi
+	# 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)
+
+#	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
-	# only amd64 needs special handling, afaics
-	rm ${D}/usr/$(get_libdir)/libpt.so
-	if use amd64; then
-		dosym /usr/$(get_libdir)/libpt_linux_x86_64_r.so.${PV} /usr/$(get_libdir)/libpt.so
-	else
-		dosym /usr/$(get_libdir)/libpt_linux_${ARCH}_r.so.${PV} /usr/$(get_libdir)/libpt.so
-	fi
+	rm ${D}/usr/${libdir}/libpt.so
+
+	libname=$(basename `ls ${D}/usr/${libdir}/libpt_*_*_r.so.${PV}`)
+	dosym /usr/${libdir}/${libname} /usr/${libdir}/libpt.so
 
 	# strip ${S} stuff
-	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/bin/ptlib-config
-	dosed "s:^PWLIBDIR.*:PWLIBDIR=/usr/share/pwlib:" /usr/share/pwlib/make/ptbuildopts.mak
+	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
+	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
-	dosed 's:${exec_prefix}:/usr:' /usr/bin/ptlib-config
+	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