From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
Date: Sun, 5 Feb 2012 13:09:06 +0000 (UTC) [thread overview]
Message-ID: <4f27dcb6e6cc21c38e498b2cdddc847db0797290.jmbsvicetto@gentoo> (raw)
commit: 4f27dcb6e6cc21c38e498b2cdddc847db0797290
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 13:06:35 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 13:06:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=4f27dcb6
[x11-wm/compiz] Unify release and live ebuilds. Fix git-2 inherit and use EAPI-4.
Apply boost dep patch from bug 378453 - thanks to Ihor Kaharlichenko.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
x11-wm/compiz/ChangeLog | 8 +++++++-
x11-wm/compiz/Manifest | 26 +++++++++++++++++++++++---
x11-wm/compiz/compiz-0.9.2.ebuild | 30 +++++++++++++++++++++---------
x11-wm/compiz/compiz-9999.ebuild | 23 +++++++++++++++--------
4 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index e77b821..d51af8b 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for x11-wm/compiz
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ compiz-0.9.2.ebuild, compiz-9999.ebuild:
+ [x11-wm/compiz] Unify release and live ebuilds. Fix git-2 inherit and use
+ EAPI-4.
+ Apply boost dep patch from bug 378453 - thanks to Ihor Kaharlichenko.
+
10 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
compiz-0.9.2.ebuild, -files/compiz-0.9.2-desktop-gnome-or-not.patch,
compiz-9999.ebuild, +files/compiz-desktop-gnome-or-not.patch:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b539998..d2d4730 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX compiz-desktop-gnome-or-not.patch 1527 RMD160 cd9cf5fa4e972c542ea9447ef3d0a706bd9da238 SHA1 c2d7ac28eea2b921aecbc2055775f263459763a0 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8
AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
DIST compiz-core-0.9.2.tar.bz2 861137 RMD160 43d8f011f1ddc7dc7c1cbce82dcd49432b71a35b SHA1 f0fb9495013c38c86515b7ca6914607910266bf7 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
-EBUILD compiz-0.9.2.ebuild 2245 RMD160 0ac5e1cb542c9aecad3468be9543c2060fa59d09 SHA1 78f454a2dbc93f1405e13c6164e56bd523e2e17b SHA256 d1e9384c8ce364434668052ae6782e108c935a5021c3e56124bdd84f348fdecb
-EBUILD compiz-9999.ebuild 2279 RMD160 2578f6788821971841667ee8a7e18010032244c3 SHA1 29161b30ed72235d15eb9e53e4331a8532c751ac SHA256 56d7391b972aab99c11f9d45899218cab97609dd8dd5709f2da1f20ab06c7eea
-MISC ChangeLog 12576 RMD160 9af0c00bf03e83b54225e37a140919162a0a856a SHA1 fb55bd6133c552401ced397bead81b41d2d0c0f6 SHA256 43321b50ff315674b7c3c7e153adb02a4b2fe34cb370c9a428884056d5e302c2
+EBUILD compiz-0.9.2.ebuild 2348 RMD160 5f58038aec2498905687f0a92467908bd1d517e7 SHA1 67e115421c623380fabec31166cc907db1632a75 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d
+EBUILD compiz-9999.ebuild 2348 RMD160 06ec408805ffa376f632d5682a739a96c10728d8 SHA1 425d3f6ed70a6402b38fc6267d3571dfe8db7cf1 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b
+MISC ChangeLog 12845 RMD160 79d8b94a9772bca3db09017f4088bef00decf415 SHA1 2650ad62426a9cf71426782fa9d2bf8188622a50 SHA256 09e617215d8ed88b8fd9a6701a469e4994297c624294e1b3472df9ecfdec7ba9
MISC metadata.xml 534 RMD160 0bfee331a6814b68bc3e42b8b6ebc2403cb0b87c SHA1 694e5ed4a9e9492e6490c75b2ca2f59908a4accd SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPLn7bAAoJEC8ZTXQF1qEPx3kP/3yUxpPyT38rfndiSGogNiY7
+Me0AuFHQj+r7rsxFv26tEhkJ0Ki2j+LNUUjusxVqonLLQQGsL9wL21UJlriii1MC
+q/Lci0eDSygzcQnasn34fS4OpG4rF5MP9cL4J5DUlR3npkEM/EACCStFzZLxZbQh
+MYiS8729ebnP575lgtPw27q9iFW8Ugvdjf/c9ZvKPOWr7tdJ/YJTwfemUAhWB1pi
+BIRQu4tDAM+jkDOIJnpyaBWsc1fqhiTeFAiKJA9W1jytC6tkUq0FDVrivQrve3lz
+X0AK9j5GpkclJUp9kcdi9oo4tGrSanFnqrF9shaP5CQsaI2SZrwuVTG78aLa13Pt
+1q3NqhEitGeNr1Ekoi9heL9sbBxhKDuMBDu+/DhPLvFVHhiOt/Cw58r8+q6ps74F
+rTJ/UE2vWHTrYl7tgAzL4ENdoJqZTFfJeCFYE3k1SQYjKbFvIIQ8yE4ec7mTM5Az
+GGmAK3289xP1DjvuUjpYqgsA1dYtz4iJY65bndzr5Jh4GoDnQ/AO9cAEvUxOwXLS
+pU7CTxd5AZVxGykfRjelJashx0XLo/RM9UzC6PQgnjUnqsIQfr+vFSOWthm7XsG0
+6xAxI/Oa6YikT6Sw1PUE6fvdpNluuyEtNHKlvnTKzcuxxF6ag+/Xocfo8sI9Ls8j
+7EaZHm2bj7B+WjZkIoTn
+=0REB
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.9.2.ebuild b/x11-wm/compiz/compiz-0.9.2.ebuild
index f3cd24c..aa5ffcb 100644
--- a/x11-wm/compiz/compiz-0.9.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.2.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
-
-MY_PN="${PN}-core"
-MY_P="${MY_PN}-${PV}"
+EAPI=4
if [[ ${PV} != *9999* ]]; then
+ MY_PN="${PN}-core"
+ MY_P="${MY_PN}-${PV}"
SRC_URI="http://releases.compiz.org/${PV}/${MY_P}.tar.bz2"
KEYWORDS="~x86 ~amd64"
+ S="${WORKDIR}/${MY_P}"
else
- GIT_ECLASS="git"
+ GIT_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.compiz-fusion.org/${PN}/core"
SRC_URI=""
KEYWORDS=""
+ S="${WORKDIR}/${PN}"
fi
inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils
@@ -28,6 +29,7 @@ IUSE="gnome gtk kde +svg"
COMMONDEPEND="
!x11-libs/compiz-bcop
+ >=dev-libs/boost-1.34.0
dev-libs/glib:2
dev-libs/libxml2
dev-libs/libxslt
@@ -75,7 +77,13 @@ RDEPEND="${COMMONDEPEND}
x11-apps/xvinfo
"
-S="${WORKDIR}/${MY_P}"
+src_unpack() {
+ if [[ ${PV} != *9999* ]]; then
+ default
+ else
+ git-2_src_unpack
+ fi
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-desktop-gnome-or-not.patch"
@@ -95,11 +103,15 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ cmake-utils_src_compile
+}
+
src_install() {
pushd ${CMAKE_BUILD_DIR}
dodir /usr/share/cmake/Modules
- emake findcompiz_install || die "Failed to install FindCompiz cmake module"
- emake install || die "Failed to install"
+ emake findcompiz_install
+ emake install
popd ${CMAKE_BUILD_DIR}
}
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index f028ac3..32b745e 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=4
if [[ ${PV} != *9999* ]]; then
SRC_URI="http://releases.compiz.org/${PV}/${MY_P}.tar.bz2"
KEYWORDS="~x86 ~amd64"
+ MY_PN="${PN}-core"
+ MY_P="${MY_PN}-${PV}"
+ S="${WORKDIR}/${MY_P}"
else
- GIT_ECLASS="git"
+ GIT_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.compiz-fusion.org/${PN}/core"
SRC_URI=""
KEYWORDS=""
+ S="${WORKDIR}/${PN}"
fi
inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils
@@ -25,6 +29,7 @@ IUSE="gnome gtk kde +svg"
COMMONDEPEND="
!x11-libs/compiz-bcop
+ >=dev-libs/boost-1.34.0
dev-libs/glib:2
dev-libs/libxml2
dev-libs/libxslt
@@ -72,10 +77,12 @@ RDEPEND="${COMMONDEPEND}
x11-apps/xvinfo
"
-S="${WORKDIR}/${PN}"
-
src_unpack() {
- git_src_unpack
+ if [[ ${PV} != *9999* ]]; then
+ default
+ else
+ git-2_src_unpack
+ fi
}
src_prepare() {
@@ -103,8 +110,8 @@ src_compile() {
src_install() {
pushd ${CMAKE_BUILD_DIR}
dodir /usr/share/cmake/Modules
- emake findcompiz_install || die "Failed to install FindCompiz cmake module"
- emake install || die "Failed to install"
+ emake findcompiz_install
+ emake install
popd ${CMAKE_BUILD_DIR}
}
next reply other threads:[~2012-02-05 13:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-05 13:09 Jorge Manuel B. S. Vicetto [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-15 12:06 [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/ Sergey Popov
2012-09-15 12:06 Sergey Popov
2012-09-15 12:26 Sergey Popov
2012-09-16 16:48 Sergey Popov
2012-09-24 10:13 Sergey Popov
2012-09-25 16:27 Sergey Popov
2012-10-03 13:50 Sergey Popov
2012-12-31 10:09 Sergey Popov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4f27dcb6e6cc21c38e498b2cdddc847db0797290.jmbsvicetto@gentoo \
--to=jmbsvicetto@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox