version bump to fix bug 127246

Package-Manager: portage-2.1.1

6 files changed, 134 insertions, 10 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 56f13434b73e..9cbec7cb4369 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.72 2006/07/12 09:05:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.73 2006/09/14 01:12:41 genstef Exp $
+
+*openh323-1.18.0 (14 Sep 2006)
+
+  14 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/openh323-1.18.0-install.diff, +openh323-1.18.0.ebuild:
+  version bump to fix bug 127246
 
   12 Jul 2006; Markus Rothe <corsair@gentoo.org> openh323-1.15.6.ebuild:
   Added ~ppc64
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 190baa9f17e2..3d8219dfefcb 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -46,11 +46,16 @@ AUX openh323-1.15.6-gcc4.diff 1220 RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0
 MD5 cebf369b8262892d46ba56684cf15467 files/openh323-1.15.6-gcc4.diff 1220
 RMD160 aba712ee89a03b24a6263a67d7e7d89a6670c0de files/openh323-1.15.6-gcc4.diff 1220
 SHA256 2641f5dc25bd810977f13ad46ae7a1efe6468d849b0f764e3a7da0744c4d01ba files/openh323-1.15.6-gcc4.diff 1220
+AUX openh323-1.18.0-install.diff 917 RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be SHA1 fd9a1eecd6491af179931194af071d0f8af55f7e SHA256 0216b9cc4ed5082e7897fa806f568e2281c602e8abd0f0a74902e7bc812047e6
+MD5 0f8527aebd8d3dcfb7197656a4d31579 files/openh323-1.18.0-install.diff 917
+RMD160 18bdb85be13f1ca074f0d4db2394c8962bcaf9be files/openh323-1.18.0-install.diff 917
+SHA256 0216b9cc4ed5082e7897fa806f568e2281c602e8abd0f0a74902e7bc812047e6 files/openh323-1.18.0-install.diff 917
 DIST openh323-1.13.2.tar.gz 2197100
-DIST openh323-1.15.3.tar.gz 3754056
-DIST openh323-1.15.6.tar.gz 3739001 RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569
+DIST openh323-1.15.3.tar.gz 3754056 RMD160 280dde066c6170219a578ce723b252757da92f4e SHA1 42c7b55018455af568d70a42989bc5f32220b729 SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef
+DIST openh323-1.15.6.tar.gz 3739001 RMD160 1242cc978a9145d5ec206656849f4ac34fcef8af SHA1 4dffc58c1b2c10a20f8b9b3623af07248d59db55 SHA256 3c1d58d999aa45f0099bf2761f1d7cf858aa9d2039056377416a79aac1327569
 DIST openh323-v1_13_5-src.tar.gz 2216406
 DIST openh323-v1_15_2-src-tar.gz 3735815
+DIST openh323-v1_18_0-src-tar.gz 3742730 RMD160 1fc2abe36eef780f10f52aa2ebdd1950aa4fcebb SHA1 7d10cc3e35450f7bbde925375a99d66ae34369fa SHA256 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218
 DIST openh323_1.12.0.tar.gz 2325128
 DIST openh323_1.12.2.tar.gz 2343354
 EBUILD openh323-1.12.0-r1.ebuild 2820 RMD160 9a63d237355cc308b07d77b7d30307c2a9c6a3f2 SHA1 0d1c11a977793218c8a31463189176d57b431774 SHA256 14ff8faae3447a06bb9b97f8673d49af90a8fc20794642b63019db735947a088
@@ -81,10 +86,14 @@ EBUILD openh323-1.15.6.ebuild 4092 RMD160 1fa0d390f7a855bf2b2dcdea3a861b3b7a39e5
 MD5 72fa5aa4bac95c9b66af1d2522cdf912 openh323-1.15.6.ebuild 4092
 RMD160 1fa0d390f7a855bf2b2dcdea3a861b3b7a39e515 openh323-1.15.6.ebuild 4092
 SHA256 b8fc5f11048193bec3e0d5710407c6b8dcdc712d750f6b6dac042eca28a9475e openh323-1.15.6.ebuild 4092
