Moved instances of epatch from src_compile to src_unpack. Added patch to -2.4.6 so...

Package-Manager: portage-2.1.2-r4

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 1705218fc1ffe2cd12d9b30315c6bd12890c72a1..287aa184af92dac21382f0cc886d9ca772ceeb79 100644 (file)
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.165 2007/01/25 05:10:46 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.166 2007/01/25 21:46:18 welp Exp $
+
+  25 Jan 2007; Peter Weller <welp@gentoo.org> +files/freebsd_fix.patch,
+  abiword-2.4.5-r1.ebuild, abiword-2.4.6.ebuild:
+  Moved instances of epatch from src_compile to src_unpack. Added patch to
+  -2.4.6 so it works on x86-fbsd
 
   25 Jan 2007; Marius Mauch <genone@gentoo.org> abiword-2.4.4.ebuild,
   abiword-2.4.5.ebuild, abiword-2.4.5-r1.ebuild, abiword-2.4.6.ebuild:

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 1ca6d4d539495d0e46c91efa508136d179595a18..be958155a74c92f2384f32226668046155ae78f5 100644 (file)
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f
 MD5 63f15ae133398949d37b721215fb669f files/11_history_fullpath.dpatch 1905
 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f files/11_history_fullpath.dpatch 1905
@@ -21,6 +18,10 @@ AUX abiword-2.4.4-x86_64.patch 621 RMD160 2561574d5d6655b59d9bfebf35bef0e70d3ea9
 MD5 d94e3b2b55ddb3c34a6e138d636716f9 files/abiword-2.4.4-x86_64.patch 621
 RMD160 2561574d5d6655b59d9bfebf35bef0e70d3ea935 files/abiword-2.4.4-x86_64.patch 621
 SHA256 37d03289985d29de217c8f54f300567772b0133f41fea614de0f63cdff3ef71d files/abiword-2.4.4-x86_64.patch 621
+AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c39b6964ef1e24652c026c344513facd94c88226 SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5
+MD5 46e15ee319c4b994af4a37cb56cf55db files/freebsd_fix.patch 550
+RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 files/freebsd_fix.patch 550
+SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5 files/freebsd_fix.patch 550
 DIST abiword-2.2.11.tar.bz2 23952057 RMD160 e3c802056d95bf8dcb27decfd3556a12712e78d0 SHA1 3a8a7b55be77de838293fd36a9cff9c1e37dcc8d SHA256 a7b5f8419ad7af0a942747c1bc8a5b919c0a6d753d6bfcf6aa58b1fb416abd88
 DIST abiword-2.4.4.tar.bz2 24687425 RMD160 5fad618b07b13a543f55321dd3e8114105cefd5d SHA1 e2afde95a408f011a1877bc6647799777845dd18 SHA256 94c83290dd056a1b49024dd40ca62305818508643b21b69a0b758bd12de96252
 DIST abiword-2.4.5.tar.bz2 24930028 RMD160 f0de27f97135f8fff9b4400b05d74a27eee348cd SHA1 bca02a8beb490246f785518fc82c6c557a77a88d SHA256 b8e5f61697c6d796e8f9f0812886666487fd0125bc777ca093c096b4b3e31264
@@ -33,22 +34,22 @@ EBUILD abiword-2.4.4.ebuild 2415 RMD160 cdf0bb2eee685c704ef71a31e7e9ba34fa173d86
 MD5 ae7ec9a9f29ada49aaf6d3686c46d8e7 abiword-2.4.4.ebuild 2415
 RMD160 cdf0bb2eee685c704ef71a31e7e9ba34fa173d86 abiword-2.4.4.ebuild 2415
 SHA256 563b31173725267f616f602d9f8255f4edccc402072212011f7fc1a33921efec abiword-2.4.4.ebuild 2415
