cleanup

7 files changed, 26 insertions, 170 deletions

diff --git a/x11-terms/multi-gnome-terminal/ChangeLog b/x11-terms/multi-gnome-terminal/ChangeLog
index aac1301b3495..616aaafc3730 100644
--- a/x11-terms/multi-gnome-terminal/ChangeLog
+++ b/x11-terms/multi-gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/multi-gnome-terminal
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.11 2002/07/29 16:11:33 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.12 2002/07/29 20:59:06 azarah Exp $
+
+  29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> multi-gnome-terminal-1.5.2.ebuild :
+  
+  We dialup guys like bz2's more :)  Some other fixes I had laying around.
 
 *multi-gnome-terminal-1.5.2 (29 Jul 2002)
 
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.4.0 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.4.0
deleted file mode 100644
index 9fe4e78f6ffb..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 551dacd3959731bb84069c9667b471bc multi-gnome-terminal-1.4.0.tar.bz2 514707
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.0 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.0
deleted file mode 100644
index a97e22d2813e..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf17416a69d97635fd25fc2ad1116019 multi-gnome-terminal-1.5.0.tar.gz 1516858
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2
index a69f5c0bebd9..d7b58c6fb34c 100644
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2
+++ b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2
@@ -1 +1 @@
-MD5 2e8995d56617629aa651448ce6799e51 multi-gnome-terminal-1.5.2.tar.gz 1817348
+MD5 ef3fb2739cada29037d8117fdca7e1db multi-gnome-terminal-1.5.2.tar.bz2 1586330
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.4.0.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.4.0.ebuild
deleted file mode 100644
index d9ed04fa527a..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.4.0.ebuild,v 1.4 2002/07/11 06:30:58 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="http://multignometerm.sourceforge.net/${P}.tar.bz2"
-HOMEPAGE="http://multignometerm.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/libglade-0.17-r1
-	>=app-text/scrollkeeper-0.2
-	>=gnome-base/ORBit-0.5.10-r1
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-
-
-src_compile() {
-
-	local myconf
-	use nls     || myconf=--disable-nls
-		
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info \
-		    --sysconfdir=/etc \
-		    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	cp ${S}/omf-install/Makefile ${S}/omf-install/Makefile.orig
-	sed -e "s:scrollkeeper-update.*::g" ${S}/omf-install/Makefile.orig \
-		> ${S}/omf-install/Makefile
-
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     infodir=${D}/usr/share/info \
-	     sysconfdir=${D}/etc \
-	     install || die
-
-	insinto /usr/share/pixmaps
-	doins pixmaps/multignometerm.png
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-
-	echo
-	echo "********************************************************************"
-	echo "*  Please note that the shortcut keys to create a new shell is not *"
-	echo '*  "ctrl-l n" like stated in the docs, but "ctrl-F1 n".            *'
-	echo "********************************************************************"
-	echo
-	
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-				
-
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.0.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.0.ebuild
deleted file mode 100644
index f42f43063373..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.0.ebuild,v 1.3 2002/07/09 08:28:58 aliz Exp $
-
-S=${WORKDIR}/${P/_rc?}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="http://multignometerm.sourceforge.net/${P}.tar.gz"
-HOMEPAGE="http://multignometerm.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/gtk+-1.2.10
-	<x11-libs/gtk+-2.0
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-1.99
-	>=app-text/scrollkeeper-0.2
-	>=gnome-base/ORBit-0.5.10-r1
-	nls? ( sys-devel/gettext )"
-
-SLOT="0"
-
-
-src_compile() {
-
-	local myconf=""
-	if [ "`use nls`" ]
-	then
-		myconf="${myconf} --disable-nls"
-		touch ${S}/intl/libgettext.h
-	fi
-		
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info \
-		    --sysconfdir=/etc \
-		    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	cp ${S}/omf-install/Makefile ${S}/omf-install/Makefile.orig
-	sed -e "s:scrollkeeper-update.*::g" ${S}/omf-install/Makefile.orig \
-		> ${S}/omf-install/Makefile
-
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     infodir=${D}/usr/share/info \
-	     sysconfdir=${D}/etc \
-	     install || die
-
-	insinto /usr/share/pixmaps
-	doins pixmaps/multignometerm.png
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-
-#	echo
-#	echo "********************************************************************"
-#	echo "*  Please note that the shortcut keys to create a new shell is not *"
-#	echo '*  "ctrl-l n" like stated in the docs, but "ctrl-F1 n".            *'
-#	echo "********************************************************************"
-#	echo
-	
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-				
-
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild
index 6904ced17ef8..17cc801a7b03 100644
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild
+++ b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild,v 1.1 2002/07/29 16:11:33 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild,v 1.2 2002/07/29 20:59:06 azarah Exp $
 
-S=${WORKDIR}/${P}
+inherit libtool
+
+S=${WORKDIR}/${P/_rc?}
 DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
 HOMEPAGE="http://multignometerm.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
@@ -13,7 +16,7 @@ KEYWORDS="x86"
 DEPEND=">=x11-libs/gtk+-1.2.10
 	<x11-libs/gtk+-2.0
 	>=gnome-base/gnome-libs-1.4.1.7
-	>=media-libs/gdk-pixbuf-0.11.0-r1
+	>=media-libs/gdk-pixbuf-0.18.0
 	>=gnome-base/libglade-0.17-r1
 	<gnome-base/libglade-1.99
 	>=app-text/scrollkeeper-0.3.10-r1
@@ -23,8 +26,11 @@ DEPEND=">=x11-libs/gtk+-1.2.10
 
 src_compile() {
 
+	elibtoolize
+	intltoolize --copy --force
+
 	local myconf=""
-	use nls || myconf="--disable-nls"
+	use nls || myconf="${myconf} --disable-nls"
 		
 	./configure --host=${CHOST} \
 		    --prefix=/usr \
@@ -42,20 +48,26 @@ src_install() {
 	sed -e "s:scrollkeeper-update.*::g" ${S}/omf-install/Makefile.orig \
 		> ${S}/omf-install/Makefile
 
-	make DESTDIR=${D} install || die "Installation failed"
+	make prefix=${D}/usr \
+	     mandir=${D}/usr/share/man \
+	     infodir=${D}/usr/share/info \
+	     sysconfdir=${D}/etc \
+	     install || die "Installation failed"
 
-	dosym /usr/share/pixmaps/mgt/multignometerm.png \
-	      /usr/share/pixmaps/multignometerm.png
+	dosym mgt/multignometerm.png /usr/share/pixmaps/multignometerm.png
 
 	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
 }
 
 pkg_postinst() {
+
 	echo ">>> Updating Scrollkeeper database..."
 	scrollkeeper-update >/dev/null 2>&1
 }
 
 pkg_postrm() {
+
 	echo ">>> Updating Scrollkeeper database..."
 	scrollkeeper-update >/dev/null 2>&1
 }
+