Version bump, drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 78 insertions, 77 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 1c7bde9a32ee..4f795b0501ec 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.267 2014/03/29 19:20:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.268 2014/04/17 13:02:06 pacho Exp $
+
+*gnumeric-1.12.14 (17 Apr 2014)
+
+  17 Apr 2014; Pacho Ramos <pacho@gentoo.org> +gnumeric-1.12.14.ebuild,
+  -gnumeric-1.12.0-r1.ebuild:
+  Version bump, drop old
 
 *gnumeric-1.12.13 (29 Mar 2014)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 9768fe082a37..5616388530e5 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA256
 
 AUX gnumeric-1.12.11-missing-header.patch 246 SHA256 907b8716d8ee0ec527ea18327b41d9f5d9b113c709c529cf6e6bd26a3a7604a5 SHA512 ee1196125858a5c7b7fb8e7284aea3124b9a72b2e020f61089eebd128318f3853656397da58305656495bd7f52b667255915b4036830be1dd0f903679e4d2bdb WHIRLPOOL e4b38c9ed9beba82207ed698fe608670e561d7f9272045e8d8c5935fc144613387e33f88f147d07075a27c5c5c4acfa0aa7bc56ede94dc2a7239723e4072bd9e
-DIST gnumeric-1.12.0-annotation-syntax.patch.xz 13408 SHA256 8cc904ced03d1cdb894afa896c7fc8be22bd3cf16f0c8427c965eb813a406a48 SHA512 b1062a75750630e4e0cb479a994db2c98aae4668355a7756bd6ca9f64407571d73af0fd428453e373d4d0d9f77d842869cbe4f7d5ba0054103cd8add0e09d5b6 WHIRLPOOL aec5b51c9af1e6b3806c7f5f22930c41d42ed0dfbcb66407a18ded9cf565b78daae76d2b8a5952ce4f7379b11c9bad68a02982f7248a62d0c5a87e8ae60a71f4
-DIST gnumeric-1.12.0.tar.xz 15631708 SHA256 037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 SHA512 5bcf5e04d3c871d755a560207db2bce9d81bbe24f9c330a8a0555a386c38f505997c0a24a44afe0ab28539f03a921ce13f82ea8c6e828e17d998ce4951639223 WHIRLPOOL 2de92f2fecc9389e92a1e50f3c37361e0c06e792d0e75ca17beb1a5c6a9b344bc14d3eeef561ecdda5a3e6c60f4fe73f6fb2fd22e343b6edf842f7a81d64a825
 DIST gnumeric-1.12.12.tar.xz 18081428 SHA256 00cbc0816142dd3bde5ca39b2585965758f11cea5d53c23611dd44b24c4fd124 SHA512 65df37c882082e94a44a8df1319df8872c6768fffd32fa3152a6c14cba10b4112db36d284bbd4a3f6c59669265704fc117a1adeb1c0cf3e9a6846ad0fbdbc600 WHIRLPOOL 414b2f9b73dabb4eaa5570132829494c1d5e66119dcb7ad55f3cd0d1cd8ef7ef4c110011dd82ce5304c88a596ca7c220e430fd1eb867a4049eb1205fe7da047a
 DIST gnumeric-1.12.13.tar.xz 17996140 SHA256 f74a23ebfca5d4f283313580aca8e51dc500ce148224c35fa9eb977df7361067 SHA512 89f34ec0c781a43a2de7321f50fd26738bdaf4ef95ebd9c54ab11de147ad282cd09a9a06e00c303fff276fdf3847e9f6ceca3bc2cde851cf646e03cc4564049a WHIRLPOOL aaf9c12c9d11226f0c717588c5fe30673e69b4761b0bfb6477e1e6c2f5d00cf9f37cbef9938569ee491bf1aee78535c47ed1859ebcc43f072ef09b03fc8f186b
-EBUILD gnumeric-1.12.0-r1.ebuild 1886 SHA256 fd6400c6fa9584e87a4701d6a116f82087819bc943146f6dd29cd02bc17fbea2 SHA512 574f5b13f2382870b325131940b34c4f7c31e934ce6f4cee6c7ef490f045e72241f4016c9250e8a6388b5d31bd16c669cd22a840b76cc828d5eeff277cc5e2f0 WHIRLPOOL f3b324f698f5bbcd2362fcb93a0d196bacd569d3e71505afd08a96503212bcca0a79c919f5e4c7b1240c7803f50193844ac46b69aa88726ac1194d92a05342c3
+DIST gnumeric-1.12.14.tar.xz 18004076 SHA256 964b98098e7ddc17890fec575f88a48acceaaf078dc1522836b0df755224ca27 SHA512 9b18a7f86bdfe3f31d12fbd4a6e60c92f83637f98554aa4d822ca899c44ba7807fb7f4ede9448010d5534f4472709b3df94bd1646823d0a8a7012d4da3bfef93 WHIRLPOOL 1fe72ef1f1df27e500ba4a01ef1e3888254cd8cfb9c069b3ec4cdc4b82071e128c1d16e5f735ab708f07d2a88363f4b60a36c6783d3e1a845d61d54f0334864e
 EBUILD gnumeric-1.12.12.ebuild 1596 SHA256 137ea3d9dd5b582163111d37702b679f4f5cec27e38a587048d723f53d452a1f SHA512 733be4570a885c72e30bb8be7e630f32dccdb0a7278b98122af9d1ed8dcf963362057a0f0f98f388ef199515c0a3b07442d4179d04fb14e9bc0695f0f9921243 WHIRLPOOL f388bad5243a3f0d6c2d071595b0a5ac95177170928725a8fe29f6df6545f6d42b5f0e36796d4df6e9978aba9589716f46783b263ea3eec17b34a366f13d8396
 EBUILD gnumeric-1.12.13.ebuild 1598 SHA256 40f88be0a9ecac140d9fab38ff0f97d92f44e097f89c6265028c918648934e1c SHA512 d8d22cd65725b8e7659e0eef270175efbcc59e34b29b7367f76b5bcec6303c3018bd05bef916bf89fe4fd37c5f4c30e372624e18db48efcb21c36362f3fbf578 WHIRLPOOL 5fa0ac25cf5cd92b957cdee3efca20339620b756c6c9524fb6d4745d42fe27ed5cfffc240ff10a4446f0aa961d829cd4b620475af22b604e449119184d7df4d4
