cleanup part #1

6 files changed, 5 insertions, 248 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 2394c9229c01..016cefd86219 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.80 2005/02/27 19:52:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.81 2005/04/10 22:00:53 stkn Exp $
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> -files/pwlib-1.3.11-r1.diff,
+  -pwlib-1.3.11-r1.ebuild, -pwlib-1.4.11.ebuild:
+  cleanup part #1
 
   27 Feb 2005; Simon Stelling <blubb@gentoo.org> pwlib-1.8.3-r1.ebuild:
   stable on amd64; fixes bug #72706
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1 b/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1
deleted file mode 100644
index e08abfa40110..000000000000
--- a/dev-libs/pwlib/files/digest-pwlib-1.3.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da68d42d18a1b4aac93aaa2a9520de00 pwlib_1.3.11.tar.gz 892381
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.4.11 b/dev-libs/pwlib/files/digest-pwlib-1.4.11
deleted file mode 100644
index 1233ca7de038..000000000000
--- a/dev-libs/pwlib/files/digest-pwlib-1.4.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4abf0cd2fcad799e45d3d733efdca780 pwlib_1.4.11.tar.gz 964386
diff --git a/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff b/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff
deleted file mode 100644
index aa3a9ef6de43..000000000000
--- a/dev-libs/pwlib/files/pwlib-1.3.11-r1.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urN pwlib/make/unix.mak pwlib-modified/make/unix.mak
---- pwlib/make/unix.mak	2002-10-02 23:12:45.000000000 -0500
-+++ pwlib-modified/make/unix.mak	2002-11-05 00:03:52.000000000 -0600
-@@ -652,8 +652,6 @@
- ifeq ($(CPUTYPE),crusoe)
- STDCCFLAGS	+= -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 
- STDCCFLAGS      += -malign-jumps=0 -malign-loops=0
--else
--STDCCFLAGS	+= -mcpu=$(CPUTYPE)
- endif
- endif
- endif
-@@ -1250,7 +1248,7 @@
- 
- else
- 
--OPTCCFLAGS	+= -O3 -DNDEBUG
-+OPTCCFLAGS	+= -DNDEBUG
- #OPTCCFLAGS	+= -DP_USE_INLINES=1
- #OPTCCFLAGS	+= -fconserve-space
- ifneq ($(OSTYPE),Carbon)
-@@ -1262,26 +1260,9 @@
- 
- endif # DEBUG
- 
--
--# define OpenSSL variables if installed
--ifndef OPENSSLDIR
--
--ifneq (,$(wildcard $(SYSINCDIR)/openssl))
--OPENSSLDIR := $(SYSINCDIR)
--export OPENSSLDIR
--endif
--
--ifneq (,$(wildcard /usr/local/ssl))
--OPENSSLDIR := /usr/local/ssl
--export OPENSSLDIR
--endif
--
--endif
--
- ifdef  OPENSSLDIR
- ifneq (,$(wildcard $(OPENSSLDIR)))
--STDCCFLAGS	+= -DP_SSL -I$(OPENSSLDIR)/include -I$(OPENSSLDIR)/crypto
--LDFLAGS		+= -L$(OPENSSLDIR)/lib -L$(OPENSSLDIR)
-+STDCCFLAGS	+= -DP_SSL
- ENDLDLIBS	+= -lssl -lcrypto
- HAS_OPENSSL	= 1
- endif
-@@ -1295,18 +1276,9 @@
- STDCCFLAGS	+= -DP_EXPAT
- endif
- 
--ifneq (,$(wildcard /usr/local/include/expat.h))
--HAS_EXPAT	= 1
--ENDLDLIBS	+= -lexpat
--STDCCFLAGS	+= -DP_EXPAT -I /usr/local/include
--LDFLAGS		+= -L /usr/local/lib
--endif
--
--
- # define ESDDIR variables if installed
- ifdef  ESDDIR
--STDCCFLAGS	+= -I$(ESDDIR)/include
--ENDLDLIBS	+= $(ESDDIR)/lib/libesd.a  # to avoid name conflicts
-+ENDLDLIBS	+= -lesd  # to avoid name conflicts
- HAS_ESD		= 1
- endif
- 
-@@ -1328,8 +1300,7 @@
- #STDCCFLAGS     += -fno-implement-inlines
- 
- # add OS directory to include path
--STDCCFLAGS	+= -I$(UNIX_INC_DIR)
--
-+STDCCFLAGS     += -I$(UNIX_INC_DIR)
- 
- # add library directory to library path and include the library
- LDFLAGS		+= -L$(PW_LIBDIR)
-diff -urN pwlib/src/ptclib/pxmlrpcs.cxx pwlib-modified/src/ptclib/pxmlrpcs.cxx
---- pwlib/src/ptclib/pxmlrpcs.cxx	2002-10-02 03:54:01.000000000 -0500
-+++ pwlib-modified/src/ptclib/pxmlrpcs.cxx	2002-11-05 00:12:30.000000000 -0600
-@@ -195,4 +195,5 @@
-   return reply;
- }
- 
--#endif
-\ No newline at end of file
-+#endif
-+
diff --git a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
deleted file mode 100644
index 5bf5fd728129..000000000000
--- a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild,v 1.13 2005/01/08 20:12:42 stkn Exp $
-
-inherit eutils
-
-DESCRIPTION="Libs needed for GnomeMeeting"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc -sparc"
-IUSE="ssl"
-
-DEPEND=">=sys-devel/bison-1.28
-	>=sys-devel/flex-2.5.4a
-	dev-libs/expat
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}.diff
-}
-
-src_compile() {
-	export PWLIBDIR=${S}
-	export PWLIB_BUILD="yes"
-
-	if use ssl ; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	make optshared || die
-
-	cd tools/asnparser
-	make optshared || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/include/ptlib/unix/ptlib \
-		/usr/share/pwlib /usr/include/ptclib
-
-	cd ${S}
-	cp -a lib/*so* ${D}/usr/lib
-	cp -a include/ptlib.h ${D}/usr/include
-	cp -a include/ptlib/*.h ${D}/usr/include/ptlib/
-	cp -a include/ptlib/*.inl ${D}/usr/include/ptlib/
-	cp -a include/ptlib/unix/ptlib/*.h ${D}/usr/include/ptlib/unix/ptlib
-	cp -a include/ptlib/unix/ptlib/*.inl ${D}/usr/include/ptlib/unix/ptlib
-	cp -a include/ptclib/*.h ${D}/usr/include/ptclib/
-
-	cp -a * ${D}/usr/share/pwlib/
-	rm -rf ${D}/usr/share/pwlib/make/CVS
-	rm -rf ${D}/usr/share/pwlib/tools/CVS
-	rm -rf ${D}/usr/share/pwlib/tools/asnparser/CVS
-	rm -rf ${D}/usr/share/pwlib/src
-	rm -rf ${D}/usr/share/pwlib/include/CVS
-	rm -rf ${D}/usr/share/pwlib/include/ptlib/unix/CVS
-	rm -rf ${D}/usr/share/pwlib/include/ptlib/CVS
-
-	cd ${D}/usr/lib
-	if [ ${ARCH} = "ppc" ] ; then
-		ln -sf libpt_linux_ppc_r.so.${PV} libpt.so
-	else
-		ln -sf libpt_linux_x86_r.so.${PV} libpt.so
-	fi
-}
diff --git a/dev-libs/pwlib/pwlib-1.4.11.ebuild b/dev-libs/pwlib/pwlib-1.4.11.ebuild
deleted file mode 100644
index 2293225db442..000000000000
--- a/dev-libs/pwlib/pwlib-1.4.11.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.4.11.ebuild,v 1.11 2005/01/08 20:12:42 stkn Exp $
-
-DESCRIPTION="Libs needed for GnomeMeeting"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc -sparc"
-IUSE="ssl"
-
-DEPEND=">=sys-devel/bison-1.28
-	>=sys-devel/flex-2.5.4a
-	dev-libs/expat
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/make
-
-	# filter out -O3 and -mcpu embedded compiler flags
-	sed -i \
-		-e "s:-mcpu=\$(CPUTYPE)::" \
-		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
-		unix.mak
-
-	# patch unix.mak so it doesn't require annoying upgrades
-	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
-}
-
-src_compile() {
-	export PWLIBDIR=${S}
-	export PWLIB_BUILD="yes"
-
-	if use ssl; then
-		export OPENSSLFLAG=1
-		export OPENSSLDIR=/usr
-		export OPENSSLLIBS="-lssl -lcrypt"
-	fi
-
-	make optshared || die
-
-	cd tools/asnparser
-	make optshared || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/include/ptlib/unix/ptlib \
-		/usr/share/pwlib /usr/include/ptclib
-
-	cd ${S}
-	cp -a lib/*so* ${D}/usr/lib
-	cp -a include/ptlib.h ${D}/usr/include
-	cp -a include/ptlib/*.h ${D}/usr/include/ptlib/
-	cp -a include/ptlib/*.inl ${D}/usr/include/ptlib/
-	cp -a include/ptlib/unix/ptlib/*.h ${D}/usr/include/ptlib/unix/ptlib
-	cp -a include/ptlib/unix/ptlib/*.inl ${D}/usr/include/ptlib/unix/ptlib
-	cp -a include/ptclib/*.h ${D}/usr/include/ptclib/
-
-	cp -a * ${D}/usr/share/pwlib/
-	rm -rf ${D}/usr/share/pwlib/make/CVS
-	rm -rf ${D}/usr/share/pwlib/tools/CVS
-	rm -rf ${D}/usr/share/pwlib/tools/asnparser/CVS
-	rm -rf ${D}/usr/share/pwlib/src
-	rm -rf ${D}/usr/share/pwlib/include/CVS
-	rm -rf ${D}/usr/share/pwlib/include/ptlib/unix/CVS
-	rm -rf ${D}/usr/share/pwlib/include/ptlib/CVS
-
-	cd ${D}/usr/lib
-	if [ ${ARCH} = "ppc" ] ; then
-		ln -sf libpt_linux_ppc_r.so.${PV} libpt.so
-	else
-		ln -sf libpt_linux_x86_r.so.${PV} libpt.so
-	fi
-}