Version bump, drop old.

(Portage version: 2.1.11.19/cvs/Linux x86_64)

3 files changed, 55 insertions, 61 deletions

diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 7fdeedd0c80b..816205b376f8 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/glabels
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.64 2012/05/20 09:00:09 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.65 2012/09/22 09:56:44 pacho Exp $
+
+*glabels-3.0.1 (22 Sep 2012)
+
+  22 Sep 2012; Pacho Ramos <pacho@gentoo.org> +glabels-3.0.1.ebuild,
+  -glabels-2.2.8.ebuild:
+  Version bump, drop old.
 
   20 May 2012; Mark Loeser <halcy0n@gentoo.org> glabels-2.2.8.ebuild,
   glabels-3.0.0.ebuild:
diff --git a/app-office/glabels/glabels-2.2.8.ebuild b/app-office/glabels/glabels-2.2.8.ebuild
deleted file mode 100644
index b2b69cf16b46..000000000000
--- a/app-office/glabels/glabels-2.2.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.2.8.ebuild,v 1.8 2012/05/20 09:00:09 halcy0n Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils 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"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="doc eds"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=x11-libs/gtk+-2.10:2
-	>=gnome-base/libgnome-2.16
-	>=gnome-base/libgnomeui-2.16
-	>=dev-libs/libxml2-2.7:2
-	>=gnome-base/libglade-2.6:2.0
-	eds? ( >=gnome-extra/evolution-data-server-1.8 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.28
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with eds libebook)
-		--disable-update-mimedb
-		--disable-update-desktopdb
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix documentation misuse of entities, bug #?
-	epatch "${FILESDIR}/${PN}-2.2.6-documentation.patch"
-
-	# Fix malformed XML documentation, bug #?
-	epatch "${FILESDIR}/${PN}-2.2.7-documentation.patch"
-
-	# Fix intltool test, bug #?
-	echo "help/cs/glabels.xml" >> po/POTFILES.in
-}
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/app-office/glabels/glabels-3.0.1.ebuild b/app-office/glabels/glabels-3.0.1.ebuild
new file mode 100644
index 000000000000..c9be9c5aa33f
--- /dev/null
+++ b/app-office/glabels/glabels-3.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.1.ebuild,v 1.1 2012/09/22 09:56:44 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://www.glabels.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="barcode doc eds"
+
+RDEPEND=">=dev-libs/glib-2.28.2:2
+	>=x11-libs/gtk+-3.0.9:3
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=x11-libs/cairo-1.10.0
+	>=x11-libs/pango-1.28.1
+	barcode? (
+		>=app-text/barcode-0.98
+		>=media-gfx/qrencode-3.1 )
+	eds? ( >=gnome-extra/evolution-data-server-2.30.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.28
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		$(use_with eds libebook)
+		--disable-static"
+}
+
+src_prepare() {
+	# Fix desktop entry, upstream bug #684612
+	sed -i -e 's/.png//' data/desktop/glabels-3.0.desktop.in || die
+	sed -i -e '/Encoding/d' data/desktop/glabels-3.0.desktop.in || die
+}