cleanup

3 files changed, 66 insertions, 76 deletions

diff --git a/berlin-base/berlin-env/berlin-env-1.0.ebuild b/berlin-base/berlin-env/berlin-env-1.0.ebuild
index 445756e31cd9..bce6d5abffcb 100644
--- a/berlin-base/berlin-env/berlin-env-1.0.ebuild
+++ b/berlin-base/berlin-env/berlin-env-1.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # $Header
 
-A=""
 S=${WORKDIR}
 DESCRIPTION="Berlin-1.0 -- Install this package first, it sets up the environment and depends on everything else"
 HOMEPAGE="http://www.berlin-consortium.org/"
@@ -13,4 +12,3 @@ src_install() {
 	insinto /etc/env.d
 	doins ${FILESDIR}/90berlin
 }
-
diff --git a/berlin-base/berlin/berlin-0.2.2.ebuild b/berlin-base/berlin/berlin-0.2.2.ebuild
index 2c5444e8d7d8..618bff22a1bb 100644
--- a/berlin-base/berlin/berlin-0.2.2.ebuild
+++ b/berlin-base/berlin/berlin-0.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/berlin-base/berlin/berlin-0.2.2.ebuild,v 1.1 2001/05/02 22:48:26 achim Exp $
+# Author: Achim Gottinger <achim@gentoo.org> 
+# $Header: /var/cvsroot/gentoo-x86/berlin-base/berlin/berlin-0.2.2.ebuild,v 1.2 2002/04/28 04:03:38 seemant Exp $
 
 A0=Berlin-${PV}.tar.bz2
 A1=Prague-${PV}.tar.bz2
@@ -10,31 +10,27 @@ A3=Babylon-${PV}.tar.bz2
 A4=Berlin-Server-${PV}.tar.bz2
 A5=Berlin-Clients-Perl-${PV}.tar.bz2
 A6=Berlin-Clients-Python-${PV}.tar.bz2
-A="$A0 $A1 $A2 $A3 $A4 $A5 $A6"
 S=${WORKDIR}/Berlin-${PV}
 DESCRIPTION="A new alternative to X"
 SRC_URI="http://prdownloads.sourceforge.net/berlin/${A0}
-         http://prdownloads.sourceforge.net/berlin/${A1}
-         http://prdownloads.sourceforge.net/berlin/${A2}
-         http://prdownloads.sourceforge.net/berlin/${A3}
-         http://prdownloads.sourceforge.net/berlin/${A4}
-         http://prdownloads.sourceforge.net/berlin/${A5}
-         http://prdownloads.sourceforge.net/berlin/${A6}"
+		 http://prdownloads.sourceforge.net/berlin/${A1}
+		 http://prdownloads.sourceforge.net/berlin/${A2}
+		 http://prdownloads.sourceforge.net/berlin/${A3}
+		 http://prdownloads.sourceforge.net/berlin/${A4}
+		 http://prdownloads.sourceforge.net/berlin/${A5}
+		 http://prdownloads.sourceforge.net/berlin/${A6}"
 
 HOMEPAGE="http://www.berlin-consortium.org"
 
-DEPEND=""
-
 src_compile() {
 
-    try	./configure --prefix=/opt/berlin  --host=${CHOST} \
-	--with-directfb-prefix=/usr --with-omniorb-prefix=/opt/berlin
-    try make
+	./configure --prefix=/opt/berlin  --host=${CHOST} \
+	--with-directfb-prefix=/usr --with-omniorb-prefix=/opt/berlin || die
+	make || die
 }
 
 src_install () {
 
-    try make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 
 }
-
diff --git a/berlin-base/omniORB/omniORB-303.ebuild b/berlin-base/omniORB/omniORB-303.ebuild
index e28d2e5b4671..4150c9734752 100644
--- a/berlin-base/omniORB/omniORB-303.ebuild
+++ b/berlin-base/omniORB/omniORB-303.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/berlin-base/omniORB/omniORB-303.ebuild,v 1.7 2001/05/28 05:24:13 achim Exp $
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/berlin-base/omniORB/omniORB-303.ebuild,v 1.8 2002/04/28 04:03:38 seemant Exp $
 
-A="${PN}_${PV}.tar.gz omniORBpy_1_3.tar.gz"
 S=${WORKDIR}/omni
 DESCRIPTION="a robust, high-performance CORBA 2 ORB"
 SRC_URI="ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/${PN}_${PV}.tar.gz
-	 ftp://ftp.uk.research.att.com/pub/omniORB/omniORBpy/${PN}py_1_3.tar.gz"
+	ftp://ftp.uk.research.att.com/pub/omniORB/omniORBpy/${PN}py_1_3.tar.gz"
 HOMEPAGE="http://www.uk.research.att.com/omniORB/"
 
 DEPEND="virtual/glibc dev-lang/python"
