[patch] same for openh323-1.15.3 ebuild

openh323-1.15.3.ebuild.diff (text/plain), 4.17 KB, created by Stefan Knoblich (RETIRED) on 2005-08-28 13:57:10 UTC

--- /usr/portage/net-libs/openh323/openh323-1.15.3.ebuild	2005-07-27 11:05:48.000000000 +0000
+++ gentoo-voip/net-libs/openh323/openh323-1.15.3.ebuild	2005-08-28 19:51:55.000000000 +0000
@@ -13,7 +13,7 @@
 IUSE="ssl novideo noaudio debug"
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~sparc ~x86 ~hppa"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.8.4
@@ -39,7 +39,7 @@
 	export PTLIB_CONFIG=/usr/bin/ptlib-config
 	export OPENH323DIR=${S}
 
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib"
+	makeopts="ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib"
 
 	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
 	# compile with PTRACING if the user wants to debug stuff
@@ -65,7 +65,8 @@
 
 src_install() {
 	local OPENH323_ARCH ALT_ARCH OPENH323_SUFFIX
-	local makeopts
+	local makeopts libdir
+
 	# make NOTRACE=1 opt ==> linux_$ARCH_n
 	# make opt           ==> linux_$ARCH_r
 	if ! use debug; then
@@ -75,12 +76,8 @@
 		OPENH323_SUFFIX="r"
 	fi
 
-	# amd64 needs special treatment
-	if use amd64; then
-		OPENH323_ARCH="linux_x86_64_${OPENH323_SUFFIX}"
-	else
-		OPENH323_ARCH="linux_${ARCH}_${OPENH323_SUFFIX}"
-	fi
+	# use ptlib-config to get the right values here (for hppa, amd64 ...)
+	OPENH323_ARCH="$(ptlib-config --ostype)_$(ptlib-config --machtype)_${OPENH323_SUFFIX}"
 
 	# set ALT_ARCH
 	if use debug; then
@@ -96,20 +93,33 @@
 		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
 		${makeopts} install || die "install failed"
 
-	# workaround: don't install libh323*.so and libh323.so.${PV}
-	if [[ -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so ]]; then
-		# libh323*.so is a file... replace it w/ a symlink
-		rm -f ${D}/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
+	libdir=$(get_libdir)
 
-		dosym  /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} \
-			/usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so
-	fi
+	# fix openh323's bogus symlinks
+	for pv in ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
+		rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
+
+		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/${libdir}/libh323_${OPENH323_ARCH}.so.${pv}
+	done
+	rm -f ${D}/usr/${libdir}/libh323_${OPENH323_ARCH}.so
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+		/usr/${libdir}/libh323_${OPENH323_ARCH}.so
+
+	# create backwards compatibility with _r versioned libraries
+	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
+		# compat symlink
+		dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+			/usr/${libdir}/libh323_${ALT_ARCH}.so.${pv}
+	done
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} \
+		/usr/${libdir}/libh323_${ALT_ARCH}.so
 
 	###
 	# Compatibility "hacks"
 	#
 
-	# mod to keep gnugk happy
+	# mod to keep gnugk happy (still needed?)
 	insinto /usr/share/openh323/src
 	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
 
@@ -117,22 +127,17 @@
 	insinto /usr/share/openh323
 	doins version.h
 
-	rm ${D}/usr/$(get_libdir)/libopenh323.so
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libopenh323.so
-
-	# for backwards compatibility with _r versioned libraries
-	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
-		einfo "creating /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv} symlink"
-		dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so.${pv}
-	done
-	dosym /usr/$(get_libdir)/libh323_${OPENH323_ARCH}.so.${PV} /usr/$(get_libdir)/libh323_${ALT_ARCH}.so
+	# should try to get rid of this one
+	rm -f ${D}/usr/${libdir}/libopenh323.so
+	dosym /usr/${libdir}/libh323_${OPENH323_ARCH}.so.${PV} /usr/${libdir}/libopenh323.so
 
 	# these should point to the right directories,
 	# openh323.org apps and others need this
-	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
+	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/${libdir}:" \
 		/usr/share/openh323/openh323u.mak
 	dosed "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
 		/usr/share/openh323/openh323u.mak
+
 	# this is hardcoded now?
 	dosed "s:^\(OPENH323DIR[ \t]\+=\) ${S}:\1 /usr/share/openh323:" \
 		/usr/share/openh323/openh323u.mak