Marked 1.93.2 stable (x86). New release, closes bug #45102.

10 files changed, 66 insertions, 93 deletions

diff --git a/app-misc/glabels/ChangeLog b/app-misc/glabels/ChangeLog
index 7ccb12e6c982..8d8eae691d71 100644
--- a/app-misc/glabels/ChangeLog
+++ b/app-misc/glabels/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for app-misc/glabels
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/ChangeLog,v 1.7 2004/02/14 13:00:56 liquidx Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/ChangeLog,v 1.8 2004/04/19 08:15:45 leonardop Exp $
 
+*glabels-1.93.3 (19 Apr 2004)
+
+  19 Apr 2004; L. Boshell <leonardop@gentoo.org> glabels-1.93.3.ebuild:
+  New release. Dependencies corrections.
+  
+  19 Apr 2004; L. Boshell <leonardop@gentoo.org> glabels-1.93.2.ebuild:
+  Marked stable on x86.
+  
 *glabels-1.93.2 (14 Feb 2004)
 
   14 Feb 2004; Alastair Tse <liquidx@gentoo.org> glabels-1.93.2.ebuild:
diff --git a/app-misc/glabels/Manifest b/app-misc/glabels/Manifest
index 51151f829fc1..b1dc5eb18ca3 100644
--- a/app-misc/glabels/Manifest
+++ b/app-misc/glabels/Manifest
@@ -1,9 +1,7 @@
-MD5 45f559156af9f97318ed3adb8b58176b ChangeLog 1290
-MD5 31150cee56a62a888442369ef21793ac glabels-1.92.2.ebuild 983
-MD5 5ac459991fd12944748b296ae063bc76 glabels-1.92.3.ebuild 984
-MD5 792d2a8242d9beedd311d1ff9b194c71 glabels-1.93.2.ebuild 1017
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 445fed0f3c100de1cfdfcf6d8176e522 files/digest-glabels-1.92.2 67
-MD5 20af394a4d5ac1b9292b878682e1d606 files/digest-glabels-1.92.3 67
-MD5 46b4ad5e5bb38c67a0428c9650429b81 files/digest-glabels-1.93.2 67
+MD5 4188768780e7a7369a18efb7920d2b41 ChangeLog 1538
+MD5 37d1c88bf02fe6f5f54990caee56ad85 glabels-1.93.3.ebuild 972
+MD5 54b7f17aa1f3cf4e8cc03858fd99070c metadata.xml 554
+MD5 661f50803e044fa37c0bae42e874ae5e glabels-1.93.2.ebuild 1018
+MD5 9e2ffe73924322314756d4f75f0f7298 files/digest-glabels-1.93.3 67
 MD5 66d44809a6db2eacd620eb5b3c8b0689 files/glabels-1.92.0.desktop 244