-MISC ChangeLog 11695 RMD160 c84b25cf25034905e544ae413a5c90cfddf2aa97 SHA1 1970add29f07ee4375103924fa84f0487e376f1c SHA256 be277e1c5bb82682f7da01d7c1009b620924cec7b175420f228c0e8b0505b4f4
-MD5 d0c4ec6dbaf3708532b4ec3a7ab0c6b3 ChangeLog 11695
-RMD160 c84b25cf25034905e544ae413a5c90cfddf2aa97 ChangeLog 11695
-SHA256 be277e1c5bb82682f7da01d7c1009b620924cec7b175420f228c0e8b0505b4f4 ChangeLog 11695
+EBUILD openh323-1.18.0.ebuild 2257 RMD160 0a319950a027baba94ee6381f315c7ab3b8ccc42 SHA1 dac0252f0d82980da03c171b9d1f17783460b6ae SHA256 7cb7d5c39a3cff16e9f3c6b4939301c0794d5c3a9143dfdea7435cd66132a8c6
+MD5 441af084777a3c8790013a0cf2a7208d openh323-1.18.0.ebuild 2257
+RMD160 0a319950a027baba94ee6381f315c7ab3b8ccc42 openh323-1.18.0.ebuild 2257
+SHA256 7cb7d5c39a3cff16e9f3c6b4939301c0794d5c3a9143dfdea7435cd66132a8c6 openh323-1.18.0.ebuild 2257
+MISC ChangeLog 11878 RMD160 3ff79b4614c418125e61453e44c4baf8c93c69f4 SHA1 40fa884446053db9d7b66402bb3f192c8bdd4262 SHA256 37153e1b537ecb15c2f98cf8ce1df9149012eee38d2479340804075d32fb54f7
+MD5 0a9ec3c5ed0cb714118023f8a48ede3d ChangeLog 11878
+RMD160 3ff79b4614c418125e61453e44c4baf8c93c69f4 ChangeLog 11878
+SHA256 37153e1b537ecb15c2f98cf8ce1df9149012eee38d2479340804075d32fb54f7 ChangeLog 11878
 MISC metadata.xml 267 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 SHA1 c3b283892982fe0444300256e9d7648126c65704 SHA256 361003d761ffe7008e81579c3e8655ac1ca40285225f7234367d13ed682fc61e
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 RMD160 b6a42abb743624c76c331da2071e4e273a9af4e1 metadata.xml 267
@@ -104,9 +113,12 @@ SHA256 7b7160e7af2cb904f0ef4548be4be145d6170fb682dbae3c3b612629f6c77165 files/di
 MD5 ba6d90bbb25d240c705e30bd55bc8daf files/digest-openh323-1.15.2-r1 73
 RMD160 022ec53d637493cab4ca78395138c7d9a20ff9a8 files/digest-openh323-1.15.2-r1 73
 SHA256 7a1cf05e30827e885b16be923e43e309ba3431db67dc54e0c3db94692eca1116 files/digest-openh323-1.15.2-r1 73
-MD5 cfdd76561ff2f0a2582f953e56fa4623 files/digest-openh323-1.15.3 68
-RMD160 288de1b17bc9973a85468cf7ff4e087190c632ef files/digest-openh323-1.15.3 68
-SHA256 1f149ecd80402902293cdc8bda1c3cd851b98ddc3e70fca4b72b7af77037419a files/digest-openh323-1.15.3 68
+MD5 973eeb57f63719fd2735dbe6a449185f files/digest-openh323-1.15.3 250
+RMD160 c4c3ec80ba2d561b74a2e58d200e1e477d9b722b files/digest-openh323-1.15.3 250
+SHA256 d5b362b71dfa609973ac5c97783979672112567a4711f57d8f6f0796647374a6 files/digest-openh323-1.15.3 250
 MD5 1a07fbf6574ed01c5a065cf4f962f24f files/digest-openh323-1.15.6 250
 RMD160 7d35047b3bced683abbb3174a2de1ce59ae729ad files/digest-openh323-1.15.6 250
 SHA256 cb05f4b3767b1e1fd089f45a667b3a50fb9ff6fa325ef8cb6b0a57112016e2b8 files/digest-openh323-1.15.6 250
+MD5 63b2393d22a1e26f3003d570496540fa files/digest-openh323-1.18.0 265
+RMD160 427f5b004f0a78f1524ccdbbd589be62a5a19f0e files/digest-openh323-1.18.0 265
+SHA256 f76ca3ed0ed5c46964718a964deb24662317596807b397bbdd68ee393dc0ed28 files/digest-openh323-1.18.0 265
diff --git a/net-libs/openh323/files/digest-openh323-1.15.3 b/net-libs/openh323/files/digest-openh323-1.15.3
index 49b5ab176add..0aa701387840 100644
--- a/net-libs/openh323/files/digest-openh323-1.15.3
+++ b/net-libs/openh323/files/digest-openh323-1.15.3
@@ -1 +1,3 @@
 MD5 f9d25921281843fd2304da494b2e04e2 openh323-1.15.3.tar.gz 3754056
