diff options
author | Mike Frysinger <vapier@gentoo.org> | 2003-11-13 06:21:04 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2003-11-13 06:21:04 +0000 |
commit | ac424490569a8f2adf4de56ea88cd8fe87129966 (patch) | |
tree | aba33487f9a6c88f71a23481ace0130a221220a3 /x11-themes | |
parent | fix inheritance (diff) | |
download | gentoo-2-ac424490569a8f2adf4de56ea88cd8fe87129966.tar.gz gentoo-2-ac424490569a8f2adf4de56ea88cd8fe87129966.tar.bz2 gentoo-2-ac424490569a8f2adf4de56ea88cd8fe87129966.zip |
fix inheritance
Diffstat (limited to 'x11-themes')
-rw-r--r-- | x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild | 62 | ||||
-rw-r--r-- | x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild | 10 |
2 files changed, 34 insertions, 38 deletions
diff --git a/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild b/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild index f2c81af0c1f1..a5097a9da291 100644 --- a/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild +++ b/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild @@ -1,18 +1,19 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild,v 1.3 2003/11/12 15:35:36 brad Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/mandrake-artwork-0.9.3.ebuild,v 1.4 2003/11/13 06:21:04 vapier Exp $ + +inherit eutils -IUSE="kde" MDK_EXTRAVERSION="1mdk" DESCRIPTION="Mandrake's Galaxy theme for GTK1, GTK2, Metacity and KDE" HOMEPAGE="http://www.mandrakelinux.com" SRC_URI="mirror://gentoo/galaxy-${PV}-${MDK_EXTRAVERSION}.src.rpm" + LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ~ppc ~alpha" - -inherit eutils +IUSE="kde" # Needed to build... DEPEND="app-arch/rpm2targz @@ -22,38 +23,35 @@ DEPEND="app-arch/rpm2targz kde? ( >=kde-base/kdebase-3.1* )" src_unpack() { - cd ${WORKDIR} - rpm2targz ${DISTDIR}/${A} - tar xz --no-same-owner -f galaxy-${PV}-${MDK_EXTRAVERSION}.src.tar.gz - tar xj --no-same-owner -f galaxy-${PV}.tar.bz2 + rpm2targz ${DISTDIR}/${A} + tar xz --no-same-owner -f galaxy-${PV}-${MDK_EXTRAVERSION}.src.tar.gz + tar xj --no-same-owner -f galaxy-${PV}.tar.bz2 } src_compile() { - cd ${WORKDIR}/galaxy-${PV} - #make distclean - - if use kde; then - KDE_PLACE_TO_INSTALL=$(echo $KDEDIR | cut -d/ -f4) - 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 - rm thememdk/mandrake_client/Makefile.in.orig - econf --with-qt-dir=/usr/qt/3 - else - sed -si s/KDE_CHECK_FINAL// configure.in - sed -si s/AC_PATH_KDE// configure.in - autoconf - sed -si s/thememdk// Makefile.am - sed -si s/thememdk// Makefile.in - automake - fi - econf || die - emake || die + cd ${WORKDIR}/galaxy-${PV} + #make distclean + + if use kde; then + KDE_PLACE_TO_INSTALL=$(echo $KDEDIR | cut -d/ -f4) + 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 + rm thememdk/mandrake_client/Makefile.in.orig + econf --with-qt-dir=/usr/qt/3 + else + sed -si s/KDE_CHECK_FINAL// configure.in + sed -si s/AC_PATH_KDE// configure.in + autoconf + sed -si s/thememdk// Makefile.am + sed -si s/thememdk// Makefile.in + automake + fi + econf || die + emake || die } src_install () { - cd ${WORKDIR}/galaxy-${PV} - einstall || die - - cd ${WORKDIR}/galaxy-${PV} - dodoc AUTHORS COPYING README ChangeLog + cd ${WORKDIR}/galaxy-${PV} + einstall || die + dodoc AUTHORS COPYING README ChangeLog } diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild index 9c9cd44c8030..4cc831eb1794 100644 --- a/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild +++ b/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild,v 1.2 2003/11/12 09:04:28 tad Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.88.ebuild,v 1.3 2003/11/13 06:19:12 vapier Exp $ + +inherit eutils rpm RH_EXTRAVERSION="1" DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus" HOMEPAGE="http://www.redhat.com" SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~ppc ~alpha ~sparc" @@ -27,10 +30,6 @@ DEPEND="sys-devel/autoconf # OR gdm, we don't want any run-time dependencies... RDEPEND="" -inherit eutils rpm - -S="${WORKDIR}/${P}" - # We need to change some RedHat-specific stuff to Gentoo-style... _replace() { FROM=$1 @@ -179,4 +178,3 @@ src_install () { cd ${S} dodoc AUTHORS NEWS README ChangeLog } - |