+MD5 46b4ad5e5bb38c67a0428c9650429b81 files/digest-glabels-1.93.2 67
diff --git a/app-misc/glabels/files/digest-glabels-1.92.2 b/app-misc/glabels/files/digest-glabels-1.92.2
deleted file mode 100644
index 91a4a6d6f870..000000000000
--- a/app-misc/glabels/files/digest-glabels-1.92.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ccf1133fa76b97fe396297e230bd75e glabels-1.92.2.tar.gz 1196408
diff --git a/app-misc/glabels/files/digest-glabels-1.92.3 b/app-misc/glabels/files/digest-glabels-1.92.3
deleted file mode 100644
index 0dd22e7b128c..000000000000
--- a/app-misc/glabels/files/digest-glabels-1.92.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e179307a58afcf77d753d09a4d80e762 glabels-1.92.3.tar.gz 1195890
diff --git a/app-misc/glabels/files/digest-glabels-1.93.3 b/app-misc/glabels/files/digest-glabels-1.93.3
new file mode 100644
index 000000000000..9c76640a6321
--- /dev/null
+++ b/app-misc/glabels/files/digest-glabels-1.93.3
@@ -0,0 +1 @@
+MD5 29abf3f91ea9e8aec194744302175c02 glabels-1.93.3.tar.gz 1394894
diff --git a/app-misc/glabels/glabels-1.92.2.ebuild b/app-misc/glabels/glabels-1.92.2.ebuild
deleted file mode 100644
index 3c099fad386b..000000000000
--- a/app-misc/glabels/glabels-1.92.2.ebuild
+++ /dev/null
@@ -1,39 +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-misc/glabels/glabels-1.92.2.ebuild,v 1.2 2003/11/12 21:28:37 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Program for creating labels and business cards"
-HOMEPAGE="http://glabels.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomecanvas-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.21
-	sys-devel/gettext"
-
-DOCS="AUTHORS COPYING INSTALL README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	# a slightly changed .desktop file, so we can actually have
-	# a menu item <obz@gentoo.org>
-	cp ${FILESDIR}/glabels-1.92.0.desktop ${S}/data/glabels.desktop
-
-}
-
diff --git a/app-misc/glabels/glabels-1.92.3.ebuild b/app-misc/glabels/glabels-1.92.3.ebuild
deleted file mode 100644
index cdce9748292c..000000000000
--- a/app-misc/glabels/glabels-1.92.3.ebuild
+++ /dev/null
@@ -1,39 +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-misc/glabels/glabels-1.92.3.ebuild,v 1.1 2003/11/12 21:28:37 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Program for creating labels and business cards"
-HOMEPAGE="http://glabels.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.4.23
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomecanvas-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.21
-	sys-devel/gettext"
-
-DOCS="AUTHORS COPYING INSTALL README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	# a slightly changed .desktop file, so we can actually have
-	# a menu item <obz@gentoo.org>
-	cp ${FILESDIR}/glabels-1.92.0.desktop ${S}/data/glabels.desktop
-
-}
-
diff --git a/app-misc/glabels/glabels-1.93.2.ebuild b/app-misc/glabels/glabels-1.93.2.ebuild
index 0ec2c51c0548..45f749cea764 100644
--- a/app-misc/glabels/glabels-1.93.2.ebuild
+++ b/app-misc/glabels/glabels-1.93.2.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-misc/glabels/glabels-1.93.2.ebuild,v 1.1 2004/02/14 13:00:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.2.ebuild,v 1.2 2004/04/19 08:15:45 leonardop Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://glabels.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
diff --git a/app-misc/glabels/glabels-1.93.3.ebuild b/app-misc/glabels/glabels-1.93.3.ebuild
new file mode 100644
index 000000000000..7669dd89fbd0
--- /dev/null
+++ b/app-misc/glabels/glabels-1.93.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.3.ebuild,v 1.1 2004/04/19 08:15:45 leonardop Exp $
+
+inherit gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://glabels.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+
+KEYWORDS="~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.0.5
+	>=gnome-base/libgnomeui-2.0.1
+	>=gnome-base/libbonobo-2
+	>=dev-libs/libxml2-2.4.23
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libgnomecanvas-2.0.1
+	>=gnome-base/libglade-2.0.1"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig
+	>=dev-util/intltool-0.21"
+
+DOCS="AUTHORS ChangeLog COPYING* README TODO"
+
+src_unpack() {
+	unpack ${A}
+	# Small syntax correction.
+	sed -i -e 's:;Office:;Office;:' ${S}/data/glabels.desktop.in
+}
diff --git a/app-misc/glabels/metadata.xml b/app-misc/glabels/metadata.xml
index da6fd63d0085..f7e7b529baea 100644
--- a/app-misc/glabels/metadata.xml
+++ b/app-misc/glabels/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
+  <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    gLabels is a program for creating labels and business cards for
+    the GNOME desktop environment. It is designed to work with various
+    laser/ink-jet peel-off label and business card sheets that you'll
+    find at most office supply stores.
+  </longdescription>
 </pkgmetadata>