cleanup

9 files changed, 57 insertions, 228 deletions

diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 48ecede6d5fd..bde1b2fbdcae 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,12 +1,6 @@
+MD5 00792a32c848412e425a67c20a72b594 openh323-1.9.10-r1.ebuild 1120
+MD5 dca9f4bf7ae0665e082f37c865a969e3 openh323-1.11.7.ebuild 1790
 MD5 0459da0341687abb33aaa4f2c57b546a ChangeLog 2770
-MD5 fd446be456cfda0ff73eda95680623ca openh323-1.9.10-r1.ebuild 1456
-MD5 29666899e624d9e17ddcaed1b01ba8a7 openh323-1.9.10.ebuild 1193
-MD5 3a4979620df3ae6328ecc9d00c5b662a openh323-1.9.3.ebuild 1154
-MD5 90b2875c0a3e733d3204a512b94b67b0 openh323-1.11.7.ebuild 2206
-MD5 518bcc022e33b17140fd3c798e06e723 openh323-1.11.2.ebuild 1424
-MD5 919035124f99513501f60e0206d5db16 files/digest-openh323-1.11.2 68
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10 68
-MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
-MD5 9190e8e7ed42ae952b2fd8d8a12e341b files/digest-openh323-1.9.3 67
-MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
 MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
+MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
+MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
diff --git a/net-libs/openh323/files/digest-openh323-1.11.2 b/net-libs/openh323/files/digest-openh323-1.11.2
deleted file mode 100644
index 05c154a65933..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.11.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89ab27a6a8f4a73ffd9e19751bc78786 openh323_1.11.2.tar.gz 2000939
diff --git a/net-libs/openh323/files/digest-openh323-1.9.10 b/net-libs/openh323/files/digest-openh323-1.9.10
deleted file mode 100644
index f078580ba0b7..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4efbe1356cb26b8442add3cc4cfba91d openh323_1.9.10.tar.gz 1778990
diff --git a/net-libs/openh323/files/digest-openh323-1.9.3 b/net-libs/openh323/files/digest-openh323-1.9.3
deleted file mode 100644
index 82f44f8cef73..000000000000
--- a/net-libs/openh323/files/digest-openh323-1.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e321ba846488704ef2e13d9c7b24455 openh323_1.9.3.tar.gz 1725653
diff --git a/net-libs/openh323/openh323-1.11.2.ebuild b/net-libs/openh323/openh323-1.11.2.ebuild
deleted file mode 100644
index ca2b41b3d0ea..000000000000
--- a/net-libs/openh323/openh323-1.11.2.ebuild
+++ /dev/null
@@ -1,54 +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.11.2.ebuild,v 1.3 2003/02/13 14:21:04 vapier Exp $
-
-IUSE="ssl"
-S="${WORKDIR}/${PN}"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://www.openh323.org"
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-DEPEND="=dev-libs/pwlib-1.4.7*
-	ssl? ( dev-libs/openssl )"
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86 ~ppc -sparc "
-
-src_compile() {
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=${S}
-	if [ "`use ssl`" ]; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-	make optshared || die
-}
-
-src_install() {
-
-   dodir /usr/lib /usr/share/openh323
-
-   cd ${S}/lib
-   mv lib* ${D}/usr/lib
-
-   cd ${S}
-   cp -a * ${D}/usr/share/openh323
-   rm -rf ${D}/usr/share/openh323/make/CVS
-   rm -rf ${D}/usr/share/openh323/tools/CVS
-   rm -rf ${D}/usr/share/openh323/tools/asnparser/CVS
-   rm -rf ${D}/usr/share/openh323/src
-   rm -rf ${D}/usr/share/openh323/include/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/unix/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/CVS
-
-   cd ${D}/usr/lib
-   if [ ${ARCH} = "ppc" ] ; then
-	ln -sf libh323_linux_ppc_r.so.${PV} libopenh323.so
-   else
-	ln -sf libh323_linux_x86_r.so.${PV} libopenh323.so
-   fi
-
-
-}
-
-
diff --git a/net-libs/openh323/openh323-1.11.7.ebuild b/net-libs/openh323/openh323-1.11.7.ebuild
index 511a430da844..b6775fbc97eb 100644
--- a/net-libs/openh323/openh323-1.11.7.ebuild
+++ b/net-libs/openh323/openh323-1.11.7.ebuild
@@ -1,35 +1,37 @@
 # 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.11.7.ebuild,v 1.3 2003/05/16 23:31:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.11.7.ebuild,v 1.4 2003/06/18 13:56:02 seemant Exp $
 
 IUSE="ssl"
