summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-09-04 22:08:56 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-09-04 22:08:56 +0000
commitc1de543d2b0eeb33750234ddf44c27fa0621a3e9 (patch)
tree13c0e3efb7fdba23973df2ca48dbaa56c14f5795 /x11-plugins/compiz-plugins-main
parentRename gnome USE flag to gconf (like x11-wm/compiz); disable static libs and ... (diff)
downloadgentoo-2-c1de543d2b0eeb33750234ddf44c27fa0621a3e9.tar.gz
gentoo-2-c1de543d2b0eeb33750234ddf44c27fa0621a3e9.tar.bz2
gentoo-2-c1de543d2b0eeb33750234ddf44c27fa0621a3e9.zip
Update the ebuild to follow the -extra ebuild as well.
(Portage version: 2.2_rc75/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/compiz-plugins-main')
-rw-r--r--x11-plugins/compiz-plugins-main/ChangeLog6
-rw-r--r--x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild15
2 files changed, 16 insertions, 5 deletions
diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index 40dfacaee5b4..0905c3b768f5 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/compiz-plugins-main
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.12 2010/09/04 22:01:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.13 2010/09/04 22:08:56 flameeyes Exp $
+
+ 04 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ compiz-plugins-main-0.8.6-r1.ebuild:
+ Update the ebuild to follow the -extra ebuild as well.
*compiz-plugins-main-0.8.6-r1 (04 Sep 2010)
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
index 67a811683ee4..cf0753e9bdea 100644
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
+++ b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.1 2010/09/04 22:01:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.2 2010/09/04 22:08:56 flameeyes Exp $
EAPI="2"
-inherit eutils gnome2-utils
+inherit autotools eutils gnome2-utils
DESCRIPTION="Compiz Fusion Window Decorator Plugins"
HOMEPAGE="http://www.compiz.org/"
@@ -29,10 +29,17 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
>=dev-util/pkgconfig-0.19
>=sys-devel/gettext-0.15
+ gconf? ( gnome-base/gconf )
"
src_prepare() {
- use gconf || epatch "${FILESDIR}"/${PN}-no-gconf.patch
+ if ! use gconf; then
+ epatch "${FILESDIR}"/${PN}-no-gconf.patch
+
+ # required to apply the above patch
+ intltoolize --copy --force || die "intltoolize failed"
+ eautoreconf || die "eautoreconf failed"
+ fi
}
src_configure() {
@@ -40,7 +47,7 @@ src_configure() {
--disable-dependency-tracking \
--enable-fast-install \
--disable-static \
- $(use_enable gconf schemas) || die "econf failed"
+ $(use_enable gconf schemas)
}
src_install() {