From 691e3a1e15c62c84748042eb67662daeb45c844b Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Tue, 5 Jun 2012 16:24:35 +0400 Subject: [PATCH] compiz-plugins-main: fix QA issues, bump EAPI version, fix dependencies --- x11-plugins/compiz-plugins-main/Manifest | 3 ++- .../compiz-plugins-main-0.8.8-r9999.ebuild | 19 ++++++++----------- x11-plugins/compiz-plugins-main/metadata.xml | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 x11-plugins/compiz-plugins-main/metadata.xml diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest index a4f3a5d..63df12e 100644 --- a/x11-plugins/compiz-plugins-main/Manifest +++ b/x11-plugins/compiz-plugins-main/Manifest @@ -1,3 +1,4 @@ AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da DIST compiz-plugins-main-0.8.8.tar.bz2 1230627 RMD160 b6835f95d2f5e3e46bf36fe4e5347b08debcda19 SHA1 3c99841b744ae6c4a3edf2019626484880607dc6 SHA256 c79278b5369660d6274661a2c196f1cb016ef2b5d34e30bd18dbaeb241bee248 -EBUILD compiz-plugins-main-0.8.8-r9999.ebuild 1403 RMD160 f080d6b5f7b678ef28cbc4e00369f292f9d89bc3 SHA1 d87a87334f3c0c25e5a798ab72b20e1052683c36 SHA256 7aa45b32b82a440595bd9ad9ec8cb65b7402fed4bfc18428d46dc3fb8c1961c8 +EBUILD compiz-plugins-main-0.8.8-r9999.ebuild 1253 RMD160 65d50f5ee198ba181a75525b93bc87a576487158 SHA1 cb0d2b34358fa714d905f1faa50b1926948fa0db SHA256 a0553dff427ea813917fe5c44ea75e7a1c3f52bbdce8574cef7e9d112b58681d +MISC metadata.xml 612 RMD160 2c509701c4d10caa747d3d5ecdac89d591d92fba SHA1 fa635c34711c80e4f7d430c67421aeb7839daca1 SHA256 70c3031e9483ffa40727107ea5272d67501f24a44d2e7040356572490c4e34a6 diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild index de10177..89cd557 100644 --- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild +++ b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.4 2011/03/21 19:50:33 nirbheek Exp $ -EAPI="2" +EAPI="4" inherit autotools eutils gnome2-utils @@ -15,30 +15,27 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="gconf" -MY_PV="0.8.4" - RDEPEND=" >=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 x11-libs/cairo - >=x11-libs/compiz-bcop-${MY_PV} + >=x11-libs/compiz-bcop-${PV} >=x11-wm/compiz-${PV}[gconf?] " DEPEND="${RDEPEND} >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.19 + virtual/pkgconfig >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) " +DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO" + src_prepare() { 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" + eautoreconf fi } @@ -51,7 +48,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default find "${D}" -name '*.la' -delete || die } diff --git a/x11-plugins/compiz-plugins-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml new file mode 100644 index 0000000..f80d46d --- /dev/null +++ b/x11-plugins/compiz-plugins-main/metadata.xml @@ -0,0 +1,16 @@ + + + +desktop-effects + +Package with the base compiz-fusion plugins: +animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring, +scaleaddon, shift, snap, text, thumbnail, vpswitch,, wall, winrules, workarounds. + + + + Install GConf schemas for the plugins, needed when using the GConf-based + configuration backend in x11-wm/compiz. + + +