old

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 13 insertions, 167 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index ef1edddf0a0a..87d30c171860 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.255 2012/02/12 14:34:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.256 2012/03/17 05:46:11 ssuominen Exp $
+
+  17 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -abiword-2.8.6-r1.ebuild:
+  old
 
   12 Feb 2012; Raúl Porcel <armin76@gentoo.org> abiword-2.8.6-r2.ebuild:
   alpha/ia64/sparc stable wrt #401461
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index d615c4926f81..7a8c22c7c41f 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -5,14 +5,17 @@ AUX abiword-2.8.6-gcc46.patch 557 RMD160 406dbd7dc80f374e9a163684b494de9a504c09a
 AUX abiword-2.8.6-libpng15.patch 3710 RMD160 7de98b2183cd21a6d538bea8fba86a1c4d35a21e SHA1 646736e4e71a92574f4ccb7bc17ae422a13f04c2 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90
 AUX abiword-2.8.6-libwpd.patch 15024 RMD160 2f48380cae981624cc44c552391c4a7fcd076872 SHA1 38f7074905afcdd2dbc8a6b9a8f6da080f7200d0 SHA256 92f89f04633f67d0568160e701815a5daf0a2de03608a1a3bd5b8f7e7f4f0fea
 DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
-EBUILD abiword-2.8.6-r1.ebuild 4635 RMD160 1685482e91ff79c7d0f580a5eaa862ae280686db SHA1 60f8eab53b786a3ef95b3acfe3be643295b49732 SHA256 9ffd64c34aa45e8042f88021d9fb97ae59176596a74821e09104e010f91e6fff
 EBUILD abiword-2.8.6-r2.ebuild 4754 RMD160 a0ff254c79a9b25cfbba4afd88b4c4c5ed87ff47 SHA1 7529a623d0e9c561fd0e0812fc582fc7641f75c0 SHA256 c49e42f0e60b4c19506e12801f28929b6591883375471dc1f707e9a4ba928c1e
-MISC ChangeLog 34751 RMD160 c52510c51de98ae7ccf23fbbe5b596e610ab16c3 SHA1 a4b99bd3e0a459ba8001f32a6b2f9e9be4839c42 SHA256 aafab1ecb0d34bb646dfdc3d90d15385ff59c0f7ce4c48f29eca389e559a8618
+MISC ChangeLog 34840 RMD160 d4b5e80f228715bad997524049a340f1e2337639 SHA1 39aec726f6ef44aea7312883154b29a889194da3 SHA256 df19d9ded54b86a46b136f6e4d1300fa77788dd35aa3d0cf7ec69680c1cdf92e
 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk83zeUACgkQuQc30/atMkAehgCgoAqi8xbmbGs2FdHdfW1lLsvb