-EBUILD abiword-2.4.5-r1.ebuild 2577 RMD160 85ebec558a58aea2369dc35e1aadfe89751a0c21 SHA1 2c1fcf5c484f7cefbfa012688bf551ce761d0b8a SHA256 fee08ce28162121c13b4c26d13725c1e58fd77c82a2e9303d8fc89e1229c19aa
-MD5 bf8b9b752f5a8786c6470f8a9cbfc769 abiword-2.4.5-r1.ebuild 2577
-RMD160 85ebec558a58aea2369dc35e1aadfe89751a0c21 abiword-2.4.5-r1.ebuild 2577
-SHA256 fee08ce28162121c13b4c26d13725c1e58fd77c82a2e9303d8fc89e1229c19aa abiword-2.4.5-r1.ebuild 2577
+EBUILD abiword-2.4.5-r1.ebuild 2503 RMD160 532872ab56559688b6def640b983142b1194f279 SHA1 82628c9d3a7fc2c1f2b3dc2709b64d650354186d SHA256 8ff4b89b344f23b442129c1b9849f822198570dce1b990de084308b7a5db0174
+MD5 dc50928c55d957cce1189732346d061d abiword-2.4.5-r1.ebuild 2503
+RMD160 532872ab56559688b6def640b983142b1194f279 abiword-2.4.5-r1.ebuild 2503
+SHA256 8ff4b89b344f23b442129c1b9849f822198570dce1b990de084308b7a5db0174 abiword-2.4.5-r1.ebuild 2503
 EBUILD abiword-2.4.5.ebuild 2329 RMD160 795673e435f216bb57e7b5f7f70e8b4e0ba16964 SHA1 97ffd7c6060cbbf4ba88fb1d62d90ff13fce86ae SHA256 637f5e6ab5a2d945a5e61620c4df029a56fbf1a69fa941651ee4e6fdb5297cd1
 MD5 e9199b509050c2ff9ff84c09f3790a9c abiword-2.4.5.ebuild 2329
 RMD160 795673e435f216bb57e7b5f7f70e8b4e0ba16964 abiword-2.4.5.ebuild 2329
 SHA256 637f5e6ab5a2d945a5e61620c4df029a56fbf1a69fa941651ee4e6fdb5297cd1 abiword-2.4.5.ebuild 2329
-EBUILD abiword-2.4.6.ebuild 2379 RMD160 c403e48c44f7b0625ff6988bc8dbbb8624f81728 SHA1 a7c09c33950e0f0aacdb33f96441652778e4efa9 SHA256 d2bc01119073b5a98864c1f0d0c8a6805cfdb9c0729945b7f88bd398e59b78a7
-MD5 f06f0dedb5a2211b554e2fa89d30b3d4 abiword-2.4.6.ebuild 2379
-RMD160 c403e48c44f7b0625ff6988bc8dbbb8624f81728 abiword-2.4.6.ebuild 2379
-SHA256 d2bc01119073b5a98864c1f0d0c8a6805cfdb9c0729945b7f88bd398e59b78a7 abiword-2.4.6.ebuild 2379
-MISC ChangeLog 22268 RMD160 6923b59d3e25920c56d34b932b49dedb2dc0352a SHA1 528383f01a59f0d5b3b21f6de281de1b34f4d906 SHA256 2ed5ea82954603e4437831d7d00cea5fa9f704d9bddb90fa64d0720c09fdc0a6
-MD5 94fb38d9422e462ffd2fd70f9881feb1 ChangeLog 22268
-RMD160 6923b59d3e25920c56d34b932b49dedb2dc0352a ChangeLog 22268
-SHA256 2ed5ea82954603e4437831d7d00cea5fa9f704d9bddb90fa64d0720c09fdc0a6 ChangeLog 22268
+EBUILD abiword-2.4.6.ebuild 2403 RMD160 598c6e4172adf34984138c4002e20e1de69ded51 SHA1 50c750dfc7eb4dc69588f0749f7daeabb000bb02 SHA256 0eff95bde0a4c5f548df415f72c77a30563fb59964c3c0c11648edc4a7b428fd
+MD5 efe3fc7f19b919ec42d11390dbfc5e6c abiword-2.4.6.ebuild 2403
+RMD160 598c6e4172adf34984138c4002e20e1de69ded51 abiword-2.4.6.ebuild 2403
+SHA256 0eff95bde0a4c5f548df415f72c77a30563fb59964c3c0c11648edc4a7b428fd abiword-2.4.6.ebuild 2403
+MISC ChangeLog 22496 RMD160 7399543db19d6ae0ae9d95331d8347b02f23e312 SHA1 44a9d868e9a4979a65c9986088e5f73bce53d84a SHA256 f719c244530e38b263de910f8977c615c1d998f4f213b2a8be0780e85b3f0a7e
+MD5 71a93dcf9516a494d0beb5c9261ab669 ChangeLog 22496
+RMD160 7399543db19d6ae0ae9d95331d8347b02f23e312 ChangeLog 22496
+SHA256 f719c244530e38b263de910f8977c615c1d998f4f213b2a8be0780e85b3f0a7e ChangeLog 22496
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
 MD5 3b7f9b4ae874f21ec05137f8038bdd69 metadata.xml 165
 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 metadata.xml 165