-MISC ChangeLog 36852 SHA256 b42011b27b50f3399f2063c67a60f27da06ec4fa5719cea7e58ae54b5e68a8c2 SHA512 20505ce9d35e8c894a0db9022f744f46626667d1f5b74511d237887a47ebac6d036f133e385f63fa32efeac9538e15950bd90152bf8f6a7c7bf852a8f120449d WHIRLPOOL dad2ed37af498bf5bf8eabe6a0db5dba497fadb52dd00b1b187a26ee3223be4e9d35cbc54c03be820025bb327eb9fd87b6dbd6cf1692f2e7a05e579835dcef8e
+EBUILD gnumeric-1.12.14.ebuild 1598 SHA256 1a942c7c985ddef3fea1e0b123d326657d54f09b8cc88d5364cc2599b9a3d082 SHA512 fdcfb045292147337c6dfc30855c943a95c92a0f592342cf2121a332fa37fd70e22d97ed2fd50cd9eb79061f0442c32e947183013e6688a764debbcb1ce80f18 WHIRLPOOL 9eacdd3920f8c48ac91328ec213a1d1adea0bd88e0bbf5b4e499fa16f6f158ee3a65bab15fedad90f39385621795feeb2dbd5de120d98985111275fae5875ee7
+MISC ChangeLog 37013 SHA256 3b156ed9619e1683792dcb5e27bc2a89c19270d857a81b2e719f0e724879103e SHA512 3ca7bc6918951c8c4c9c2e0754afb053ca33b9f003085c802e40dfd170f99fc67aa8484001c1c7d0feb2d980fc73279b838abb44e38f422aae8bf16c32ef5c1c WHIRLPOOL d259b62aa6fa4ba10b4d017330d993a8c9ae6ab3dd06790e4b632ffd6df0cc2e363a26fa688a9d76a0a2b53fe79938dba2682703870a0b0dde8f31d69d6732c7
 MISC metadata.xml 381 SHA256 62ca3ef5ae5a5c0443e9ab858424733291f62c080115b0a08b2d1cbfcc17ee75 SHA512 c50ea74e4db4ffadd19e5ca582fce83fe9ab1511613bef5db7f7c07b682a35bb47f398a1e245cf3ef077d4df4872483f41666fd5473cbd6ebce201e65292cc03 WHIRLPOOL 6a6ea6ca7ca29840551e68066f0274bcc612dffe099e1505fccb46d0ca06c18d3439144a708b986d7e8f5a54b1088852f5d587a82b797c6232395a4607af86ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM3HOUACgkQCaWpQKGI+9S80wCfQd9BPuCgfK319RM44fGRHSfz
-LzkAn2/oRMy1LHzySkph8F0YwhqocXVc
-=8K+7
+iEYEAREIAAYFAlNP0M8ACgkQCaWpQKGI+9SVWQCfVRiLqPGpkWZ+JL10MTe55z3t
+pk0Anj02uZ5nWVoLW+jpzuTKHi/p91Iu
+=+oIx
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild
deleted file mode 100644
index 9d588d1cde12..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild,v 1.8 2013/04/01 18:23:27 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://projects.gnome.org/gnumeric/"
-LICENSE="GPL-2"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-1.12.0-annotation-syntax.patch.xz"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="+introspection perl python"
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, wait for next release
-# also fails tests due to 80-bit long story
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2
-	>=dev-libs/glib-2.28.0:2
-	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.0:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1.0.0:= )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-"
-#	libgda? (
-#		>=gnome-extra/libgda-4.1.1:4.0
-#		>=gnome-extra/libgnomedb-3.99.6:4.0 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	app-text/scrollkeeper"
-
-src_prepare() {
-	# Fix gtk-doc annotation syntax for gobject-introspection-1.34; bug #448992
-	# https://bugzilla.gnome.org/show_bug.cgi?id=684159
-	epatch "../${PN}-1.12.0-annotation-syntax.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-ssindex \
-		--disable-static \
-		--without-gda \
-		--with-zlib \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.14.ebuild b/app-office/gnumeric/gnumeric-1.12.14.ebuild
new file mode 100644
index 000000000000..6ce23d15b572
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.14.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.14.ebuild,v 1.1 2014/04/17 13:02:06 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 flag-o-matic python-single-r1
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+introspection libgda perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.28:2
+	>=gnome-extra/libgsf-1.14.24:=
+	>=x11-libs/goffice-0.10.14:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.2:3
+	x11-libs/cairo:=[svg]
+
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
+	libgda? ( gnome-extra/libgda:5[gtk] )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl) \
+		$(use_with python)
+}