-yZ4An39DskCEzzBvT9nnLQmOvropNGAV
-=CTYI
+iQEcBAEBAgAGBQJPZCUcAAoJEEdUh39IaPFNMTcH/0H4/VeuvyxXliAkGujQlZbE
+4IUnsH1zgCBvYgLlP0vlOvmClDStOVWzw/LID4ooJPOqEIZVxcJydTTY+wkbSOV0
+hHdaBamQhAcSq/ykmyOrZcG1WnnZxAW0pxaXvamh7uQPYkxglvNctkcUAKwIW/fH
+pm9ryeEq5+mt5Ry8nWj1dBbSvbv0dF9TvAmZ0/BIYGHNxH9dQpQWpsgawJCbzVHG
+qsU6zIST2FPw1NiA+oUWTLKJVAI5XZ6OerPUndVyoUoO8dfcVZpz+2qM1vCms57k
+7Fa6gqXBR5YoI7oq1Qg1A4mLrjIdXTsabLYtIULxLy4n+M836mCMGNRYZmC/8p8=
+=OQ40
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.8.6-r1.ebuild b/app-office/abiword/abiword-2.8.6-r1.ebuild
deleted file mode 100644
index 72e829894b82..000000000000
--- a/app-office/abiword/abiword-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r1.ebuild,v 1.12 2011/09/23 12:46:50 pacho Exp $
-
-EAPI="3"
-
-inherit alternatives eutils gnome2 versionator autotools
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="collab cups gnome grammar latex math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
-
-# libgsf raised to make sure it provides gio backend (ebuild)
-# not enabling telepathy backend for collab, it depends on libempathy-gtk which
-# has be removed from empathy-2.30 already
-RDEPEND="
-	>=app-text/wv-1.2
-	>=dev-libs/fribidi-0.10.4
-	>=dev-libs/glib-2.16:2
-	>=gnome-base/librsvg-2.16:2
-	>=gnome-extra/libgsf-1.14.15
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	>=x11-libs/cairo-1.8[X]
-	>=x11-libs/gtk+-2.14:2[cups?]
-	gnome? (
-		>=gnome-extra/gucharmap-2
-		>=x11-libs/goffice-0.8:0.8 )
-	plugins? (
-		collab? (
-			>=dev-libs/boost-1.33.1
-			>=dev-libs/libxml2-2.4
-			>=net-libs/loudmouth-1
-			net-libs/libsoup:2.4
-			net-libs/gnutls )
-		grammar? ( >=dev-libs/link-grammar-4.2.1 )
-		latex? ( dev-libs/libxslt )
-		math? ( >=x11-libs/gtkmathview-0.7.5 )
-		openxml? ( dev-libs/boost )
-		ots? ( >=app-text/ots-0.5 )
-		readline? ( sys-libs/readline )
-		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
-		wordperfect? (
-			app-text/libwpd:0.8
-			app-text/libwpg:0.1 )
-		wmf? ( >=media-libs/libwmf-0.2.8 )
-	)
-	spell? ( >=app-text/enchant-1.2 )
-	!<app-office/abiword-plugins-2.8"
-#		svg? ( >=gnome-base/librsvg-2 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	collab? ( dev-cpp/asio )"
-
-pkg_setup() {
-	# do not enable gnome-vfs
-	G2CONF="${G2CONF}
-		--enable-shave
-		--disable-static
-		--disable-maintainer-mode
-		--disable-default-plugins
-		--disable-builtin-plugins
-		--disable-collab-backend-telepathy
-		--enable-clipart
-		--enable-statusbar
-		--enable-templates
-		--with-gio
-		--without-gnomevfs
-		$(use_with gnome goffice)
-		$(use_enable cups print)
-		$(use_enable collab collab-backend-xmpp)
-		$(use_enable collab collab-backend-tcp)
-		$(use_enable collab collab-backend-service)
-		$(use_enable spell)"
-}
-
-src_configure() {
-	local plugins=""
-
-	if use plugins; then
-		# Plugins depending on libgsf
-		plugins="t602 docbook clarisworks wml kword hancom openwriter pdf
-			loadbindings mswrite garble pdb applix opendocument sdw xslfo"
-
-		# Plugins not depending on anything
-		plugins="${plugins} gimp bmp freetranslation iscii s5 babelfish opml eml
-			wikipedia gdict passepartout google presentation urldict hrtext mif"
-
-		# inter7eps: eps.h
-		# libtidy: gsf + tidy.h
-		# paint: windows only ?
-		use collab && plugins="${plugins} collab"
-		use gnome && plugins="${plugins} goffice"
-		use latex && plugins="${plugins} latex"
-		use math && plugins="${plugins} mathview"
-		use openxml && plugins="${plugins} openxml"
-		use ots && plugins="${plugins} ots"
-		# psion: >=psiconv-0.9.4
-		use readline && plugins="${plugins} command"
-		# plugin doesn't build
-		#use svg && plugins="${plugins} rsvg"
-		use thesaurus && plugins="${plugins} aiksaurus"
-		use wmf && plugins="${plugins} wmf"
-		# wordperfect: >=wpd-0.8 >=wps-0.1
-		use wordperfect && plugins="${plugins} wpg"
-	fi
-
-	gnome2_src_configure --enable-plugins="$(echo ${plugins})"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-
-	# install icon to pixmaps (bug #220097)
-	sed 's:$(datadir)/icons:$(datadir)/pixmaps:' \
-		-i Makefile.am Makefile.in || die "sed 1 failed"
-	# readme.txt will be installed using dodoc
-	sed '/readme\.txt\|abw/d' \
-		-i user/wp/Makefile.am user/wp/Makefile.in || die "sed 2 failed"
-
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
-		-i "${ED}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
-
-	mv "${ED}/usr/bin/abiword" "${ED}/usr/bin/AbiWord-${MY_MAJORV}"
-	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
-
-	dodoc AUTHORS user/wp/readme.txt || die "dodoc failed"
-
-	# Not needed
-	find "${D}" -name "*.la" -delete || die "failed *.la removal"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-}