Trying to fix KDE4 build problems, once again, see bug #283618

Package-Manager: portage-2.2_rc41/cvs/Linux i686

6 files changed, 100 insertions, 49 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index f38441cee9b9..269e3b7bee27 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.483 2009/09/20 13:49:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.484 2009/09/22 13:01:26 suka Exp $
+
+  22 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  files/gentoo-3.1.1.diff, -files/dbfix.diff, +files/kde4-configure2.diff,
+  openoffice-3.1.1.ebuild:
+  Trying to fix KDE4 build problems, once again, see bug #283618
 
   20 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild, files/gentoo-3.1.1.diff, +files/dbfix.diff:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index f52ee62349ae..2cd15edc8029 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,12 +1,12 @@
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
-AUX dbfix.diff 897 RMD160 1b9f9357bb2f8db9621db19bd78023dba950be03 SHA1 10d663b04efb15f5a40ceba5b494cbe13a68f212 SHA256 9aeca6999b39d5a2ebf77b9e489707c464e30f56ee76f44a28bce85bc3bc6301
 AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49
 AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1 a8aa9bde2cbde25c1fb54a84a4908a6b4f468873 SHA256 5c3e931564cadf9a5d212fab7c4708cf9f131057ffd1e15276dc343c36a4e33d
-AUX gentoo-3.1.1.diff 1952 RMD160 a7a2ceece401a7710a16c23bfe9c9f3265496e8b SHA1 41dd5591368c2ff0662ea37611f8521573970054 SHA256 5a89c2a80dbf0bc99934bee6a48f8567cf459607b38a754167770ea2ed90a20b
+AUX gentoo-3.1.1.diff 1869 RMD160 bd517c6cfe97710cb6f4c1f6a83d5f72c4686098 SHA1 c08c2a393611296e69b0ff46adecd583d24fa020 SHA256 14aa1b87b252c133f0e6917d89b75a42fa3bd5c558db26285771009201f37266
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
+AUX kde4-configure2.diff 3539 RMD160 0ec3e65f8f8fd1aaa708cdb57675b4858404ea32 SHA1 3f66897dfc5ec6d50d4e96f0bffd3e9205f77794 SHA256 78178fcc17b60c336f78ae55282e00c4a5efe01e58a1a5d71d3669a972064aa3
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
@@ -86,6 +86,6 @@ DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766ee
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3
 EBUILD openoffice-3.1.0-r1.ebuild 13569 RMD160 6e7162ea3eff111c981eb03e2dbd510110aba38c SHA1 a2b4c10d0c6877022dbfaac230ab58be9ebe8437 SHA256 ee5e3cd6a7f0d534b036b8d04b4ddaa830aff0d72bb095cea88cc145a68974f2
-EBUILD openoffice-3.1.1.ebuild 13806 RMD160 597d1fcf2db9a0e9a16711a147c49773c69f7ab7 SHA1 e62440ee8c56223aff8940a72171be5cac8bf743 SHA256 78e30d338344e1abd4a896ced3686060ea490bd00a6724e1e4ec9a84059bb4a5
-MISC ChangeLog 100798 RMD160 9e7e82cd1d27716d724e6d384fe41dba8701267e SHA1 c09d76349db02715d65628cbfc1978588f87f060 SHA256 221c94132be55bcd7945d5711a73fac39988ed7119fcc93b2c830cbfc761ad4b
+EBUILD openoffice-3.1.1.ebuild 13817 RMD160 e730460b52d548136364f5400821637423b80687 SHA1 0922cbb9a6b520eeb74b7fcb6a6879910db7c7f8 SHA256 f0e8e4ded2a8fb231a3d1cc3db10e050f56814afd13f26ef0d45b8e1ca3f68ef
+MISC ChangeLog 101019 RMD160 26a977392fba2609451b6aa382199455a43c5fa2 SHA1 6acc849401f05688cfff7197839d4f6c0212cb0d SHA256 60cee3f6f87a4340a217931dbc9e190486b7de8d6c370250b6525e483a316651
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/dbfix.diff b/app-office/openoffice/files/dbfix.diff
deleted file mode 100644
index 776248c33f21..000000000000
--- a/app-office/openoffice/files/dbfix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.in.orig 
-+++ configure.in 
-@@ -3932,23 +3932,6 @@
-     if test "$DB_INCLUDES" = ""; then
-        AC_MSG_ERROR(no. install the db4-dev package)
-     fi
--    AC_MSG_CHECKING([whether db is at least 4.1])
--    for v in `seq 1 7`; do
--       AC_TRY_RUN([
--#include <db.h>
--
--int main(int argc, char **argv) {
--       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
--       else return 1;
--}
--       ], [DB_VERSION_MINOR=$v], [])
--    done
--    if test "$DB_VERSION_MINOR" -gt "1"; then
--       AC_MSG_RESULT([OK])
--       DB_VERSION=4.$DB_VERSION_MINOR
--    else
--       AC_MSG_ERROR([no. you need at least db 4.1])
--    fi
-     save_LIBS="$LIBS"
-     for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
-
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
index 2319b5faa34c..35e273314dd1 100644
--- a/app-office/openoffice/files/gentoo-3.1.1.diff
+++ b/app-office/openoffice/files/gentoo-3.1.1.diff
@@ -11,29 +11,29 @@
  
  [ LinuxOnly ]
  # fix that allows OOo to work with a standard (unpatched) libjpeg,
