Version bump, how part of the H.323 app suite. Fix license, bug #426132.

(Portage version: 2.1.11.52/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 82 insertions, 128 deletions

diff --git a/net-voip/openmcu/ChangeLog b/net-voip/openmcu/ChangeLog
index ab968dcfa1f5..9dc26d2e2af8 100644
--- a/net-voip/openmcu/ChangeLog
+++ b/net-voip/openmcu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/openmcu
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/openmcu/ChangeLog,v 1.4 2009/02/13 05:22:23 darkside Exp $
+# Copyright 2000-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/openmcu/ChangeLog,v 1.5 2013/03/06 19:00:03 chithanh Exp $
+
+*openmcu-2.2.5 (06 Mar 2013)
+
+  06 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +openmcu-2.2.5.ebuild, -files/openmcu-2.2.0-gentoo.diff,
+  -openmcu-2.2.0.ebuild:
+  Version bump, how part of the H.323 app suite. Fix license, bug #426132.
 
 *openmcu-2.2.1 (13 Feb 2009)
 
@@ -50,4 +57,3 @@
 
   12 Sep 2003; Michael Imhof <tantive@gentoo.org> :
   Initial release.
-
diff --git a/net-voip/openmcu/files/openmcu-2.2.0-gentoo.diff b/net-voip/openmcu/files/openmcu-2.2.0-gentoo.diff
deleted file mode 100644
index 03ffe2963284..000000000000
--- a/net-voip/openmcu/files/openmcu-2.2.0-gentoo.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -u openmcu_v2_2_0.orig/main.cxx openmcu_v2_2_0/main.cxx
---- openmcu_v2_2_0.orig/main.cxx	2006-09-14 02:05:07.000000000 +0200
-+++ openmcu_v2_2_0/main.cxx	2006-09-14 02:05:39.000000000 +0200
-@@ -54,9 +54,9 @@
- #include <ptlib.h>
- #include "mcu.h"
- 
--static const char DefaultConnectingWAVFile[] = "connecting.wav";
--static const char DefaultEnteringWAVFile[]   = "entering.wav";
--static const char DefaultLeavingWAVFile[]    = "leaving.wav";
-+static const char DefaultConnectingWAVFile[] = "/usr/share/openmcu/sounds/connecting.wav";
-+static const char DefaultEnteringWAVFile[]   = "/usr/share/openmcu/sounds/entering.wav";
-+static const char DefaultLeavingWAVFile[]    = "/usr/share/openmcu/sounds/leaving.wav";
- 
- static const char ConnectingWAVFileKey[]  = "Connecting WAV File";
- static const char EnteringWAVFileKey[]    = "Entering WAV File";
-Only in openmcu_v2_2_0.orig: main.cxx.orig
-diff -u openmcu_v2_2_0.orig/mcu.cxx openmcu_v2_2_0/mcu.cxx
---- openmcu_v2_2_0.orig/mcu.cxx	2006-09-14 02:06:59.000000000 +0200
-+++ openmcu_v2_2_0/mcu.cxx	2006-09-14 02:09:25.000000000 +0200
-@@ -80,7 +80,7 @@
- static const char DefaultRoomKey[]          = "Default room";
- static const char DefaultRoomTimeLimitKey[] = "Room time limit";
- 
--static const char DefaultCallLogFilename[] = "mcu_log.txt"; 
-+static const char DefaultCallLogFilename[] = "/var/log/openmcu/mcu_log.txt"; 
- static const char DefaultRoom[]            = "room101";
- 
- #if OPENMCU_VIDEO
-@@ -151,8 +151,8 @@
- #endif
-   exeDir.Change();
- 
--  httpNameSpace.AddResource(new PHTTPDirectory("data", "data"));
--  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "html"));
-+  httpNameSpace.AddResource(new PHTTPDirectory("data", "/usr/share/openmcu/data"));
-+  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "/usr/share/openmcu/html"));
- 
-   manager  = CreateConferenceManager();
-   endpoint = CreateEndPoint(*manager);
-@@ -226,7 +226,7 @@
- 
- #if P_SSL
-   // SSL certificate file.
--  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "server.pem");
-+  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "/etc/openmcu/server.pem");
-   rsrc->Add(new PHTTPStringField(HTTPCertificateFileKey, 25, certificateFile));
-   if (!SetServerCertificate(certificateFile, TRUE)) {
-     PSYSTEMLOG(Fatal, "BMAC\tCould not load certificate \"" << certificateFile << '"');
diff --git a/net-voip/openmcu/openmcu-2.2.0.ebuild b/net-voip/openmcu/openmcu-2.2.0.ebuild
deleted file mode 100644
index 25e9c0c0a997..000000000000
--- a/net-voip/openmcu/openmcu-2.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/openmcu/openmcu-2.2.0.ebuild,v 1.2 2007/01/06 16:36:58 drizzt Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="H.323 conferencing server"
-HOMEPAGE="http://openh323.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openh323/${PN}-v${PV//./_}-src-tar.gz"
-
-S=${WORKDIR}/${PN}_v${PV//./_}
-
-SLOT="0"
-KEYWORDS="~x86"
-LICENSE="MPL-1.0"
-
-DEPEND=">=net-libs/openh323-1.15.2"
-
-src_unpack() {
-	tar -xzf ${DISTDIR}/${A} -C ${WORKDIR} || die "Unpacking failed"
-
-	# change locations of various files
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-
-	CFLAGS="${CFLAGS}" \
-	PWLIBDIR=/usr/share/pwlib \
-	OPENH323DIR=/usr/share/openh323 \
-	emake opt || die
-}
-
-src_install() {
-	dosbin obj_*_*_r/openmcu
-	keepdir /var/log/openmcu
-	keepdir /var/run/openmcu
-
-	for x in data html; do
-		keepdir /usr/share/openmcu/$x
-	done
-
-	insinto /usr/share/openmcu/sounds
-	doins *.wav
-
-	insinto /etc/openmcu
-	doins server.pem
-	doins ${FILESDIR}/openmcu.ini
-
-	doman openmcu.1
-	dodoc ChangeLog ReadMe.txt mpl-1.0.htm
-
-	newinitd ${FILESDIR}/openmcu.rc6 openmcu
-	newconfd ${FILESDIR}/openmcu.confd openmcu
-}
-
-pkg_preinst() {
-	enewgroup openmcu
-	enewuser openmcu -1 -1 /dev/null openmcu
-}
-
-pkg_postinst() {
-	einfo "Setting permissions..."
-	chown -R openmcu:openmcu ${ROOT}etc/openmcu
-	chmod -R u=rwX,g=rX,o=	 ${ROOT}etc/openmcu
-
-	chown -R openmcu:openmcu ${ROOT}var/{log,run}/openmcu
-	chmod -R u=rwX,g=rX,o=	 ${ROOT}var/{log,run}/openmcu
-
-	echo
-	elog "This patched version of openmcu stores it's configuration"
-	elog "in \"/etc/openmcu/openmcu.ini\""
-}
diff --git a/net-voip/openmcu/openmcu-2.2.5.ebuild b/net-voip/openmcu/openmcu-2.2.5.ebuild
new file mode 100644
index 000000000000..86f0c91b9ca8
--- /dev/null
+++ b/net-voip/openmcu/openmcu-2.2.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/openmcu/openmcu-2.2.5.ebuild,v 1.1 2013/03/06 19:00:03 chithanh Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_PN=h323plus-app
+MY_PV=1_23_0
+DESCRIPTION="Simple Multi Conference Unit using H.323"
+HOMEPAGE="http://www.h323plus.org/"
+SRC_URI="mirror://sourceforge/h323plus/${MY_PN}-v${MY_PV}.tar.gz"
+
+LICENSE="MPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/ptlib:=
+	net-libs/h323plus:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/applications/${PN}
+
+src_prepare() {
+	# set path for various files
+	epatch "${FILESDIR}"/${PN}-2.2.1-path.patch
+}
+
+src_compile() {
+	emake OPENH323DIR=/usr/share/openh323
+}
+
+src_install() {
+	dosbin obj_*_*_*/${PN}
+
+	keepdir /usr/share/${PN}/data /usr/share/${PN}/html
+
+	# needed for daemon
+	keepdir /var/log/${PN} /var/run/${PN}
+
+	insinto /usr/share/${PN}/sounds
+	doins *.wav
+
+	insinto /etc/${PN}
+	doins server.pem
+	doins "${FILESDIR}"/${PN}.ini
+
+	doman ${PN}.1
+
+	dodoc ReadMe.txt
+
+	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_preinst() {
+	enewgroup openmcu
+	enewuser openmcu -1 -1 /dev/null openmcu
+}
+
+pkg_postinst() {
+	einfo "Setting permissions..."
+	chown -R openmcu:openmcu "${ROOT}"etc/openmcu
+	chmod -R u=rwX,g=rX,o=   "${ROOT}"etc/openmcu
+	chown -R openmcu:openmcu "${ROOT}"var/{log,run}/openmcu
+	chmod -R u=rwX,g=rX,o=   "${ROOT}"var/{log,run}/openmcu
+
+	echo
+	elog "This patched version of openmcu stores it's configuration"
+	elog "in \"/etc/openmcu/openmcu.ini\""
+}