stable bump

5 files changed, 8 insertions, 95 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 52e1e2bf42b8..e35c6acdd580 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.0-r1.ebuild,
+  openh323-1.12.0.ebuild:
+  stable bump for 1.12.0 plus cleanups
+
 *openh323-1.12.2 (03 Sep 2003)
 
   03 Sep 2003; Alastair Tse <liquidx@gentoo.org> openh323-1.12.2.ebuild:
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 040794c0cf05..c03c8cc5a74f 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,12 +1,10 @@
-MD5 71c6c1220fcfa7c3c0eb7d0f215a7a1c ChangeLog 3604
+MD5 66d88352df790a69108991f5c57a4308 ChangeLog 3746
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 da0bf4fee9d0011905bcb66384df7b53 openh323-1.11.7.ebuild 1844
-MD5 aa08dbdda7012bb3ee6c0e9ffef46f5b openh323-1.12.0-r1.ebuild 2714
-MD5 c65a41c26c255742f72421fe4a6a8cb5 openh323-1.12.0.ebuild 2221
+MD5 2fcbe75f0f5a503c6d9a4385e8107886 openh323-1.12.0-r1.ebuild 2713
 MD5 d8fb9ddd5b93f66ce4a3669ac37f9fd1 openh323-1.12.2.ebuild 2754
 MD5 00792a32c848412e425a67c20a72b594 openh323-1.9.10-r1.ebuild 1120
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
-MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0 68
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
 MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2 68
 MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
diff --git a/net-libs/openh323/files/digest-openh323-1.12.0 b/net-libs/openh323/files/digest-openh323-1.12.0
deleted file mode 100644
index e17382151a0f..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7932f0a17d6afafc7332036a4b5d392 openh323_1.12.0.tar.gz 2325128
diff --git a/net-libs/openh323/openh323-1.12.0-r1.ebuild b/net-libs/openh323/openh323-1.12.0-r1.ebuild
index c1104f0689da..4effeaddf348 100644
--- a/net-libs/openh323/openh323-1.12.0-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.2 2003/07/09 15:26:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.3 2003/09/03 12:51:39 liquidx Exp $
 
 IUSE="ssl"
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc -sparc "
+KEYWORDS="x86 ~ppc -sparc "
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.5.0
diff --git a/net-libs/openh323/openh323-1.12.0.ebuild b/net-libs/openh323/openh323-1.12.0.ebuild
deleted file mode 100644
index 90798e0ba58f..000000000000
--- a/net-libs/openh323/openh323-1.12.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0.ebuild,v 1.4 2003/07/09 00:18:23 liquidx Exp $
-
-IUSE="ssl"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-HOMEPAGE="http://www.openh323.org"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc -sparc "
-
-# FIXME: dep on ffmpeg but ./configure does not detect it properly
-DEPEND=">=sys-apps/sed-4
-	>=dev-libs/pwlib-1.5.0
-	ssl? ( dev-libs/openssl )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	# to prevent merge problems with broken makefiles from old
-	# pwlib versions, we double-check here.
-	
-	if [ "` fgrep '\$(OPENSSLDIR)/include' /usr/share/pwlib/make/unix.mak`" ]
-	then
-		# patch unix.mak so it doesn't require annoying 
-		# unmerge/merge cycle to upgrade
-		einfo "Fixing broken pwlib makefile."
-		cd /usr/share/pwlib/make
-		sed -i \
-		-e "s:-DP_SSL -I\$(OPENSSLDIR)/include -I\$(OPENSSLDIR)/crypto:-DP_SSL:" \
-		-e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/lib -L\$(OPENSSLDIR):LDFLAGS +=:" \
-		unix.mak
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/usr/local/include/ffmpeg:/usr/include/ffmpeg:" configure
-	epatch ${FILESDIR}/${P}-ptracing.patch
-}
-
-src_compile() {
-	local makeopts
-
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=${S}
-
-	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser"
-
-	
-	if [ "`use ssl`" ]; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-	
-	econf || die
-	emake ${makeopts} opt || die "make failed"
-}
-
-src_install() {
-
-	dodir /usr/bin /usr/lib/ /usr/share
-	make PREFIX=${D}/usr install || die "install failed"
-	dobin ${S}/simple/obj_linux_x86_r/simph323
-
-	find ${D} -name 'CVS' -type d | xargs rm -rf
-
-	# mod to keep gnugk happy
-	insinto /usr/share/openh323/src
-	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
-
-	rm ${D}/usr/lib/libopenh323.so
-	if [ ${ARCH} = "ppc" ] ; then
-		dosym /usr/lib/libh323_linux_ppc_r.so.${PV} /usr/lib/libopenh323.so
-	else
-		dosym /usr/lib/libh323_linux_x86_r.so.${PV} /usr/lib/libopenh323.so
-	fi
-
-
-}
-
-