summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-plugins/compiz-plugins-main/ChangeLog6
-rw-r--r--x11-plugins/compiz-plugins-main/Manifest10
-rw-r--r--x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild15
3 files changed, 21 insertions, 10 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/Manifest b/x11-plugins/compiz-plugins-main/Manifest
index b953725af978..222d4706d681 100644
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ b/x11-plugins/compiz-plugins-main/Manifest
@@ -7,14 +7,14 @@ DIST compiz-plugins-main-0.8.4.tar.bz2 1221256 RMD160 ea438b5b608dc084e50bac94a0
DIST compiz-plugins-main-0.8.6.tar.bz2 1226802 RMD160 7eefc691c26199487309fc5e5b0993bfe3f3dd86 SHA1 6cd9c6a48c570061ac0b6275a6acddd8415b8611 SHA256 66dc4f349b11dbeac08f941d2d3443aa9b80d82f35c304db747ff383491ed6d9
EBUILD compiz-plugins-main-0.8.4-r1.ebuild 1168 RMD160 cefe7cdc802cefd2d640736f39f2fbc80491645e SHA1 d9e8b96924c710173ef58ad36cf3dd4667632357 SHA256 ae9d3ff18cd296432cd77ffd3c1cb6f24aa0f83fcee3d6c0724d0928861896b5
EBUILD compiz-plugins-main-0.8.4.ebuild 1084 RMD160 c780c41ba0c2a396778ac984b4cac25167aafd77 SHA1 b7a29bb356b24b03c812f940c38f76d3fcf99899 SHA256 c967bdc180b2f50673e766232a54edec5644b742e656c80e2407acd17ae3ec29
-EBUILD compiz-plugins-main-0.8.6-r1.ebuild 1232 RMD160 be2e59f7063791a90587d9d599f6e6c73f6cddf3 SHA1 efca72c0761346929830b4540ec5e949c564bac6 SHA256 0dd5ff58e4649699dd72e59c16e0c21c5b4ab9d8c036d817a0fd0b8d552b3088
+EBUILD compiz-plugins-main-0.8.6-r1.ebuild 1401 RMD160 a5c11f642356fcbf548a7921f9fc6cd1de743bae SHA1 24d12e77d59990af15ead2fa4fd5e7b51a92e1f1 SHA256 a4e7de4309fbfd9342f87f9840d7addf4d6348de2c36de5cc9a277c8b4f8117c
EBUILD compiz-plugins-main-0.8.6.ebuild 1104 RMD160 2b47719110746193ec9e9a75d900cb7b4a2ef4da SHA1 f6d0920e9b16361f1a6ad764a63fff4f38b20ec2 SHA256 f7c0bac689509f5d9a4ced1d0127b3bd51df8e6940675ba0b66d43413a70c63b
-MISC ChangeLog 2833 RMD160 50b6defe29dbe058f61ff523a8d9eea6000d2842 SHA1 8164dc2e348ae985777a857431374b2c47683a55 SHA256 7bc400468dd02728f64255e6b513b1ccd8010d3d79aa7724c9116aaf60705424
+MISC ChangeLog 2986 RMD160 719701503472a39406cdfd6ca308fa7bd3d3d7b7 SHA1 c109dad7435be673aeb9088a7466169a3ec4ca19 SHA256 48d25435cd108c58c97f97cb47a6ca39f314c47c85ed4c92f98c312930205cc1
MISC metadata.xml 612 RMD160 2c509701c4d10caa747d3d5ecdac89d591d92fba SHA1 fa635c34711c80e4f7d430c67421aeb7839daca1 SHA256 70c3031e9483ffa40727107ea5272d67501f24a44d2e7040356572490c4e34a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyCwacACgkQAiZjviIA2XgMtQCg81nTFRGq3aWQ2KdlUPuYBFQC
-zzAAoKlsVoalNnWVamyL26thpQ7aI29L
-=cSh3
+iEYEARECAAYFAkyCw34ACgkQAiZjviIA2XgwlgCdF1+VieXRSGYOb1Sq/yhsOBUp
+kckAnil8vKruLnEBsIsZbsQrqyfc6Su3
+=uJW1
-----END PGP SIGNATURE-----
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() {