KDE 3.4.2 split ebuilds. p.masked, to be unmasked shortly.

(Portage version: 2.0.51.22-r2)

3 files changed, 108 insertions, 0 deletions

diff --git a/kde-base/kscreensaver/files/configure-fix-kdeartwork-libart.patch b/kde-base/kscreensaver/files/configure-fix-kdeartwork-libart.patch
new file mode 100644
index 000000000000..499c5c31e10f
--- /dev/null
+++ b/kde-base/kscreensaver/files/configure-fix-kdeartwork-libart.patch
@@ -0,0 +1,65 @@
+Index: kscreensaver/configure.in.in
+===================================================================
+--- kscreensaver/configure.in.in	(revision 428301)
++++ kscreensaver/configure.in.in	(working copy)
+@@ -36,33 +36,42 @@
+ AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
+ AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
+ 
++AC_ARG_WITH(libart,
++  [AS_HELP_STRING(--with-libart,
++    [enable support for libart @<:@default=check@:>@])],
++  [], with_libart=check)
++
+ LIBART=
++if test "x$with_libart" != xno; then
++  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
++    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
++  ])
+ 
+-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+-  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+-])
+-
+-if test -n "$LIBART_CONFIG"; then
+-  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+-  if test -n "$vers" && test "$vers" -ge 2003008
+-  then
+-     LIBART_LIBS="`$LIBART_CONFIG --libs`"
+-     LIBART_RPATH=
+-     for args in $LIBART_LIBS; do
++  if test -n "$LIBART_CONFIG"; then
++    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++    if test -n "$vers" && test "$vers" -ge 2003008; then
++      LIBART_LIBS="`$LIBART_CONFIG --libs`"
++      LIBART_RPATH=
++      for args in $LIBART_LIBS; do
+ 	  case $args in
+ 	    -L*)
+ 	       LIBART_RPATH="$LIBART_RPATH $args"
+ 	       ;;
+           esac
+-     done
+-     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+-     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-     LIBART=yes
++      done
++      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++      LIBART=yes
+ 
+-     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+-  else
+-     AC_MSG_WARN([You need at least libart 2.3.8])
++      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
++    else
++      AC_MSG_WARN([You need at least libart 2.3.8])
++    fi
+   fi
++
++  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
++      AC_MSG_FAILURE([--with-libart was given, but test for libart failed])
++  fi
+ fi
+ 
+ AC_SUBST(LIBART_LIBS)
diff --git a/kde-base/kscreensaver/files/configure-fix-kdeartwork-xscreensaver.patch b/kde-base/kscreensaver/files/configure-fix-kdeartwork-xscreensaver.patch
new file mode 100644
index 000000000000..9ea69ce70eac
--- /dev/null
+++ b/kde-base/kscreensaver/files/configure-fix-kdeartwork-xscreensaver.patch
@@ -0,0 +1,42 @@
+Index: kscreensaver/kxsconfig/configure.in.bot
+===================================================================
+--- kscreensaver/kxsconfig/configure.in.bot	(revision 428301)
++++ kscreensaver/kxsconfig/configure.in.bot	(working copy)
+@@ -1,4 +1,4 @@
+-if test "$XSCREENSAVER" = "NO"; then
++if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
+   echo ""
+   echo "xscreensaver could not be detected on your system."
+   echo "Check www.jwz.org/xscreensaver if you're loving to"
+Index: kscreensaver/kxsconfig/configure.in.in
+===================================================================
+--- kscreensaver/kxsconfig/configure.in.in	(revision 428301)
++++ kscreensaver/kxsconfig/configure.in.in	(working copy)
+@@ -22,7 +22,14 @@
+ done
+ IFS=$old_IFS
+ 
+-KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
++AC_ARG_WITH(xscreensaver,
++  [AS_HELP_STRING(--with-xscreensaver,
++    [enable support for xscreensaver @<:@default=check@:>@])],
++  [], with_xscreensaver=check)
++
++XSCREENSAVER=NO
++if test "x$with_xscreensaver" != xno; then
++  KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
+    [
+         KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
+         [
+@@ -38,6 +45,11 @@
+         ])
+    ])
+ 
++  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
++    AC_MSG_FAILURE([--with-xscreensaver was given, but test for xscreensaver failed])
++  fi
++fi
++
+ XSCREENSAVER_HACKS_DIR=
+ 
+ if test "$XSCREENSAVER" != "NO"; then
diff --git a/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2 b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2
new file mode 100644
index 000000000000..d855af2ae699
--- /dev/null
+++ b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2
@@ -0,0 +1 @@
+MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433