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

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

5 files changed, 93 insertions, 140 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/Manifest b/net-voip/openmcu/Manifest
index 6f1e546e1eff..346a0e4b068b 100644
--- a/net-voip/openmcu/Manifest
+++ b/net-voip/openmcu/Manifest
@@ -1,12 +1,11 @@
-AUX openmcu-2.2.0-gentoo.diff 2365 RMD160 4c66012ac13d65650822a8af21819632e4228ff3 SHA1 bd0498f17df21c2eaa51d8da14f7bd49da3d8ceb SHA256 a7ad4c946eb7db7943cc72b8715866f2d0546c95e458d3ab07935307da3fc3bd
-AUX openmcu-2.2.1-deque.patch 250 RMD160 a1ccb08484bc0e9bb268f78ec8867fc2cdc0d66c SHA1 0cffdbc821de0fa8d9cf131bf1ed906216c1993a SHA256 4e4f6ead67d378d690e70d40ecb3c37743c9251711a028c22fe1282778767fff
-AUX openmcu-2.2.1-path.patch 2321 RMD160 da3870780b8a9ed5bc25d86a3701b97a24cda981 SHA1 5d06996c1682af5cce15c39ccfce743cb1a37f6d SHA256 693d1de2c3ec86742230a044925263189b08d7d32e6ac10ce73826b4cb51eb66
-AUX openmcu.confd 270 RMD160 e8ff0c18fa9a4431f9d77dc0ccf9bcc377cf551f SHA1 d9a04ef91c8995f5bb531632e46ca96d72ae2b30 SHA256 022f80e713fb7adaa8a300a1c14926ccf2c3c65415d6b79e5eaa70c7eb83d6e4
-AUX openmcu.ini 398 RMD160 5f90a5c19905216413772fd6249ea70a7d6ca5f1 SHA1 d46d2375c0a3b0b28da664c7ef7d91ac693b0b4a SHA256 5ee5bf6327fa286b847d7d8d5ccd6bfb3effc1a20f82ebfda3a6be35d521a5fe
-AUX openmcu.rc6 647 RMD160 82f3a20beee9e7c7208cc215fe609db5caba6765 SHA1 188c8df0dac439a83bf6e5a27c613b89b09d3c29 SHA256 7db477e8e2d6e81dfa056592e970b18245debd06dbf6f7c0a0f88e22f3866253
-DIST openmcu-v2_2_0-src-tar.gz 99878 RMD160 960ea34b950d0401412cc4b50f14cf54d2bae086 SHA1 b56176ed99e7d38548e173d8b4f98e6cea326588 SHA256 8295ae53b6fbd3eda1dfcc46831f7ef39ec00952713dada5380b3a4fb4f562d8
-DIST openmcu-v2_2_1-src.tar.gz 155199 RMD160 4659db77bf25736ea9f134675896e67010d63ea6 SHA1 8a43a327aa44077d898fb33f7380006c55ff1246 SHA256 09d7b3f897fa5b76024753f53828f5596c39757b372b55a55b8893d1ae63796a
-EBUILD openmcu-2.2.0.ebuild 1673 RMD160 79d79537c6442b40408017d9f9554ccf5869cdff SHA1 812088a1eebe3d3f84b863a50ddf08cef7d2bcf7 SHA256 cd44c7f9e5e58698d89f69aa179e016a58e9c0780d95338cba62327bb8a368c3
-EBUILD openmcu-2.2.1.ebuild 1883 RMD160 2a631284c54eae0cc47e0134a99ae706936868f1 SHA1 da713a6420854280ee2ed8c106368702e212b413 SHA256 ccf3f3d463a6a0c1e50bb00f509dce9e0ac1aaeea05314626c0800790df0bebc
-MISC ChangeLog 1878 RMD160 cd82a1cc01d1de2799f3cb2d6d5c02badca0b0bd SHA1 190db248b2870ddc4a9d5d06a7915f931cfc2506 SHA256 68d2739dcf2240a750ee970a5c3dc030c4590e9a967bd5a426ea2fdf6d432a69
-MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
+AUX openmcu-2.2.1-deque.patch 250 SHA256 4e4f6ead67d378d690e70d40ecb3c37743c9251711a028c22fe1282778767fff SHA512 67a5e6502630f133fd8e2b8f8ec9021fb2d305667919f1fcbc2a128ed9299e7de849adb25a96a9ccd8e800ce2179ea13bf9b156f0f3d361dde8a5adaa3cb7411 WHIRLPOOL 98a688896fb3ff08039e17e57eb8703cdd424324ab3fd4dcdb03b2c53bad354a52c0c4728b1141e4c4729ed86a5699db90919b3fd1fb3a5784e0d9ee0e97ee7c
+AUX openmcu-2.2.1-path.patch 2321 SHA256 693d1de2c3ec86742230a044925263189b08d7d32e6ac10ce73826b4cb51eb66 SHA512 9a18d10ff604459aae8b5256cf34908f046691e4ec4d9f3d4a92e5423a78d50473069a29f1a51e03f528fdff73f16c24832d9fa24c074641b06424fd996336df WHIRLPOOL 494d3ac0106212a0412c5bd6a7e4a9366809bc03d18518fc141262e08edfaddd6cae08759e31b16d0cbfb7f5669591ced68a9ed1e37bb64636cda2c5a426640f
+AUX openmcu.confd 270 SHA256 022f80e713fb7adaa8a300a1c14926ccf2c3c65415d6b79e5eaa70c7eb83d6e4 SHA512 e453b5e87441481e4211c03619a60dd5b2e623c3584cb7666b9bcc02218169f9b7f67feade09a694a027461c2833803c5969418819649d847b8a7fac5be90b35 WHIRLPOOL 82d56e19734eefef3cdba573ffb5bc66a7fef7d88cbdacdf8f9511bbc55a02fc5c1767a2c8d710250d4e2d9853cae033ac8339af491b97266c3831a05d436489
+AUX openmcu.ini 398 SHA256 5ee5bf6327fa286b847d7d8d5ccd6bfb3effc1a20f82ebfda3a6be35d521a5fe SHA512 2ce9468386b71f7fb37c633e9de083796a61262ace4b83b85490365b8d133af94f9bc53680c44996a9f0b7350e4ad0ccfb2ef387ede2ae3b55a0ef7ad6da9de4 WHIRLPOOL 12c192d651aa797e46b042ce5942c84ed6cf384dad2387364d6fbfac4c4e0028105192174d50de32f70924e117ce122c7a1d6f61305d69fb5b6fe5028e621694
+AUX openmcu.rc6 647 SHA256 7db477e8e2d6e81dfa056592e970b18245debd06dbf6f7c0a0f88e22f3866253 SHA512 06e0d19a8a2f9570af9a952748c369f65a37828deb97bace9fdbcf0b868385d029626f841ff15e4ac6ded16b702843462f7603ba7ff0caf02a6b05331ad5d3fa WHIRLPOOL cd6a42caa78c0a3d847b360aa5bb77973404415da62df9d2991a02ae45af7deca42ee53d0cf6d4d912b759c21c990ae2a6571ded722fa3928b04f21d292e8473
+DIST h323plus-app-v1_23_0.tar.gz 610103 SHA256 faff110e5d23d5578da9d9126581d3a6001338c0dfcb051925e83e1a513e91b2 SHA512 cdb9c587cc857c64440fc9f9d8e1a08e2c9ae00c2070a8d4678e65ca951124c1b4423c24cf795c3f810bd4694f05536b981ca20377755a2c19908de56498dbd0 WHIRLPOOL 462fcc4dcb19d0b4e48967b9d5f6c6676a7c7023472bd28cffe26307a59a5bc33cccd0d1d79acae9fcdd808e0e423f07ada5208c976752df422ae9e31e7a4255
+DIST openmcu-v2_2_1-src.tar.gz 155199 SHA256 09d7b3f897fa5b76024753f53828f5596c39757b372b55a55b8893d1ae63796a SHA512 00ec540c3c57e6a30c6cb76d4fe0b3e7392932b933f13942afa6bd0e4b784f61131719b447124dbe7c1d0c8c04ed2bbfcc00e5c604e5017308b9b82a61fb9c78 WHIRLPOOL ba84a99183f4b910cf581c7745a1b0ecf5b0b6f5a24200b19200c6fc46a0e03a93c68ab2ff3336f0c8e2cd6712e378e0de51f381de1eba954bd6ffa561c7c272
+EBUILD openmcu-2.2.1.ebuild 1883 SHA256 ccf3f3d463a6a0c1e50bb00f509dce9e0ac1aaeea05314626c0800790df0bebc SHA512 6d5665c5e51e8b2f25b0dda90eb0a4cad163b4295bdaee55dc2bf31fb45656163fcc33a4860a3519e56f905a058cf4f70e12b0e91bbb747708914975e959f363 WHIRLPOOL 5fc76b247c194e8b5cba378762a85723bfa03c41f412c24e997ffe559dc10608381b983070c94fdfadcab48a5569ddf847ee076e5f3df21c329fbaa782907878
+EBUILD openmcu-2.2.5.ebuild 1599 SHA256 f3b00b57275f742881b90b8f53def9287126f4faf0c3488a47a386c9460eb9cb SHA512 3ba1ce076693301877c07b268b243ff270d6f1b875bfaf5cac4f41500595611501289e3cb8b2a3118b03f49c917c243ec7ff5aa3774bc2fe5f56e0001d98a8f2 WHIRLPOOL f60631cb93d86bf6b76b6178f5e9693078a1cbe7307d5974b844a74365e2515673b8bfd1d772f366fb3fb7dbdebf0aed0592ecb9213ee33e67c7028807ca6bcc
+MISC ChangeLog 2136 SHA256 91d59e338792844596c4504b6b32d351e0c130d8849f9d1fc9f32fadbac18b18 SHA512 e20af875d50231ce0c030a8eb48320aab4f3ee20a38d9a0fc1a053271eb6c9d0997daac369ea0717b44e7a22cbae462136bb28a430924262e363653964a71040 WHIRLPOOL f6dc41fe8beba36bd9442aba353d7969610db18a5132dc0cf553a78629f40990008a76ea60838aeea810fdd9d4536ee25084d4c268d1619f34a7a22b063c9b5a
+MISC metadata.xml 159 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d SHA512 7f16a333a56ea471ab46585ffe72378ef15805784a1a2cc98625db77be6548d2265dcd4267deabd67db9f63c21cfb86a25e6531747401cf15fd33b316e44c665 WHIRLPOOL 750d293fa390b8bbb6fc654ffc049670fa879605a4abdc5f1a87b0ed6942a9d9c95df732573c0287d192155a283067f5657cbf6162dd757a8cd7351d77ed9f2c
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\""
+}