-S="${WORKDIR}/${PN}"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://www.openh323.org"
+
+S=${WORKDIR}/${PN}
 DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-DEPEND=">=dev-libs/pwlib-1.4.11
-	ssl? ( dev-libs/openssl )"
+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 "
 
+DEPEND=">=sys-apps/sed-4
+	>=dev-libs/pwlib-1.4.11
+	ssl? ( dev-libs/openssl )"
+
 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
+	# 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
-		cp unix.mak unix.mak.orig
-		sed \
+		# 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.orig > unix.mak
-		[ -f unix.mak.orig ] && rm -f unix.mak.orig
-    fi
-    
+		unix.mak
+	fi
 }
 
 src_compile() {
@@ -45,31 +47,24 @@ src_compile() {
 
 src_install() {
 
-   dodir /usr/lib /usr/share/openh323
-
-   cd ${S}/lib
-   mv lib* ${D}/usr/lib
-
-   cd ${S}
-   cp -a * ${D}/usr/share/openh323
-   rm -rf ${D}/usr/share/openh323/make/CVS
-   rm -rf ${D}/usr/share/openh323/tools/CVS
-   rm -rf ${D}/usr/share/openh323/tools/asnparser/CVS
-   rm -rf ${D}/usr/share/openh323/src
-   rm -rf ${D}/usr/share/openh323/include/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/unix/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/CVS
-
-   # mod to keep gnugk happy
-   insinto /usr/share/openh323/src
-   newins ${FILESDIR}/openh323-1.11.2-emptyMakefile Makefile
-
-   cd ${D}/usr/lib
-   if [ ${ARCH} = "ppc" ] ; then
-	ln -sf libh323_linux_ppc_r.so.${PV} libopenh323.so
-   else
-	ln -sf libh323_linux_x86_r.so.${PV} libopenh323.so
-   fi
+	dodir /usr/lib /usr/share/openh323
+
+	cd ${S}/lib
+	mv lib* ${D}/usr/lib
+
+	cd ${S}
+	find ./ -name 'CVS' -type d | xargs rm -rf
+	cp -a * ${D}/usr/share/openh323
+
+	# mod to keep gnugk happy
+	insinto /usr/share/openh323/src
+	newins ${FILESDIR}/openh323-1.11.2-emptyMakefile Makefile
+
+	if [ ${ARCH} = "ppc" ] ; then
+		dosym libh323_linux_ppc_r.so.${PV} /usr/lib/libopenh323.so
+	else
+		dosym libh323_linux_x86_r.so.${PV} /usr/lib/libopenh323.so
+	fi
 
 
 }
diff --git a/net-libs/openh323/openh323-1.9.10-r1.ebuild b/net-libs/openh323/openh323-1.9.10-r1.ebuild
index e67de91e1103..72e9a20cb2d6 100644
--- a/net-libs/openh323/openh323-1.9.10-r1.ebuild
+++ b/net-libs/openh323/openh323-1.9.10-r1.ebuild
@@ -1,14 +1,14 @@
 # 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.9.10-r1.ebuild,v 1.7 2003/02/13 14:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.9.10-r1.ebuild,v 1.8 2003/06/18 13:56:02 seemant Exp $
 
 IUSE="ssl"
 
 S="${WORKDIR}/${PN}"
 
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://www.openh323.org"
 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"
 
 DEPEND="media-libs/speex
 	>=dev-libs/pwlib-1.3.11-r1
@@ -16,10 +16,9 @@ DEPEND="media-libs/speex
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="x86 ppc -sparc "
+KEYWORDS="x86 ppc sparc"
 
 src_compile() {
-
 	export PWLIBDIR=/usr/share/pwlib
 	export OPENH323DIR=${S}
 
@@ -30,34 +29,21 @@ src_compile() {
 	fi
 
 	make optshared || die
-
 }
 
 src_install() {
+	dodir /usr/share/openh323
 
-   dodir /usr/lib /usr/share/openh323
-
-   cd ${S}/lib
-   mv lib* ${D}/usr/lib
-
-   cd ${S}
-   cp -a * ${D}/usr/share/openh323
-   rm -rf ${D}/usr/share/openh323/make/CVS
-   rm -rf ${D}/usr/share/openh323/tools/CVS
-   rm -rf ${D}/usr/share/openh323/tools/asnparser/CVS
-   rm -rf ${D}/usr/share/openh323/src
-   rm -rf ${D}/usr/share/openh323/include/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/unix/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/CVS
-
-   cd ${D}/usr/lib
-   if [ ${ARCH} = "ppc" ] ; then
-	ln -sf libh323_linux_ppc_r.so.${PV} libopenh323.so
-   else
-	ln -sf libh323_linux_x86_r.so.${PV} libopenh323.so
-   fi
+	into /usr
+	dolib ${S}/lib/lib*
 
+	cd ${S}
+	find ./ -name 'CVS' | xargs rm -f
+	cp -a * ${D}/usr/share/openh323
 
+	if [ ${ARCH} = "ppc" ] ; then
+		dosym libh323_linux_ppc_r.so.${PV} /usr/lib/libopenh323.so
+	else
+		dosym libh323_linux_x86_r.so.${PV} /usr/lib/libopenh323.so
+	fi
 }
-
-
diff --git a/net-libs/openh323/openh323-1.9.10.ebuild b/net-libs/openh323/openh323-1.9.10.ebuild
deleted file mode 100644
index dde575e11493..000000000000
--- a/net-libs/openh323/openh323-1.9.10.ebuild
+++ /dev/null
@@ -1,49 +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.9.10.ebuild,v 1.5 2003/02/13 14:21:16 vapier Exp $
-
-S="${WORKDIR}/${PN}"
-
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://www.openh323.org"
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-
-DEPEND="media-libs/speex
-	>=dev-libs/pwlib-1.3.11"
-
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86 ~sparc "
-
-src_compile() {
-
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=${S}
-
-	make optshared || die
-
-}
-
-src_install() {
-
-   dodir /usr/lib /usr/share/openh323
-
-   cd ${S}/lib
-   mv lib* ${D}/usr/lib
-
-   cd ${S}
-   cp -a * ${D}/usr/share/openh323
-   rm -rf ${D}/usr/share/openh323/make/CVS
-   rm -rf ${D}/usr/share/openh323/tools/CVS
-   rm -rf ${D}/usr/share/openh323/tools/asnparser/CVS
-   rm -rf ${D}/usr/share/openh323/src
-   rm -rf ${D}/usr/share/openh323/include/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/unix/CVS
-   rm -rf ${D}/usr/share/openh323/include/ptlib/CVS
-
-   cd ${D}/usr/lib
-   ln -sf libh323_linux_x86_r.so.${PV} libopenh323.so
-
-}
-
-
diff --git a/net-libs/openh323/openh323-1.9.3.ebuild b/net-libs/openh323/openh323-1.9.3.ebuild
deleted file mode 100644
index 1aeb3a208ccc..000000000000
--- a/net-libs/openh323/openh323-1.9.3.ebuild
+++ /dev/null
@@ -1,40 +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.9.3.ebuild,v 1.5 2003/02/13 14:21:22 vapier Exp $
-
-SRC_URI="http://www.openh323.org/bin/openh323_${PV}.tar.gz"
-HOMEPAGE="http://www.openh323.org"
-DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
-
-SLOT="0"
-LICENSE="MPL-1.1"
-KEYWORDS="x86 sparc "
-
-DEPEND=">=dev-libs/pwlib-1.3.3"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=${S}
-	echo $PWLIBDIR
-	make optshared || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/share/openh323
-	cd ${S}/lib
-	mv lib* ${D}/usr/lib
-	cd ${S}
-	cp -a * ${D}/usr/share/openh323
-	rm -rf ${D}/usr/share/openh323/make/CVS
-	rm -rf ${D}/usr/share/openh323/tools/CVS
-	rm -rf ${D}/usr/share/openh323/tools/asnparser/CVS
-	rm -rf ${D}/usr/share/openh323/src
-	rm -rf ${D}/usr/share/openh323/include/CVS
-	rm -rf ${D}/usr/share/openh323/include/ptlib/unix/CVS
-	rm -rf ${D}/usr/share/openh323/include/ptlib/CVS
-
-	cd ${D}/usr/lib
-	ln -sf libh323_linux_x86_r.so.${PV} libopenh323.so
-}