@@ -16,72 +15,69 @@ PLT="i586_linux_2.0_glibc2.1"
 
 src_unpack() {
 
-  unpack ${PN}_${PV}.tar.gz
-  cd ${S}/src/lib
-  unpack ${PN}py_1_3.tar.gz
+	unpack ${PN}_${PV}.tar.gz
+	cd ${S}/src/lib
+	unpack ${PN}py_1_3.tar.gz
 
-  cd ${S}/config
-  cp config.mk config.mk.orig
-  sed -e "s:#platform = ${PLT}:platform = ${PLT}:" \
-  config.mk.orig > config.mk
+	cd ${S}/config
+	cp config.mk config.mk.orig
+	sed -e "s:#platform = ${PLT}:platform = ${PLT}:" \
+	config.mk.orig > config.mk
 
-  cd ${S}/mk
-  cp unix.mk unix.mk.orig
-  sed -e "s:^MKDIRHIER.*:MKDIRHIER = mkdir -p:" unix.mk.orig > unix.mk
+	cd ${S}/mk
+	cp unix.mk unix.mk.orig
+	sed -e "s:^MKDIRHIER.*:MKDIRHIER = mkdir -p:" unix.mk.orig > unix.mk
 
-  cd platforms
-  cp ${PLT}.mk ${PLT}.orig
-  sed -e "s:#PYTHON = /usr.*:PYTHON=/usr/bin/python:" \
-      ${PLT}.orig > ${PLT}.mk
+	cd platforms
+	cp ${PLT}.mk ${PLT}.orig
+	sed -e "s:#PYTHON = /usr.*:PYTHON=/usr/bin/python:" \
+		${PLT}.orig > ${PLT}.mk
 
 }
 
 
 src_compile() {
 
-    cd src
-    try make export
-    cd src/lib/omniORBpy
-    try make export
+	cd src
+	make export
+	cd src/lib/omniORBpy
+	make export || die
 }
 
 src_install () {
 
-    T=/opt/berlin
-    into ${T}
-    cd ${S}
-    dobin bin/${PLT}/* bin/scripts/*
-    insinto ${T}/lib/idl
-    doins idl/*.idl
-    insinto ${T}/lib/idl/COS
-    doins idl/COS/*.idl
-    cp -af include ${D}/${T}
-    dolib lib/${PLT}/*.{a,so*}
-    exeinto ${T}/lib
-    doexe lib/${PLT}/omnicpp
-    dodir ${T}/lib/python
-    cp -af lib/python/* ${D}/${T}/lib/python/
-    doman man/man[15]/*.[15]
-
-    exeinto /etc/rc.d/init.d
-    doexe ${FILESDIR}/omniORB
-
-    dodoc CHANGES* COPYING* CREDITS PORTING README* ReleaseNote_omniORB_303 THIS_IS_omniORB_3_0_3
-    cd doc
-    docinto print
-    dodoc *.ps
-    dodoc *.tex
-    dodoc *.pdf
-
-    docinto html
-    dodoc *.html
-    docinto html/omniORB
-    dodoc omniORB/*.{gif,html}
+	T=/opt/berlin
+	into ${T}
+	cd ${S}
+	dobin bin/${PLT}/* bin/scripts/*
+	insinto ${T}/lib/idl
+	doins idl/*.idl
+	insinto ${T}/lib/idl/COS
+	doins idl/COS/*.idl
+	cp -af include ${D}/${T}
+	dolib lib/${PLT}/*.{a,so*}
+	exeinto ${T}/lib
+	doexe lib/${PLT}/omnicpp
+	dodir ${T}/lib/python
+	cp -af lib/python/* ${D}/${T}/lib/python/
+	doman man/man[15]/*.[15]
+
+	exeinto /etc/rc.d/init.d
+	doexe ${FILESDIR}/omniORB
+
+	dodoc CHANGES* COPYING* CREDITS PORTING README* ReleaseNote_omniORB_303 THIS_IS_omniORB_3_0_3
+	cd doc
+	docinto print
+	dodoc *.ps
+	dodoc *.tex
+	dodoc *.pdf
+
+	dohtml *.html omniORB/*.{gif,html}
 
 }
 pkg_postinst() {
-  if [ ! -f "${ROOT}etc/omniORB.cfg" ] ; then
-    echo "ORBInitialHost `uname -n`" > ${ROOT}etc/omniORB.cfg
-    echo "ORBInitialPort 8200" >> ${ROOT}etc/omniORB.cfg
-  fi
+	if [ ! -f "${ROOT}etc/omniORB.cfg" ] ; then
+		echo "ORBInitialHost `uname -n`" > ${ROOT}etc/omniORB.cfg
+		echo "ORBInitialPort 8200" >> ${ROOT}etc/omniORB.cfg
+	fi
 }