From 186b39b11516cc6b87f4e54d939208533160a0a8 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Mon, 13 Apr 2020 18:44:07 +0200 Subject: [PATCH] app-office/abiword: Remove old Closes: https://bugs.gentoo.org/629818 Closes: https://bugs.gentoo.org/690326 Closes: https://bugs.gentoo.org/700492 Closes: https://bugs.gentoo.org/700852 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: David Seifert --- app-office/abiword/Manifest | 2 - app-office/abiword/abiword-3.0.2-r3.ebuild | 168 ------------------ .../abiword-3.0.2-extern-C-template.patch | 29 --- 3 files changed, 199 deletions(-) delete mode 100644 app-office/abiword/abiword-3.0.2-r3.ebuild delete mode 100644 app-office/abiword/files/abiword-3.0.2-extern-C-template.patch diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index 565c7fbc0ced..c92d6517dae4 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,3 +1 @@ -DIST abiword-3.0.2-patchset.tar.xz 11976 BLAKE2B 72acb4956543843ad445525d1f5654c63f2544933aab35a95f0ed4f49e1385c06a29a3deb5b7ba09343188e9adf8f916f0223ab6c2a037424732f5e5bffba103 SHA512 afe6f791f167b40c2fdd16f2308add67990dd1fd0856f5a96e8f486a0af2e7b67cbcde29beacd2d869508e8f98bd3fb140240480882bcd9689cbb1fba6a75743 -DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 DIST abiword-3.0.4.tar.gz 11064305 BLAKE2B fda1732df0bf78f8830c5d68be18f2aec7f88b8d5bb4fe0effc31b48f03d9195a4337087154ba707a70d80bfcff38f92d7298e7b281afe2eacf000eca8dac9c4 SHA512 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 diff --git a/app-office/abiword/abiword-3.0.2-r3.ebuild b/app-office/abiword/abiword-3.0.2-r3.ebuild deleted file mode 100644 index db0ebd4b8daa..000000000000 --- a/app-office/abiword/abiword-3.0.2-r3.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Fully featured yet light and fast cross platform word processor" -HOMEPAGE="http://www.abisource.com/" -SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz - https://dev.gentoo.org/~pacho/gnome/${P}-patchset.tar.xz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips x86 ~amd64-linux ~x86-linux" - -IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus" -# You need 'plugins' enabled if want to enable the extra plugins -REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )" - -RDEPEND=" - >=app-text/wv-1.2 - >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2.16:2 - >=dev-libs/libgcrypt-1.4.5:0= - dev-libs/libxslt - >=gnome-base/librsvg-2.16:2 - >=gnome-extra/libgsf-1.14.18:= - >=media-libs/libpng-1.2:0= - virtual/jpeg:0 - >=x11-libs/cairo-1.10 - >=x11-libs/gtk+-3.0.8:3[cups?] - calendar? ( >=dev-libs/libical-0.46:= ) - eds? ( =x11-libs/goffice-0.10.2:0.10 ) - introspection? ( >=dev-libs/gobject-introspection-1.0.0:= ) - map? ( >=media-libs/libchamplain-0.12:0.12 ) - plugins? ( - collab? ( - >=dev-libs/libxml2-2.4:2 - >=net-libs/loudmouth-1 - net-libs/libsoup:2.4 - net-libs/gnutls:= ) - grammar? ( >=dev-libs/link-grammar-4.2.1 ) - math? ( >=x11-libs/gtkmathview-0.7.5 ) - ots? ( >=app-text/ots-0.5-r1 ) - readline? ( sys-libs/readline:0= ) - thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) - wordperfect? ( - app-text/libwpd:0.10 - app-text/libwpg:0.3 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - ) - redland? ( - >=dev-libs/redland-1.0.10 - >=dev-libs/rasqal-0.9.17 ) - spell? ( >=app-text/enchant-1.2:0 ) - !=psiconv-0.9.4 - use readline && plugins+=(command) - use thesaurus && plugins+=(aiksaurus) - use wmf && plugins+=(wmf) - # wordperfect: >=wpd-0.9 >=wpg-0.2 - use wordperfect && plugins+=(wpg) - fi - - gnome2_src_configure \ - --enable-plugins="${plugins[*]}" \ - --disable-static \ - --disable-default-plugins \ - --disable-builtin-plugins \ - --disable-collab-backend-telepathy \ - --enable-clipart \ - --enable-statusbar \ - --enable-templates \ - --with-gio \ - --without-gnomevfs \ - --without-gtk2 \ - $(use_enable debug) \ - $(use_with goffice goffice) \ - $(use_with calendar libical) \ - $(use_enable cups print) \ - $(use_enable collab collab-backend-xmpp) \ - $(use_enable collab collab-backend-tcp) \ - $(use_enable collab collab-backend-service) \ - $(use_with eds evolution-data-server) \ - $(use_enable introspection) \ - $(use_with map champlain) \ - $(use_with redland) \ - $(use_enable spell) -} diff --git a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch deleted file mode 100644 index 08d2d6cf4e15..000000000000 --- a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b398c84c158ac96bcfc9882b42bee94b074e7fa9 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Mon, 21 Oct 2019 22:55:12 +0200 -Subject: [PATCH] Do not #include evolution-data-server with C linkage - -Fixes #2 https://gitlab.gnome.org/World/AbiWord/issues/2 -Fixes https://bugs.gentoo.org/690162 ---- - src/text/ptbl/xp/pd_DocumentRDF.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp -index 4568bd598..d5849f96b 100644 ---- a/src/text/ptbl/xp/pd_DocumentRDF.cpp -+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp -@@ -1879,9 +1879,7 @@ PD_RDFContact::className() const - - - #ifdef WITH_EVOLUTION_DATA_SERVER --extern "C" { -- #include --}; -+#include - - static std::string get( EVCard* c, const char* v ) - { --- -2.22.0 - -- 2.26.2