---- patches/dev300/kde4-configure.diff 
-+++ patches/dev300/kde4-configure.diff 
-@@ -104,7 +104,7 @@
- +MOC4="moc"
- +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
- +   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
--+   qt_libdirs="$QTLIB /usr/lib $x_libraries"
-++   qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries"
- +   
- +   kde_incdirs="/usr/include $x_includes"
- +   kde_libdirs="/usr/lib $x_libraries"
 --- patches/dev300/system-db-check.diff 
 +++ patches/dev300/system-db-check.diff 
-@@ -12,7 +12,7 @@
+@@ -12,14 +12,16 @@
  -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
  -        ], []
  -    )
 -+    for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
++-    AC_MSG_CHECKING([whether db is at least 4.1])
++-    for v in `seq 1 7`; do
 ++    for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
  +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
  +    done
  +    if test "$DB_INCLUDES" = ""; then
-@@ -32,7 +32,7 @@
+ +       AC_MSG_ERROR(no. install the db4-dev package)
+ +    fi
+-     AC_MSG_CHECKING([whether db is at least 4.1])
+-     for v in 1 2 3 4 5; do
+++     AC_MSG_CHECKING([whether db is at least 4.1])
+++    for v in `seq 1 8`; do
+         AC_TRY_RUN([
+ @@ -3302,12 +3300,13 @@
+      else
+@@ -32,7 +34,7 @@
  -      [AC_MSG_ERROR([db not installed or functional])], [])
  -    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
  +    save_LIBS="$LIBS"
@@ -42,4 +42,3 @@
  +       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
  +    done
  +    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
-
diff --git a/app-office/openoffice/files/kde4-configure2.diff b/app-office/openoffice/files/kde4-configure2.diff
new file mode 100644
index 000000000000..69b367237811
--- /dev/null
+++ b/app-office/openoffice/files/kde4-configure2.diff
@@ -0,0 +1,74 @@
+--- configure.in.old	2009-08-26 12:25:16.000000000 +0200
++++ configure.in	2009-09-15 14:09:26.000000000 +0200
+@@ -6158,8 +6158,8 @@ KDE4_CFLAGS=""
+ KDE4_LIBS=""
+ MOC4="moc"
+ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+-   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-   qt_libdirs="$QTLIB /usr/lib $x_libraries"
++   qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes"
++   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
+    
+    kde_incdirs="/usr/include $x_includes"
+    kde_libdirs="/usr/lib $x_libraries"
+@@ -6169,6 +6169,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+    fi
+ 
++   if test -n "$KDE4DIR" ; then
++      kde_incdirs="$KDE4DIR/include $kde_incdirs"
++      if test "$build_cpu" != "x86_64" ; then
++         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
++      else
++         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
++      fi
++   fi
++
+    qt_test_include="Qt/qobject.h"
+    qt_test_library="libQtCore.so"
+    kde_test_include="ksharedptr.h"
+@@ -6185,7 +6194,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    
+    AC_MSG_RESULT([$qt_header_dir])
+    if test "x$qt_header_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+    
+    AC_MSG_CHECKING([for Qt4 libraries])
+@@ -6200,14 +6209,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE
+    AC_MSG_RESULT([$qt_lib_dir])
+    
+    if test "x$qt_lib_dir" = "xno" ; then
+-      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
++      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for Meta Object Compiler
+-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
++   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
+    if test "$MOC4" = "no" ; then
+       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+-the root of your Qt installation by exporting QTDIR before running "configure".])
++the root of your Qt installation by exporting QT4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 headers
+@@ -6221,7 +6230,7 @@ the root of your Qt installation by expo
+    done
+    AC_MSG_RESULT([$kde_incdir])
+    if test "x$kde_incdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    dnl Check for KDE4 libraries
+@@ -6236,7 +6245,7 @@ the root of your Qt installation by expo
+    
+    AC_MSG_RESULT([$kde_libdir])
+    if test "x$kde_libdir" = "xno" ; then
+-      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
++      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+ 
+    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index fd06beb90ac7..9eeeb6c19e5a 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.6 2009/09/20 13:49:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.7 2009/09/22 13:01:26 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -243,7 +243,7 @@ src_prepare() {
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/dbfix.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/kde4-configure2.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then
@@ -304,7 +304,7 @@ src_prepare() {
 
 src_configure() {
 
-	use kde && export KDEDIR="${KDEDIR}"
+	use kde && export KDE4DIR="${KDEDIR}"
 
 	# Use multiprocessing by default now, it gets tested by upstream
 	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")