From 32e4c85c82b40c1ac5915312578c43b26348924a Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Thu, 27 Jan 2005 20:56:55 +0000 Subject: Properly fix #41576 this time (#79756). Package-Manager: portage-2.0.51-r15 --- x11-themes/mandrake-artwork/Manifest | 2 +- x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'x11-themes/mandrake-artwork') diff --git a/x11-themes/mandrake-artwork/Manifest b/x11-themes/mandrake-artwork/Manifest index d2ed55a7f531..8c025152000c 100644 --- a/x11-themes/mandrake-artwork/Manifest +++ b/x11-themes/mandrake-artwork/Manifest @@ -4,7 +4,7 @@ MD5 ff5cbcb421a0341672a77e60e4bc252a mandrake-artwork-0.9.ebuild 1509 MD5 e736b7843cfa0fc3ecb53e73b373eb8e mandrake-artwork-0.9.3.ebuild 1645 MD5 f84d2817f52fd9d0ed82d36263ff8f2c ChangeLog 3001 MD5 876f4daa1fa46ced8bcb983f420916c7 mandrake-artwork-0.9.6.ebuild 1646 -MD5 6f905efc1f82b22b2014ff492313c778 mandrake-artwork-1.0.2.ebuild 1793 +MD5 be7a15a8320e7afbf098311ec88b4366 mandrake-artwork-1.0.2.ebuild 1743 MD5 d6467f9fbb56579fe762cd6cc84f6249 mandrake-artwork-0.9.1-r1.ebuild 1473 MD5 4804a4a675bacd135dd2020c63e2e98d mandrake-artwork-0.9.1.ebuild 1512 MD5 3edca42eb97517ded61d3787226a8549 files/digest-mandrake-artwork-0.9.1 70 diff --git a/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild b/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild index d3e4164b677b..3b7dd32ce11f 100644 --- a/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild +++ b/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild,v 1.6 2005/01/26 16:12:44 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/mandrake-artwork-1.0.2.ebuild,v 1.7 2005/01/27 20:56:55 greg_g Exp $ -inherit eutils kde +inherit eutils kde-functions MDK_EXTRAVERSION="1mdk" @@ -22,8 +22,6 @@ RDEPEND=">=x11-libs/gtk+-2.0 DEPEND="${RDEPEND} app-arch/rpm2targz" -need-kde 3.1 - src_unpack() { rpm2targz ${DISTDIR}/${A} tar xz --no-same-owner -f galaxy-${PV}-${MDK_EXTRAVERSION}.src.tar.gz @@ -37,11 +35,12 @@ src_compile() { #epatch ${FILESDIR}/galaxy-gtk24.patch if use kde; then - KDE_PLACE_TO_INSTALL=$(echo $KDEDIR | cut -d/ -f4) + set-qtdir 3 + set-kdedir 3 mv thememdk/mandrake_client/Makefile.in thememdk/mandrake_client/Makefile.in.orig - cat thememdk/mandrake_client/Makefile.in.orig | sed s:\$\{libdir\}\/kwin.la:/usr/kde/$KDE_PLACE_TO_INSTALL/lib/kwin.la:g > thememdk/mandrake_client/Makefile.in + cat thememdk/mandrake_client/Makefile.in.orig | sed s:\$\{libdir\}\/kwin.la:${KDEDIR}/lib/kwin.la:g > thememdk/mandrake_client/Makefile.in rm thememdk/mandrake_client/Makefile.in.orig - econf --with-qt-dir=/usr/qt/3 || die "econf failed" + econf --with-qt-dir=${QTDIR} || die "econf failed" else sed -si s/KDE_CHECK_FINAL// configure.in sed -si s/AC_PATH_KDE// configure.in -- cgit v1.2.3-65-gdbad