declaring stable

6 files changed, 12 insertions, 63 deletions

diff --git a/app-admin/partgui/Manifest b/app-admin/partgui/Manifest
index ab1f7117549b..befe79591932 100644
--- a/app-admin/partgui/Manifest
+++ b/app-admin/partgui/Manifest
@@ -1,4 +1,13 @@
 MD5 1a348eb9a2b4da6019f559feab573efa partgui-0.2.2.ebuild 739
+<<<<<<< Manifest
+MD5 c204a3f7f276e86fbb3b88703d35c78e partgui-0.2.3-r1.ebuild 800
+MD5 2c78aa3fa793901b2b1e1214b594cd8b partgui-0.2.3.ebuild 804
+MD5 abfb2a1fbc9c50c0c6478811f1475dcb ChangeLog 717
+MD5 67167e44757618dcca7547209cf0359c metadata.xml 272
+MD5 402105c5e503b257b35ae1e05159ce99 files/digest-partgui-0.2.3-r1 66
+MD5 b71f48733a94d00169d777215b0538f2 files/digest-partgui-0.2.2 66
+MD5 402105c5e503b257b35ae1e05159ce99 files/digest-partgui-0.2.3 66
+=======
 MD5 5e8c1abdea6a5c86bca8609eb3478950 partgui-0.2.3-r1.ebuild 834
 MD5 2c78aa3fa793901b2b1e1214b594cd8b partgui-0.2.3.ebuild 804
 MD5 4586cc0d6244b3b4f7d78c708e74c40d ChangeLog 1056
@@ -8,3 +17,4 @@ MD5 402105c5e503b257b35ae1e05159ce99 files/digest-partgui-0.2.3-r1 66
 MD5 402105c5e503b257b35ae1e05159ce99 files/digest-partgui-0.2.3-r2 66
 MD5 b71f48733a94d00169d777215b0538f2 files/digest-partgui-0.2.2 66
 MD5 402105c5e503b257b35ae1e05159ce99 files/digest-partgui-0.2.3 66
+>>>>>>> 1.10
diff --git a/app-admin/partgui/files/digest-partgui-0.2.3 b/app-admin/partgui/files/digest-partgui-0.2.3
deleted file mode 100644
index a902e18a0716..000000000000
--- a/app-admin/partgui/files/digest-partgui-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83093523acd7440f0d2434493ab98700 partgui-0.2.3.tar.bz2 655581
diff --git a/app-admin/partgui/files/digest-partgui-0.2.3-r1 b/app-admin/partgui/files/digest-partgui-0.2.3-r1
deleted file mode 100644
index a902e18a0716..000000000000
--- a/app-admin/partgui/files/digest-partgui-0.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83093523acd7440f0d2434493ab98700 partgui-0.2.3.tar.bz2 655581
diff --git a/app-admin/partgui/partgui-0.2.3-r1.ebuild b/app-admin/partgui/partgui-0.2.3-r1.ebuild
deleted file mode 100644
index ee92b8efc4b0..000000000000
--- a/app-admin/partgui/partgui-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/partgui/partgui-0.2.3-r1.ebuild,v 1.1 2004/02/11 08:55:47 phosphan Exp $
-
-DESCRIPTION="PartGUI is a nice graphical partitioning tool"
-HOMEPAGE="http://part-gui.sourceforge.net/"
-SRC_URI="mirror://sourceforge/part-gui/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=x11-libs/qt-3.1.0
-	dev-libs/newt
-	>=sys-apps/parted-1.6.5
-	>=sys-fs/xfsprogs-2.3.9
-	sys-libs/slang
-	>=sys-fs/e2fsprogs-1.33"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	rm ${D}/usr/sbin/run_partgui
-	mv ${D}/usr/sbin/piguicqt ${D}/usr/sbin/partgui
-	dodoc ChangeLog README THANKS TODO AUTHORS
-}
diff --git a/app-admin/partgui/partgui-0.2.3-r2.ebuild b/app-admin/partgui/partgui-0.2.3-r2.ebuild
index 110d95b0638b..ef6ed0146d2c 100644
--- a/app-admin/partgui/partgui-0.2.3-r2.ebuild
+++ b/app-admin/partgui/partgui-0.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/partgui/partgui-0.2.3-r2.ebuild,v 1.1 2004/02/18 14:46:58 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/partgui/partgui-0.2.3-r2.ebuild,v 1.2 2004/03/10 07:41:12 phosphan Exp $
 
 DESCRIPTION="PartGUI is a nice graphical partitioning tool"
 HOMEPAGE="http://part-gui.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/part-gui/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=x11-libs/qt-3.1.0
 	dev-libs/newt
diff --git a/app-admin/partgui/partgui-0.2.3.ebuild b/app-admin/partgui/partgui-0.2.3.ebuild
deleted file mode 100644
index 7441db797c11..000000000000
--- a/app-admin/partgui/partgui-0.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/partgui/partgui-0.2.3.ebuild,v 1.1 2004/02/03 15:47:12 phosphan Exp $
-
-DESCRIPTION="PartGUI is a nice graphical partitioning tool"
-HOMEPAGE="http://part-gui.sourceforge.net/"
-SRC_URI="mirror://sourceforge/part-gui/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=x11-libs/qt-3.1.0
-	dev-libs/newt
-	>=sys-apps/parted-1.6.5
-	>=sys-fs/xfsprogs-2.3.9
-	sys-libs/slang
-	>=sys-fs/e2fsprogs-1.33"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	mv ${D}/usr/sbin/run_partgui ${D}/usr/sbin/partgui
-	dodoc ChangeLog README THANKS TODO AUTHORS
-}