Drop old as bsd won't keyword this.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

4 files changed, 6 insertions, 174 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index eeb02e7324d4..7d1c423e66cc 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.238 2011/03/16 07:45:18 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.239 2011/03/18 16:39:29 pacho Exp $
+
+  18 Mar 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/11_history_fullpath.dpatch, -abiword-2.4.6.ebuild,
+  -files/freebsd_fix.patch:
+  Drop old as bsd won't keyword this.
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> abiword-2.4.6.ebuild,
   abiword-2.8.6.ebuild, abiword-2.8.6-r1.ebuild:
diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
deleted file mode 100644
index ee0bdd4a1b0b..000000000000
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ /dev/null
@@ -1,89 +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.4.6.ebuild,v 1.20 2011/03/16 07:45:18 nirbheek Exp $
-
-EAPI="1"
-
-inherit alternatives eutils fdo-mime
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86-fbsd"
-IUSE="debug gnome spell xml"
-
-RDEPEND="dev-libs/popt
-		 sys-libs/zlib
-		 >=dev-libs/glib-2:2
-		 >=x11-libs/gtk+-2.4:2
-		 >=x11-libs/pango-1.2
-		 x11-libs/libXft
-		 >=gnome-base/libglade-2:2.0
-		 >=gnome-base/libgnomeprint-2.2:2.2
-		 >=gnome-base/libgnomeprintui-2.2:2.2
-		 >=media-libs/libpng-1.2:1.2
-		 >=media-libs/fontconfig-2.1
-		 >=app-text/wv-1
-		 >=dev-libs/fribidi-0.10.4
-		 xml? ( >=dev-libs/libxml2-2.4.10 )
-		 !xml? ( dev-libs/expat )
-		 spell? ( >=app-text/enchant-1.1 )
-		 gnome?	(
-					>=gnome-base/libbonobo-2
-					>=gnome-base/libgnomeui-2.2
-					>=gnome-extra/gucharmap-1.4
-				)"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-S="${WORKDIR}/${P}/abi"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/11_history_fullpath.dpatch
-	epatch "${FILESDIR}"/freebsd_fix.patch
-}
-
-src_compile() {
-	econf $(use_enable debug)           \
-		  $(use_enable debug symbols)   \
-		  $(use_enable gnome)           \
-		  $(use_enable gnome gucharmap) \
-		  $(use_enable spell enchant)   \
-		  $(use_with xml libxml2)       \
-		  "--enable-threads"            \
-		  "--disable-scripting"         \
-		  "--with-sys-wv"               \
-	|| die "configure failed"
-
-	emake all-recursive || die "build failed"
-}
-
-src_install() {
-	dodir /usr/{bin,lib}
-	emake DESTDIR="${D}" icondir="/usr/share/pixmaps" install || die "install failed"
-
-	dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop
-
-	rm -f "${D}"/usr/bin/abiword
-	rm -f "${D}"/usr/bin/abiword-2.4
-	dosym AbiWord-2.4 /usr/bin/abiword-2.4
-
-	dodoc *.TXT user/wp/readme.txt
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-
-	elog "As of version 2.4, all abiword plugins have been moved"
-	elog "into a seperate abiword-plugins package"
-	elog "You can install them by running emerge abiword-plugins"
-}
diff --git a/app-office/abiword/files/11_history_fullpath.dpatch b/app-office/abiword/files/11_history_fullpath.dpatch
deleted file mode 100644
index 059dac6cc2ab..000000000000
--- a/app-office/abiword/files/11_history_fullpath.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 11_history_fullpath.dpatch by Joshua Kwan <joshk@triplehelix.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Store absolute paths, however gnarly, into history, when relative file
-## DP: paths are used on the command line.
-
---- abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp~	2004-11-23 02:02:17.000000000 -0800
-+++ abiword-2.2.0/abi/src/wp/ap/xp/ap_App.cpp	2004-11-23 02:02:04.000000000 -0800
-@@ -18,6 +18,8 @@
-  * 02111-1307, USA.
-  */
- 
-+#include <limits.h>
-+
- #include "ap_Features.h"
- #include "ap_App.h"
- #include "ap_Args.h"
-@@ -50,13 +50,45 @@
- {
- 	int kWindowsOpened = 0;
- 	const char *file = NULL;
-+
-+#ifdef WIN32
-+# define arch_separator '\\'
-+#else
-+# define arch_separator '/'
-+#endif
-+	char cwd[PATH_MAX];
- 	poptContext poptcon = args->poptcon;
-+	
-+	getcwd(cwd, PATH_MAX);
- 
- 	while ((file = poptGetArg (poptcon)) != NULL) {
- 		XAP_Frame * pFrame = newFrame();
-+		char* fullpath = NULL;
-+		
-+		if (*file != arch_separator)
-+		{
-+			size_t file_len = strlen(file);
-+#ifdef WIN32
-+			if (file_len > 1 && (file[1] != ':' || !(file[0] != '\\' && file[1] != '\\'))) /* check for C:\Blah.doc and \\share\Blah.doc */
-+#endif
-+			{
-+				size_t len = strlen(cwd) + file_len + 2; /* C/F + NUL */
-+				fullpath = (char*)malloc(len);
-+
-+				/* First, resolve the path into an absolute one as best as we can */
-+				snprintf(fullpath, len, "%s%c%s", cwd, arch_separator, file);
-+			}
-+		}
- 
- 		UT_Error error = pFrame->loadDocument
--			(file, IEFT_Unknown, true);
-+			(fullpath ? fullpath : file, IEFT_Unknown, true);
-+		
-+		if (fullpath != NULL)
-+		{
-+			free (fullpath);
-+			fullpath = NULL;
-+		}
-+
- 		if (!error)
- 		{
- 			kWindowsOpened++;
-@@ -74,6 +106,7 @@
- 			pFrame->loadDocument(NULL, IEFT_Unknown);
- 			pFrame->raise();
- 
-+			/* OK to use relative path here. We get it */
- 			errorMsgBadFile (pFrame, file, error);
- 		}
- 
diff --git a/app-office/abiword/files/freebsd_fix.patch b/app-office/abiword/files/freebsd_fix.patch
deleted file mode 100644
index 9e95194c18bf..000000000000
--- a/app-office/abiword/files/freebsd_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/af/util/xp/ut_iconv.cpp.orig	Tue Jan 10 00:18:13 2006
-+++ src/af/util/xp/ut_iconv.cpp	Tue Jan 10 00:18:31 2006
-@@ -67,7 +67,7 @@
- #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
- (defined (__MACH__) && defined (__APPLE__)) || \
- (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
--defined (__AIX__) || defined(__OpenBSD__) || \
-+defined (__AIX__) || defined(__OpenBSD__) || defined (__FreeBSD__) || \
- (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
- 
- #define ICONV_CONST const