bump to stable

4 files changed, 3 insertions, 63 deletions

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 56caee1dea7e..86246428dbfd 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,10 +1,8 @@
 MD5 535ecea980798a98f7f46e58c0be035a ChangeLog 3108
 MD5 09af8ed573bad0e21c092943af508bbe dia-0.91.ebuild 1486
-MD5 029023fb14dc3d32e4e55e146d804473 dia-0.92_pre4.ebuild 1625
-MD5 18c1ca208665e0ba896b5a5488872c8d dia-0.92_pre7.ebuild 1625
+MD5 b838d110cdd9f4bbe03ebe5522f796b1 dia-0.92_pre7.ebuild 1624
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 2dc18dc468903c86599f681f73802f3e files/dia-0.91-Cisco-Makefile.in 17188
 MD5 266855bdb86ff533dc0790aa8180c5f7 files/dia-0.91-gcc33_fix.patch 589
 MD5 6b65e31bb3d998a18e0161e06060fd58 files/digest-dia-0.91 62
-MD5 5b13b032a8f9edc43d2d0013caa701c4 files/digest-dia-0.92_pre4 67
 MD5 6f0b1c66f2f9494e11dde4b9345556fb files/digest-dia-0.92_pre7 67
diff --git a/app-office/dia/dia-0.92_pre4.ebuild b/app-office/dia/dia-0.92_pre4.ebuild
deleted file mode 100644
index a958840846e2..000000000000
--- a/app-office/dia/dia-0.92_pre4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.92_pre4.ebuild,v 1.2 2003/10/12 02:11:56 liquidx Exp $
-
-inherit gnome2 python
-
-DESCRIPTION="Diagram Creation Program"
-HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
-# remove after it moves out of _pre
-SRC_URI="mirror://gnome/sources/${PN}/0.92/${P/_/-}.tar.bz2"
-S=${WORKDIR}/${P/_/-}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="gnome png python"
-
-DEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.2.4
-	>=dev-libs/libxml2-2.3.9
-	>=dev-libs/libxslt-1.0
-	>=media-libs/freetype-2.0.9
-	>=dev-util/intltool-0.21
-	>=sys-libs/zlib-1.1.4
-	png? ( media-libs/libpng
-		media-libs/libart_lgpl )
-	gnome? ( >=gnome-base/libgnome-2.0
-		>=gnome-base/libgnomeui-2.0 )
-	python? ( >=dev-lang/python-2.0
-		>=dev-python/pygtk-1.99 )"
-
-G2CONF="${G2CONF} $(use_enable gnome) $(use_with python)"
-src_unpack() {
-
-	unpack ${A}
-
-	# fix b0rked Makefile in Cisco directory
-	einfo "Patching shapes/Cisco/Makefile.in"
-	cd ${S}
-	cp ${FILESDIR}/${PN}-0.91-Cisco-Makefile.in ${S}/shapes/Cisco/Makefile.in || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "install failed"
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS
-
-	# fix .desktop link
-	dodir /usr/share/applications
-	mv ${D}/usr/share/gnome/apps/Applications/dia.desktop ${D}/usr/share/applications/dia.desktop
-	rmdir ${D}/usr/share/gnome/apps/Applications
-	rmdir ${D}/usr/share/gnome/apps
-	echo "Categories=Application;GNOME;Office;" >> ${D}/usr/share/applications/dia.desktop
-
-}
diff --git a/app-office/dia/dia-0.92_pre7.ebuild b/app-office/dia/dia-0.92_pre7.ebuild
index 06e7a5fb8223..9a86c41aa643 100644
--- a/app-office/dia/dia-0.92_pre7.ebuild
+++ b/app-office/dia/dia-0.92_pre7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.92_pre7.ebuild,v 1.1 2003/10/15 09:44:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.92_pre7.ebuild,v 1.2 2003/10/19 09:04:11 liquidx Exp $
 
 inherit gnome2 python
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_/-}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="gnome png python"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
diff --git a/app-office/dia/files/digest-dia-0.92_pre4 b/app-office/dia/files/digest-dia-0.92_pre4
deleted file mode 100644
index 42d682bdf62a..000000000000
--- a/app-office/dia/files/digest-dia-0.92_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0d3162906a92c4ada75a683893bf8b1 dia-0.92-pre4.tar.bz2 2715213