diff options
author | Dan Armak <danarmak@gentoo.org> | 2005-07-28 21:16:26 +0000 |
---|---|---|
committer | Dan Armak <danarmak@gentoo.org> | 2005-07-28 21:16:26 +0000 |
commit | 15245baf7f863a80b581f80bef6e5c16c69ab17e (patch) | |
tree | 0a4ee9c61d0ca2721f7da6fecd92c7534f8f3ef2 /kde-base/kscreensaver | |
parent | Fix qt dep per bug #100235 (diff) | |
download | historical-15245baf7f863a80b581f80bef6e5c16c69ab17e.tar.gz historical-15245baf7f863a80b581f80bef6e5c16c69ab17e.tar.bz2 historical-15245baf7f863a80b581f80bef6e5c16c69ab17e.zip |
KDE 3.4.2 split ebuilds. p.masked, to be unmasked shortly.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'kde-base/kscreensaver')
-rw-r--r-- | kde-base/kscreensaver/ChangeLog | 10 | ||||
-rw-r--r-- | kde-base/kscreensaver/Manifest | 8 | ||||
-rw-r--r-- | kde-base/kscreensaver/files/configure-fix-kdeartwork-libart.patch | 65 | ||||
-rw-r--r-- | kde-base/kscreensaver/files/configure-fix-kdeartwork-xscreensaver.patch | 42 | ||||
-rw-r--r-- | kde-base/kscreensaver/files/digest-kscreensaver-3.4.2 | 1 | ||||
-rw-r--r-- | kde-base/kscreensaver/kscreensaver-3.4.2.ebuild | 20 |
6 files changed, 143 insertions, 3 deletions
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog index 582379fa904e..8437e6700979 100644 --- a/kde-base/kscreensaver/ChangeLog +++ b/kde-base/kscreensaver/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kscreensaver # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.12 2005/07/08 02:50:53 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.13 2005/07/28 21:16:22 danarmak Exp $ + +*kscreensaver-3.4.2 (28 Jul 2005) + + 28 Jul 2005; Dan Armak <danarmak@gentoo.org> + +files/configure-fix-kdeartwork-libart.patch, + +files/configure-fix-kdeartwork-xscreensaver.patch, + +kscreensaver-3.4.2.ebuild: + Version bump to 3.4.2. 08 Jul 2005; Jason Wever <weeve@gentoo.org> kscreensaver-3.4.1.ebuild: Stable on SPARC. diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest index 7826bad9659a..36808ee99908 100644 --- a/kde-base/kscreensaver/Manifest +++ b/kde-base/kscreensaver/Manifest @@ -1,6 +1,10 @@ -MD5 093606d75b364560bcf5cbf8399e2b25 ChangeLog 2012 -MD5 9ce4265ebba659226d1616c56009e1e4 kscreensaver-3.4.0.ebuild 527 +MD5 e5a8ce413e8440eea8206b1e9aa7eee9 kscreensaver-3.4.2.ebuild 687 MD5 39002f99dacfa6fcdc7ec202e3fe3790 kscreensaver-3.4.1.ebuild 520 +MD5 093606d75b364560bcf5cbf8399e2b25 ChangeLog 2012 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 9ce4265ebba659226d1616c56009e1e4 kscreensaver-3.4.0.ebuild 527 MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kscreensaver-3.4.0 68 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kscreensaver-3.4.1 212 +MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kscreensaver-3.4.2 68 +MD5 d4f721aede14b18d9aa83c9d9f18900d files/configure-fix-kdeartwork-libart.patch 2503 +MD5 205c13a78065c2decb403b1984abab5f files/configure-fix-kdeartwork-xscreensaver.patch 1577 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 diff --git a/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild b/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild new file mode 100644 index 000000000000..dfa0c96f32cd --- /dev/null +++ b/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $ + +KMNAME=kdebase +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +DESCRIPTION="KDE screensaver framework" +KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="opengl" +DEPEND="opengl? ( virtual/opengl ) + media-libs/libart_lgpl" # The below patch provides a configure switch, but we've no USE flag for libart +PATCHES="$FILESDIR/configure-fix-kdeartwork-libart.patch" + +src_compile() { + myconf="$myconf `use_with opengl gl`" + kde-meta_src_compile +} |