Call eautoreconf for bug #174794 and add missing Mono dependency, bug #174851

Package-Manager: portage-2.1.2.4

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 351396af2a3bc57375b46b09f1a7e010d63277e9..9a00db8585093c112e2109ee54f3d922c3781dcc 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.315 2007/04/16 10:27:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.316 2007/04/17 04:49:26 suka Exp $
+
+  17 Apr 2007; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.2.0.ebuild:
+  Call eautoreconf for bug #174794 and add missing Mono dependency, bug #174851
 
 *openoffice-2.2.0 (16 Apr 2007)
 

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index fe54248f911de5053ebc33f34372fdda946e4612..5bb8ed00a8e15b702e65e63d02ceaf9a35a12a2f 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -73,14 +73,14 @@ EBUILD openoffice-2.1.0-r1.ebuild 11909 RMD160 118491742c903bab011d8c9186d1c9042
 MD5 5645ad5f5804202047aa103f962e56ca openoffice-2.1.0-r1.ebuild 11909
 RMD160 118491742c903bab011d8c9186d1c904208ea7d9 openoffice-2.1.0-r1.ebuild 11909
 SHA256 4d3afbe3bb76c6792f70406b9c1c1ddbf052d76c309df1b959671a84a125cc2d openoffice-2.1.0-r1.ebuild 11909
-EBUILD openoffice-2.2.0.ebuild 11681 RMD160 285f308f684ccf1f17c1abf58107d05f49168970 SHA1 15f074c0299e94b349daf73d1d113e070a460075 SHA256 adcac6e82f979193a5a48f9b12a808b8b53e4c2ce062deb780c1fc465ad2c783
-MD5 8bb290c5a12ead77810b2798ecc9b6e3 openoffice-2.2.0.ebuild 11681
-RMD160 285f308f684ccf1f17c1abf58107d05f49168970 openoffice-2.2.0.ebuild 11681
-SHA256 adcac6e82f979193a5a48f9b12a808b8b53e4c2ce062deb780c1fc465ad2c783 openoffice-2.2.0.ebuild 11681
-MISC ChangeLog 65795 RMD160 2d2c1bee0b9638ec870600094bfdaee492d1f3eb SHA1 6e231f43be1b728fb0308e1d6d725ab039bca1ce SHA256 a95cb3e9fb22e3aad4aa801dcc510b4bf13d79e54ce11c04e6816357d75d891e
-MD5 891679d4fe36698d3217fdf151321ac6 ChangeLog 65795
-RMD160 2d2c1bee0b9638ec870600094bfdaee492d1f3eb ChangeLog 65795
-SHA256 a95cb3e9fb22e3aad4aa801dcc510b4bf13d79e54ce11c04e6816357d75d891e ChangeLog 65795
+EBUILD openoffice-2.2.0.ebuild 11723 RMD160 0e8390102a9fba519115bf6b19f33c1d6407d7fb SHA1 5b21f59eea0fa30c364dd234ad1a9609072b6174 SHA256 fcb103e9022d0bd232c89ae3aea5bd83538bc08a14a6c2af8483b31ad73fb0bf
+MD5 9908f7862ff2da91359b3b2f5e197329 openoffice-2.2.0.ebuild 11723
+RMD160 0e8390102a9fba519115bf6b19f33c1d6407d7fb openoffice-2.2.0.ebuild 11723
+SHA256 fcb103e9022d0bd232c89ae3aea5bd83538bc08a14a6c2af8483b31ad73fb0bf openoffice-2.2.0.ebuild 11723
+MISC ChangeLog 65956 RMD160 1fc5c88e8aa232cb96d992bb1c3fc66219061c8e SHA1 e852f46baf4931f7d30725001069a769c5171709 SHA256 0a0bc62180b1db1abfca1592fed4f3d56c3dd65dcc862104cd9fc87d095e13b3
+MD5 2c4b807652ea48a1378829a8d1d40f09 ChangeLog 65956
+RMD160 1fc5c88e8aa232cb96d992bb1c3fc66219061c8e ChangeLog 65956
+SHA256 0a0bc62180b1db1abfca1592fed4f3d56c3dd65dcc862104cd9fc87d095e13b3 ChangeLog 65956
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461

diff --git a/app-office/openoffice/openoffice-2.2.0.ebuild b/app-office/openoffice/openoffice-2.2.0.ebuild
index 9a4be91f5a85e90fad170ec4bfe4b22581c934cb..f8ea8750b4ada9ac5c1902cd7e22d1260e4e07b6 100644 (file)
--- a/app-office/openoffice/openoffice-2.2.0.ebuild
+++ b/app-office/openoffice/openoffice-2.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.1 2007/04/16 10:27:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.2 2007/04/17 04:49:26 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
-inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
 IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav"
 
@@ -70,6 +70,7 @@ COMMON_DEPEND="!app-office/openoffice-bin
                >=dev-java/xalan-2.7
                >=dev-java/xerces-2.7
                =dev-java/xml-commons-external-1.3* )
+       mono? ( >=dev-lang/mono-1.2.3.1 )
        firefox? ( >=www-client/mozilla-firefox-1.5-r9
                >=dev-libs/nspr-4.6.2
                >=dev-libs/nss-3.11-r1 )
@@ -255,6 +256,8 @@ src_unpack() {
 
        echo "`use_enable debug crashdump`" >> ${CONFFILE}
 
+       eautoreconf
+
 }
 
 src_compile() {
@@ -290,7 +293,6 @@ src_compile() {
        export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
 
        cd ${S}
-       autoconf || die
        ./configure ${MYCONF} \
                --with-distro="Gentoo" \
                --with-arch="${ARCH}" \