@@ -68,10 +69,3 @@ SHA256 d4ae306dba2e6b8eeb394067a42a2f54673d02aa7f6fa925404ff388861d2a0d files/di
 MD5 5dbd7872b931b68fa28ab54e13931c46 files/digest-abiword-2.4.6 250
 RMD160 6f8fd2d3c94f1a4e7982e8451d509feb0df716de files/digest-abiword-2.4.6 250
 SHA256 911bc982da26f97f12a01bd174727d451cd3baccc66d7ec433f256093009386e files/digest-abiword-2.4.6 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFuD5+6J2i8a8J4okRAgIpAKCmrk1tngLXqUXcYJormI+6kqXlgACg06z/
-b0kSTCgoa7u/lHRAF0xAPL8=
-=bC02
------END PGP SIGNATURE-----

diff --git a/app-office/abiword/abiword-2.4.5-r1.ebuild b/app-office/abiword/abiword-2.4.5-r1.ebuild
index af5c37126d0c64958e229572c994d8691bdf9ae6..a62171c7bb947e82deb80969405c3f2cd6fa70ba 100644 (file)
--- a/app-office/abiword/abiword-2.4.5-r1.ebuild
+++ b/app-office/abiword/abiword-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.5-r1.ebuild,v 1.3 2007/01/25 05:10:46 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.5-r1.ebuild,v 1.4 2007/01/25 21:46:18 welp Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -38,13 +38,15 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/abi
 
-src_compile() {
-       # Patch taken from debian to use full path for file history
-       epatch ${FILESDIR}/11_history_fullpath.dpatch
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
 
-       # Patch taken from debian to prevent crash on exit
-       epatch ${FILESDIR}/16_fcfini_crash.dpatch
+       epatch ${FILESDIR}/11_history_fullpath.dpatch
+       epatch ${FILESDIR}/11_fcfini_crash.dpatch
+}
 
+src_compile() {
        # this is a hack since I don't want to go hack in the gnome-vfs
        # headerfiles. The issue is about gnome-vfs containing "long long"
        # which makes gcc 3.3.1 balk

diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
index 3d0cdd683746adedcb958c90c9613a9cbe6f74d5..31e44bd6373825e10006d8287d13c2839ae01045 100644 (file)
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ b/app-office/abiword/abiword-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3 2007/01/25 05:10:46 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.4 2007/01/25 21:46:18 welp Exp $
 
 inherit alternatives eutils fdo-mime
 
@@ -40,10 +40,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}/abi"
 
-src_compile() {
-       # Patch from debian to use fullpath for file history
+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)           \

diff --git a/app-office/abiword/files/freebsd_fix.patch b/app-office/abiword/files/freebsd_fix.patch
new file mode 100644 (file)
index 0000000..9e95194
--- /dev/null
+++ b/app-office/abiword/files/freebsd_fix.patch
@@ -0,0 +1,11 @@
+--- 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