Version bump, some cleanups and changes of /usr/lib/ symlinks.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 171 insertions, 16 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index d8a640ae56d2..2a230a825246 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.68 2005/08/25 03:07:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.69 2005/09/12 20:06:57 stkn Exp $
+
+*openh323-1.15.6 (12 Sep 2005)
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +openh323-1.15.6.ebuild:
+  Version bump, some cleanups and changes of /usr/lib/ symlinks.
 
   15 Aug 2005; <stkn@gentoo.org> -openh323-1.12.2-r1.ebuild,
   -openh323-1.13.2.ebuild, -openh323-1.13.2-r1.ebuild,
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 71ff79ef001b..059a2a72cf10 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,25 +1,27 @@
-MD5 6629ee663a979089df00f62ca72ee855 openh323-1.15.3.ebuild 3974
-MD5 29aa9329620d18452705fa542c6ebfba openh323-1.13.5-r1.ebuild 4188
-MD5 0fe7f7f9988fabaa2763e35d351fd409 openh323-1.12.0-r1.ebuild 2820
+MD5 a94ddb1d91decd0a0787734fc1e27c9d openh323-1.13.2-r2.ebuild 4163
 MD5 9c59d13d7b06bc4d44c71723173b32c9 openh323-1.12.2-r2.ebuild 3720
 MD5 c37dead260b91dfc038ead49e10e2b7e openh323-1.15.2-r1.ebuild 4100
-MD5 a94ddb1d91decd0a0787734fc1e27c9d openh323-1.13.2-r2.ebuild 4163
-MD5 610660012dad6c9584c7f5271b26524e ChangeLog 11118
+MD5 032ccbd847b10acf333607d4b3471924 openh323-1.15.6.ebuild 4043
+MD5 0fe7f7f9988fabaa2763e35d351fd409 openh323-1.12.0-r1.ebuild 2820
+MD5 29aa9329620d18452705fa542c6ebfba openh323-1.13.5-r1.ebuild 4188
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
-MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
-MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
-MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+MD5 6f59b7268cdaa223ed6b373241010b38 ChangeLog 11286
+MD5 6629ee663a979089df00f62ca72ee855 openh323-1.15.3.ebuild 3974
 MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.2-include-order.diff 1027
+MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
 MD5 d63db2246a246adf622afeefabbb1e9d files/openh323-1.13.5-include-order.diff 1027
-MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
-MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.5-ffmpeg.diff 1899
-MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
-MD5 2c75f68b5db8444726ae9342b8a02319 files/openh323-1.13.2-ixjuser.diff 285
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
-MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r2 68
 MD5 9519f9e7c6a88c9159cba2345725ed9d files/digest-openh323-1.13.5-r1 73
+MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 e4b00dfe33b6d0574e651c93ceddf59d files/openh323-1.13.2-gcc34.diff 291
+MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+MD5 f5617f451bc51bdc25f39d40f32dd7a4 files/digest-openh323-1.15.6 68
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.13.2-ffmpeg.diff 1899
 MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
-MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
 MD5 73a8df25ace2235307956d67acecb32d files/openh323-1.15.2-notrace.diff 801
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
+MD5 8f793eaf228e13d19c7393fe95c8ed19 files/digest-openh323-1.13.2-r2 68
diff --git a/net-libs/openh323/files/digest-openh323-1.15.6 b/net-libs/openh323/files/digest-openh323-1.15.6
new file mode 100644
index 000000000000..c8340dc764fd
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.15.6
@@ -0,0 +1 @@
+MD5 6c49f41c4cec39172000586a26b98c48 openh323-1.15.6.tar.gz 3739001
diff --git a/net-libs/openh323/openh323-1.15.6.ebuild b/net-libs/openh323/openh323-1.15.6.ebuild
new file mode 100644
index 000000000000..1bad03656c50
--- /dev/null
+++ b/net-libs/openh323/openh323-1.15.6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.15.6.ebuild,v 1.1 2005/09/12 20:06:58 stkn Exp $
+
+inherit eutils flag-o-matic multilib
+
+MY_P="${PN}-v${PV//./_}"
+
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+IUSE="ssl novideo noaudio debug"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	~dev-libs/pwlib-1.8.7
+	>=media-video/ffmpeg-0.4.7
+	ssl? ( dev-libs/openssl )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Makefile is currently broken with NOTRACE=1, fix that
+	epatch ${FILESDIR}/${PN}-1.15.2-notrace.diff
+}
+
+src_compile() {
+	local makeopts
+	local myconf
+
+	# remove -fstack-protector, may cause problems (bug #75259)
+	filter-flags -fstack-protector
+
+	export PWLIBDIR=/usr/share/pwlib
+	export PTLIB_CONFIG=/usr/bin/ptlib-config
+	export OPENH323DIR=${S}
+
+	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
+	if ! use debug; then
+		makeopts="${makeopts} NOTRACE=1"
+	fi
+
+	if use ssl; then
+		export OPENSSLFLAG=1
+		export OPENSSLDIR=/usr
+		export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	use novideo \
+		&& myconf="${myconf} --disable-video"
+
+	use noaudio \
+		&& myconf="${myconf} --disable-audio"
+
+	econf ${myconf} || die "configure failed"
+	emake ${makeopts} opt || die "make failed"
+}
+
+src_install() {
+	local OPENH323_ARCH ALT_ARCH OPENH323_SUFFIX
+	local makeopts libdir
+
+	# make NOTRACE=1 opt ==> linux_$ARCH_n
+	# make opt           ==> linux_$ARCH_r
+	if ! use debug; then
+		OPENH323_SUFFIX="n"
+		makeopts="NOTRACE=1"
+	else
+		OPENH323_SUFFIX="r"
+	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
+		ALT_ARCH=${OPENH323_ARCH/_r/_n}
+	else
+		ALT_ARCH=${OPENH323_ARCH/_n/_r}
+	fi
+
+	###
+	# Install stuff
+	#
+	make PREFIX=/usr DESTDIR=${D} \
+		OH323_FILE="libh323_${OPENH323_ARCH}.so.${PV}" \
+		${makeopts} install || die "install failed"
+
+	libdir=$(get_libdir)
+
+	# 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 (still needed?)
+	insinto /usr/share/openh323/src
+	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
+
+	# install version.h into $OPENH323DIR
+	insinto /usr/share/openh323
+	doins version.h
+
+	# 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/${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
+}