Version bump, drop old.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

4 files changed, 68 insertions, 64 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/Manifest b/app-office/glabels/Manifest
index 541401704aa0..0f203f807e0b 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX glabels-2.2.6-documentation.patch 509 SHA256 b270984050b466f1fc7b5772624bbf9c3d5517fb5a9e2ba73ba3abf122868a4d SHA512 23cd41e38ecfcacff03ce23c2423a6404467b18e5a612956498af8bbb56153dbce2885ec091e8039e4aca3794a380582f9656af0f83be26b6489693f7a5bd134 WHIRLPOOL 027023eb559e9e41f2e1d7b8e28bfa32c4c64b7dfbdf40cc26503c6d348bad3ad6c2cdcd6d1f60e964e3b8a3c7023ce1585ee591dfb54bccc16f4d5c6e9b4a0e
 AUX glabels-2.2.7-documentation.patch 1251 SHA256 bf53b2a253557d841dc9935c5b91cb05b08c52a6ca78c183009e69c5c7fafe6a SHA512 5c203594d0413ce75898203b637e747e74408d7a9cbd3a9c993c21f4bb3e26bf3c9ad9ff8baf78c67b96cd269058a95bb42de2f1bb435e07a173d622f67d8ea6 WHIRLPOOL 62fad70b20fba7383b749c7a65710b784f12c7b719843d63fcaf470fb1293c90e2cf9aafda3e6690aef6c9496122422aa5baa98c57689a223513407b10cac723
-DIST glabels-2.2.8.tar.gz 3842721 SHA256 0401ab5ab55f1828e3db3633aa8f9b5a50a08bed74a5a9cb273e6274ce002f3c SHA512 f73d70dec359c30063fc2f38be337ae8fc0f851d68e90dc8567b9b43187a1a83fb39c7f52f2344b960847f8d44713908a2a485b1970b5277a267e873214c0194 WHIRLPOOL 2c4561b28c2fcdec4ff08b58c1f86ad8259467999ecefdc403e05ec79d85cafe5dca1875b13cbf2fd00b3dac5a3dbbd44cd2461fb102db492c2626ede2833696
 DIST glabels-3.0.0.tar.bz2 2924060 SHA256 a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a SHA512 1c750df81a58d7987a93b493071b9ef3c09c617ab2537c469d11e61520936868ea647de23adb697bb0b4a759a727a28dd7d31ea82c98a6a4421d50571162edd5 WHIRLPOOL 8ff2292fa532043da2ce70737b02b764640bb0944efbc925e2c67f732b58c4f8c470f63b8cfef781fe02b1741ecc2e134509c56497daa274cee23e5d31221dde
-EBUILD glabels-2.2.8.ebuild 1487 SHA256 5f24a0a6360148448de16a7f03b1f96ce02538c993e09bc1856b5269099710bf SHA512 2d1f62d941c2c031fb41c8f6418c6624335fc2918d78cc58e51f225d9e263dcff4b0c5b6f3ed3b87ef66d8b51e058b3352d15ab959ff58f652060c3bf2a777fa WHIRLPOOL 7568c3f7655b5ab8721041a1ad98bd3a176f4f70609d9d19f8ac7121d5eeba4dfaa823d58d396bc95f62d22f50709215384b11a83d1c9002121c5759f0d99b7e
+DIST glabels-3.0.1.tar.xz 3310944 SHA256 99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2 SHA512 810898741724e0f51e83387f9db17958b000703932d7d52105520f06940036944fbb239b5ef0720175f50ff5af7dac418c6040e3f7baa23268ad7b31ec8aaaaf WHIRLPOOL 44f3bed4a3761c4bcb0c822b755e1ca180ef2a75550857a5e726b8f2ca655fb0a94c932330eb15e47a0630f5ef36475d762f32b59e75ea568260c7d69932095c
 EBUILD glabels-3.0.0.ebuild 1102 SHA256 ad8342da4455f760882358ad0db32d18b888b2b951cd9c36a2db352818de5f59 SHA512 f725a57109b6b963732f070e96844008d1006da4cd8b715c1e90ca6bd701d2d7fbb2a6ce0aa5c2e7dfa0924b9b89c600c67b281d48f110849ad423d6b3c3c10a WHIRLPOOL d9eb9437f5232023ee14efd61d2c2098be6963db0d2fe9770cfbdbfbf03625f290952be73358810157d68ccbdb4f48c7373607a891eab38f8e1ecdb3565f0d6d
-MISC ChangeLog 10080 SHA256 a8e170e6c8639b05a8edabad960093852ed98bfc6d8096ba6fa34d7592deff69 SHA512 5ece7f5c31162fba3f5f456048234769aee5ef13d64a2f0c73d306a4ae18658d198a5f1bfc85e4b03d79698cb23e683bf9709badd6a8736e5a40502ce4b6fa54 WHIRLPOOL ba3dd5261332ac99c4eb87248f89a9b1b9d43a52902e7d90e2781038bfe663fee3f80ef9c34753077dbe0762a2590fcb85ae2c834d2ae9208c7f336bdb844a68
+EBUILD glabels-3.0.1.ebuild 1271 SHA256 7aa77ff0dc3dfedbc8658c3ff81988eac7c1fbe1488c3272e8a465214b5cbb70 SHA512 b3e667ad0037b510629824d88c43e7f4bcabaa389a5ddcad8f4f0930871f94f73eb0fa107b655486d7fb9500e4503b6006af086c533dd9d1143659812b3c6323 WHIRLPOOL e13b4d478016a1fe33284d6676f3ead155bb6b2c5f529b3be46cbc46dfa08f3ce6238b361801c84fcb936793c14ebfcceebc94a003f3385f93856e427c46d390
+MISC ChangeLog 10229 SHA256 d7cbd1aa5778bd8310056fc06e2e7ab1b4ce1d20153c1c07beb7eb6edd883bc1 SHA512 f8bd4b8f4323c87355560e33ed0c0846847fe273cf47d2de815e47db7cf48f4e09a8085fed29a76bb5e28ddc99a513e53426704c8622cc55203af8d7cd36aebb WHIRLPOOL 2bdf12cb72ab28718a2e3e5e600058d68cb39dfce37d1a8dd185ac0dfd1dbcec9799da51ae998cd7860b9a69b88d272a1f86739559fd092fcc26934f8c2f3931
 MISC metadata.xml 535 SHA256 3f7047af8b04690c462c06b2ab838b2a38150f610523ad8e31451821f07c5d7a SHA512 8fc6d7b5a7dfb5df35a5ea73a657c9d3177daaf9ef6711dde10beab7544c7d9bf8eac73f9483907ba2ed895ce318c2774abbad62a963ae6d58221fe1ee409ee0 WHIRLPOOL 2495f07b313c795d7815a4aadf19ac423cedeb9aa6296d75d7e3ff53b6e1443e10bf452d12f2cc09a3cf8df27388e27b3264b32e88b9aa658fca467b069234c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBdi2EACgkQCaWpQKGI+9ROwQCeJ8CYH4DSao7LdVhKZ1OWRIUU
+SZcAn1FiH+PhmJAiFJfyYM6uEDqM6MHS
+=G2QV
+-----END PGP SIGNATURE-----
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
+}