fix deps 'n cleanup

13 files changed, 10 insertions, 393 deletions

diff --git a/x11-terms/multi-gnome-terminal/ChangeLog b/x11-terms/multi-gnome-terminal/ChangeLog
index 026a65ddcd6e..cd2d1fd15a7c 100644
--- a/x11-terms/multi-gnome-terminal/ChangeLog
+++ b/x11-terms/multi-gnome-terminal/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for x11-terms/multi-gnome-terminal
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.17 2003/04/28 02:44:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.18 2003/12/06 18:29:52 foser Exp $
 
 *multi-gnome-terminal-1.6.2 (28 Apr 2003)
 
+  06 Dec 2003; foser <foser@gentoo.org> multi-gnome-terminal-1.6.2.ebuild :
+  Fix deps, requestedin #34585
+
   28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> multi-gnome-terminal-1.6.2.ebuild :
   Update version.
 
diff --git a/x11-terms/multi-gnome-terminal/Manifest b/x11-terms/multi-gnome-terminal/Manifest
index f4f7b076fcfd..98d2f7fee552 100644
--- a/x11-terms/multi-gnome-terminal/Manifest
+++ b/x11-terms/multi-gnome-terminal/Manifest
@@ -1,14 +1,4 @@
-MD5 8bff1efa1253532d250236ed96f949a4 ChangeLog 2904
-MD5 60bdec26de1034676f8eff6e2650a7f7 multi-gnome-terminal-1.5.1.ebuild 1792
-MD5 342a3b6efc1833a54556c8341650840c multi-gnome-terminal-1.5.2-r1.ebuild 1927
-MD5 69a213a6b9cad360ea511cde5b1cfc2d multi-gnome-terminal-1.5.2-r2.ebuild 1933
-MD5 03c29772783792a892ec9d63bc281648 multi-gnome-terminal-1.5.2.ebuild 1797
-MD5 d5d590283df51c69eaa7f91f8623e628 multi-gnome-terminal-1.6.1.ebuild 1934
-MD5 d5afe8054c054826fe9fb59b30ddad4b multi-gnome-terminal-1.6.2.ebuild 1938
+MD5 de8c7374ab487437bbc7a58efb9be47d multi-gnome-terminal-1.6.2.ebuild 1851
+MD5 3303987640103ea3b871acf2e674de46 ChangeLog 3011
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a248b8e97b95f9fc3ee55a9723e9825f files/digest-multi-gnome-terminal-1.5.1 80
-MD5 50c30318231ee0605eada1a30ab812b2 files/digest-multi-gnome-terminal-1.5.2 80
-MD5 682726c76b0437b7c2d4cc8c155a7924 files/digest-multi-gnome-terminal-1.5.2-r1 79
-MD5 50c30318231ee0605eada1a30ab812b2 files/digest-multi-gnome-terminal-1.5.2-r2 80
-MD5 55e01d8e4a16ee94a1bf5395bddebbd2 files/digest-multi-gnome-terminal-1.6.1 80
 MD5 d2af4e1acb1bc5842cf1b8b11cb80a3e files/digest-multi-gnome-terminal-1.6.2 80
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.1 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.1
deleted file mode 100644
index 237044cbe40d..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2836c202b98fcb107e208628405b0b16 multi-gnome-terminal-1.5.1.tar.bz2 1404977
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
deleted file mode 100644
index d7b58c6fb34c..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef3fb2739cada29037d8117fdca7e1db multi-gnome-terminal-1.5.2.tar.bz2 1586330
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r1 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r1
deleted file mode 100644
index a69f5c0bebd9..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e8995d56617629aa651448ce6799e51 multi-gnome-terminal-1.5.2.tar.gz 1817348
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r2 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r2
deleted file mode 100644
index d7b58c6fb34c..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.5.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef3fb2739cada29037d8117fdca7e1db multi-gnome-terminal-1.5.2.tar.bz2 1586330
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.1 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.1
deleted file mode 100644
index c3e0273f1137..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f2a89016abcc3550ae0a1cd2140e183 multi-gnome-terminal-1.6.1.tar.bz2 1608451
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.1.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.1.ebuild
deleted file mode 100644
index 4776f8ee29f5..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.1.ebuild,v 1.6 2003/09/07 00:24:01 msterret Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P/_rc?}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/multignometerm/${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
-	<gnome-base/libglade-1.99
-	>=app-text/scrollkeeper-0.3.10-r1
-	>=gnome-base/ORBit-0.5.10-r1
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-
-	local myconf=""
-
-	use nls && ( \
-		myconf="${myconf} --disable-nls"
-		touch ${S}/intl/libgettext.h
-	)
-
-	econf ${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
-
-	einstall || 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-r1.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r1.ebuild
deleted file mode 100644
index fbb575261599..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r1.ebuild,v 1.4 2003/09/07 00:24:01 msterret Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${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.7
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-1.99
-	>=app-text/scrollkeeper-0.3.10-r1
-	>=gnome-base/ORBit-0.5.16"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-
-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 "Compilation failed"
-}
-
-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
-
-	# Remove the NO_XALF nonsense from the .desktop file
-	cp ${S}/gnome-terminal/multi-gnome-terminal.desktop \
-	   ${S}/gnome-terminal/mgt.desktop.old
-	sed -e "s:NO_XALF ::" \
-	    ${S}/gnome-terminal/mgt.desktop.old > \
-		${S}/gnome-terminal/multi-gnome-terminal.desktop
-
-	make DESTDIR=${D} install || die "Installation failed"
-
-	dosym /usr/share/pixmaps/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
-}
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r2.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r2.ebuild
deleted file mode 100644
index 1c66057195b3..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2-r2.ebuild,v 1.5 2003/09/07 00:24:01 msterret Exp $
-
-IUSE="nls"
-
-inherit libtool
-
-S=${WORKDIR}/${P/_rc?}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
-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.7
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-1.99
-	>=app-text/scrollkeeper-0.3.10-r1
-	>=gnome-base/ORBit-0.5.16"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	elibtoolize
-
-	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 "Compilation failed"
-}
-
-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
-
-	# Remove the NO_XALF nonsense from the .desktop file
-	cp ${S}/gnome-terminal/multi-gnome-terminal.desktop \
-	   ${S}/gnome-terminal/mgt.desktop.old
-	sed -e "s:NO_XALF ::" \
-	    ${S}/gnome-terminal/mgt.desktop.old > \
-		${S}/gnome-terminal/multi-gnome-terminal.desktop
-
-	make DESTDIR=${D} install || die "Installation failed"
-
-	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
-}
-
-pkg_postrm() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update &>/dev/null
-}
-
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
deleted file mode 100644
index 1a1fc54d1897..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.5.2.ebuild,v 1.6 2003/09/07 00:24:01 msterret Exp $
-
-IUSE="nls"
-
-inherit libtool
-
-S=${WORKDIR}/${P/_rc?}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
-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.7
-	>=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
-	>=gnome-base/ORBit-0.5.16
-	nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	elibtoolize
-	intltoolize --copy --force
-
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info \
-		    --sysconfdir=/etc \
-		    ${myconf} || die
-
-	emake || die "Compilation failed"
-}
-
-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 "Installation failed"
-
-	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
-}
-
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.1.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.1.ebuild
deleted file mode 100644
index ebfb871c31a1..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.1.ebuild,v 1.4 2003/09/07 00:24:01 msterret Exp $
-
-IUSE="nls"
-
-inherit libtool
-
-S=${WORKDIR}/${P/_rc?}
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
-HOMEPAGE="http://multignometerm.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-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
-	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-1.99
-	>=app-text/scrollkeeper-0.3.10-r1
-	>=gnome-base/ORBit-0.5.16"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	elibtoolize
-
-	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 "Compilation failed"
-}
-
-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
-
-	# Remove the NO_XALF nonsense from the .desktop file
-	cp ${S}/gnome-terminal/multi-gnome-terminal.desktop \
-	   ${S}/gnome-terminal/mgt.desktop.old
-	sed -e "s:NO_XALF ::" \
-	    ${S}/gnome-terminal/mgt.desktop.old > \
-		${S}/gnome-terminal/multi-gnome-terminal.desktop
-
-	make DESTDIR=${D} install || die "Installation failed"
-
-	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
-}
-
-pkg_postrm() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update &>/dev/null
-}
-
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild
index ed0b7e6fca59..18c4cd17e6c5 100644
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild
+++ b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild,v 1.2 2003/09/07 00:24:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild,v 1.3 2003/12/06 18:29:52 foser Exp $
 
 IUSE="nls"
 
 inherit libtool
 
-S="${WORKDIR}/${P/_rc?}"
 DESCRIPTION="Extended version of the Gnome Terminal."
 SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
 HOMEPAGE="http://multignometerm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
-DEPEND=">=x11-libs/gtk+-1.2.10
-	<x11-libs/gtk+-2.0
+DEPEND="=x11-libs/gtk+-1*
 	>=gnome-base/gnome-libs-1.4.1.7
 	>=media-libs/gdk-pixbuf-0.11.0-r1
-	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-1.99
+	=gnome-base/libglade-0*
 	>=app-text/scrollkeeper-0.3.10-r1
 	>=gnome-base/ORBit-0.5.16"