+RMD160 280dde066c6170219a578ce723b252757da92f4e openh323-1.15.3.tar.gz 3754056
+SHA256 2dab649046ca15b589bf48cfa6c6d2f3656b310ac482280f69a74eea397c91ef openh323-1.15.3.tar.gz 3754056
diff --git a/net-libs/openh323/files/digest-openh323-1.18.0 b/net-libs/openh323/files/digest-openh323-1.18.0
new file mode 100644
index 000000000000..32e53d12ec23
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.18.0
@@ -0,0 +1,3 @@
+MD5 d7043ba34b5038f0113b099ede0884fb openh323-v1_18_0-src-tar.gz 3742730
+RMD160 1fc2abe36eef780f10f52aa2ebdd1950aa4fcebb openh323-v1_18_0-src-tar.gz 3742730
+SHA256 26b4c9cf21dc1c92edf1583046670fce6be5b13045ef5d06e11403d36ffff218 openh323-v1_18_0-src-tar.gz 3742730
diff --git a/net-libs/openh323/files/openh323-1.18.0-install.diff b/net-libs/openh323/files/openh323-1.18.0-install.diff
new file mode 100644
index 000000000000..cec66c7f2a96
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.18.0-install.diff
@@ -0,0 +1,22 @@
+--- openh323_v1_18_0/Makefile.in.orig	2005-08-04 21:31:59.000000000 +0200
++++ openh323_v1_18_0/Makefile.in	2006-09-14 00:17:20.000000000 +0200
+@@ -336,7 +336,7 @@
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+-	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
++	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_$(OH323_SUFFIX).so*
+ 	$(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+ 	(cd $(DESTDIR)$(LIBDIR) ; \
+ 		rm -f  $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \
+@@ -351,8 +351,8 @@
+ 		ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \
+ 	)
+ 	(cd $(DESTDIR)$(LIBDIR); \
+-		rm -f  libopenh323.@SHAREDLIBEXT@ ; \
+-		ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \
++		rm -f  libopenh323.$(LIB_SUFFIX) ; \
++		ln -sf $(OH323_FILE) libopenh323.$(LIB_SUFFIX) \
+ 	)
+ 	( for dir in $(DESTDIR)$(LIBDIR) \
+ 		     $(DESTDIR)$(PREFIX)/include/openh323 \
diff --git a/net-libs/openh323/openh323-1.18.0.ebuild b/net-libs/openh323/openh323-1.18.0.ebuild
new file mode 100644
index 000000000000..bed01daecd1d
--- /dev/null
+++ b/net-libs/openh323/openh323-1.18.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.1 2006/09/14 01:12:41 genstef 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.voxgratia.org/releases/${PN}-v${PV//./_}-src-tar.gz"
+
+IUSE="debug ssl novideo noaudio"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~alpha ~amd64 ppc ~sparc ~x86 ~hppa"
+
+DEPEND=">=sys-apps/sed-4
+	=dev-libs/pwlib-1.10*
+	>=media-video/ffmpeg-0.4.7
+	ssl? ( dev-libs/openssl )"
+
+S="${WORKDIR}/${PN}_v${PV//./_}"
+
+pkg_setup() {
+	use debug || makeopts="NOTRACE=1"
+}
+
+src_unpack() {
+	tar -xzf ${DISTDIR}/${A} -C ${WORKDIR} || die "Unpacking failed"
+
+	cd ${S}
+	# Makefile does not work correctly, fix
+	epatch ${FILESDIR}/${PN}-1.18.0-install.diff
+}
+
+src_compile() {
+	# remove -fstack-protector, may cause problems (bug #75259)
+	filter-flags -fstack-protector
+
+	#export OPENH323DIR=${S}
+
+	econf \
+		$(use_enable !novideo video) \
+		$(use_enable !noaudio audio) \
+		--disable-transnexusosp \
+		|| die "econf failed"
+	emake ${makeopts} opt || die "emake failed"
+}
+
+src_install() {
+	emake ${makeopts} PREFIX=/usr DESTDIR=${D} install || die "emake install failed"
+
+	###
+	# Compatibility "hacks"
+	#
+
+	# debug / no debug use different suffixes - some packages build with only one
+	for i in ${D}/usr/lib/libh323_linux_x86_*; do
+		use debug && ln -s ${D}/usr/lib/libh323_linux_x86_*.so.*.*.* ${i/_r/_n} \
+			|| ln -s ${D}/usr/lib/libh323_linux_x86_*.so.*.*.* ${i/_n/_r}
+	done
+
+	# mod to keep gnugk happy
+	insinto /usr/share/openh323/src
+	echo -e "opt:\n\t:" > ${T}/Makefile
+	doins ${T}/Makefile
+
+	# 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
+}