version bump, remove old, update live ebuild

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

7 files changed, 101 insertions, 132 deletions

diff --git a/x11-misc/compton/ChangeLog b/x11-misc/compton/ChangeLog
index c11e36759bf5..1168c6b28d5d 100644
--- a/x11-misc/compton/ChangeLog
+++ b/x11-misc/compton/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/compton
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/ChangeLog,v 1.12 2013/01/29 11:19:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/ChangeLog,v 1.13 2013/08/12 20:47:00 hasufell Exp $
+
+*compton-0.1_beta1 (12 Aug 2013)
+
+  12 Aug 2013; Julian Ospald <hasufell@gentoo.org>
+  -compton-0_pre20120330.ebuild, -compton-0_pre20120913.ebuild,
+  -compton-0_pre20121114.ebuild, +compton-0.1_beta1.ebuild,
+  compton-9999.ebuild:
+  version bump, remove old, update live ebuild
 
   29 Jan 2013; Julian Ospald <hasufell@gentoo.org> compton-9999.ebuild:
   update live ebuild: install additional examples
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index c60a0bcda87e..46aeac85c969 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST compton-0_pre20120330.tar.xz 183012 SHA256 beccda24c900c090b7488369d898b97a6bed06e4576cd4aaaadfbe22f0c5e6a2 SHA512 b54167c3637fe87d7a287f0d5f33d1e4a00127177fef6dfbee7d690cb8370ab860f9ccca4453890e4a22c9bca4a5a384bac769c36ae914f4b0c7a3546b9b004f WHIRLPOOL 7368e58dd22dc7eb27996e3b794de87ba6aa3ececf0fa01629449e0b101b95ac75ef8e398dd1afc01a14f209be549d9d2fbbaa8a5c9d02496f9a2bb89e81e0b4
-DIST compton-0_pre20120913.tar.xz 22508 SHA256 92457d4fcae6390e9e5ba0eb25c016e36bd4c9351e09986bc8a6c9051ddb1d23 SHA512 f74897a57420ef29e5f6b7c143a2ce2594280a36c0f41b6f93c31bfa133ed7a5d5da67f755de25be7439fbffa724f8b276748fae3941d739a0839541aa8116d9 WHIRLPOOL 1ec0ef97e100cd5779b54848a958650bdaf7f9aaa5de0b6c4a9a6fc2acca94582b4d49a0f9eccf627dd810b68fd3e9fc71ad0014e235d54d66e574f6495312f3
-DIST compton-0_pre20121114.tar.xz 45052 SHA256 ddc5e72ca1a07a6eb0f567d7f5e012ecd56978202751b3faef5b64f32d0dd59c SHA512 6377b6987d2842e3a302e0987a032fa4d5c901017080ba5df9f0607ca195abf002f677d77aceeca144d2f09ed27054b9566a460a84736f6a317cd1ca481eb31b WHIRLPOOL 7ad40f993e00e745b7e8fd2550879bd873d4c9363180d4a45daee8325cefee20d188de09ecc1df2c81245eef07aad370d39800f171c0df9603495d48c31581c2
-EBUILD compton-0_pre20120330.ebuild 778 SHA256 767d40b3961ef81ac5f1eff90fdc705b883c3e96e7c544a575a5add11dc11818 SHA512 a94a2fed56947d9960965e6624582ff674d30b0fc7c219ceab5641f63f26ff4fc49e24bcd168e870860d077a3a72139ce3aeaaa600862807490dc218c5577e23 WHIRLPOOL 7debf350e56026081a5b756be8f11c9dbc1323e609a1a0a565eaf499c9c75c47ed91fdbe718a50abc7b2bd81a983a7976f37867d1ed3ee6728ea4f06297f7159
-EBUILD compton-0_pre20120913.ebuild 778 SHA256 e6552625e1738300ea1e87648bba736aed986803c56265c6417426dc68cf9b2b SHA512 4b723408e768fd9ac28aed6e348f2dcb92d3e9adbfd6bcdc5697b9f968ac47fdf96bbdbd7af9d263f1a2a7ecdc905feab92643fb106fe60fa9b67078d89bf670 WHIRLPOOL 0e4d95aceccd1c4f44feb8bab106b000299cf69d2937a9103de44ad5c6a575d2b6716e8a2e25099c2eba57593f70c7a72ab838a912099a70ee2130d9fbe9defe
-EBUILD compton-0_pre20121114.ebuild 944 SHA256 ee52b672808c016ba8fc03962b1dac1b611b76e529b189005e9f624b2d83acee SHA512 b598213af78bf0ffe82b4d6da4c31748da2f47d29186ad8aa018fde1e4a7365fb46926e8d05ff48e56f60f3c2a96828fa266944d54eafbbf7cd7d0aab473423f WHIRLPOOL caede64242d6c2e58ba9733c3e2452dcb87cb35ff2f6bc15fbcd1403f896412afd607a2dc8ae0926b9e5f52b7c121a27129bf7bc29b9ec37eca2e2e2cd83a6bf
-EBUILD compton-9999.ebuild 1409 SHA256 a406c0e7f74819a2c156041ad708be345987b9fe7d3e70823c44a6b841b7ac69 SHA512 94ea7b17369915a96f96ca40ef9d23a36034aa82ec0bfd91c8d2b5d6479686ff87559a2b52f1de6bd9f48518b1062e1b96e5e8fddf8f382373235f43d74a7101 WHIRLPOOL 59d886315d8fe0d62f7cf5578400f9c5e8f5909b80ee8bb2b8a9efcf30ead462f6fb48835062dd7751e57a2c2c1815e31d25ed1d28a577bcdb08700eba1347f3
-MISC ChangeLog 1867 SHA256 fd28aa39e8c8df7048d1844b7e30d84c2b97a0cea1bb59b8046e79b90066ee9d SHA512 9f460e6f4a0b237addda49b87e2099c2316af57c1a0327b8852fd3f7e6e3bc4ecbe5d63218d7bc1bccc4564ae3c340c62fdcd9d6d0b11ee089c1d96ac74056a4 WHIRLPOOL 2ecd4a9f02f4dbc678898568813a35229a24b913175bb441222faea82e3c83d0fa479d63f78a7a0f6edf752d343caa9627641d555d5fd887eafa4349fe42bebd
+DIST compton-0.1_beta1.tar.gz 140466 SHA256 28a770e81ae9e33d759044a75cd2b57329b17bf211cf0e795bc73e56933df8d6 SHA512 fa3e9eb8d85071ac38aa2834f7a14679fce95e1367f6c58987e2d56c5d90e7dd6e3945557e91512199a78bc38eba7f22bdd6efa872d8b108cb33c4579501ae95 WHIRLPOOL faa3a2c23ab1af3f340615bb7593cbd0e81edd36398fb58293ddc543df80ecc13a7e2f2ff8f281cb478f94713896b081b39607c0918d524dfa931a4a1b1c412f
+EBUILD compton-0.1_beta1.ebuild 1694 SHA256 655d9276ca26f2c9bb4392cc62b0b93a7828dada5ce9be8135f7a34c5e80fb30 SHA512 06e889832fc628110a235700fdc1b19a5c3493609b948eaae688bb66297be1af4aa6987dea2fcfe8065f5e91df9378c518e15ef1eb1567c31f5796eeb50eda8c WHIRLPOOL 2b3bae602259dc82686202be9a4a6e725e47743c94b4ccd1029eee6e3716e26e502bc3514b8a6432f61bfcc361203c31cbdf3f233e7923380df94dd07ceed1e3
+EBUILD compton-9999.ebuild 1676 SHA256 da3a0348bced11c6861748550823e67a1786c52e30bc3a89e01707043d0ebbdd SHA512 122d6c225912689d156cdc25063c6be18684a47182df2909f09ae1ee3a1c1060cf59dec4337a806b72c15587c3365a05aa7f343496f39ecc2621ddecfe1f7d03 WHIRLPOOL dcf5a4f6c125665727ef6f4a95bb47910cc2566f1649a15f6d7cc27df9cf0e2ef443cad39165e5b3b406f468011f2c626bfb59bd9b4c9dd24bc57ca8fd5a2981
+MISC ChangeLog 2147 SHA256 f822dfc50f833773b5c4fe950482d4fbadc734abae8079938419440d15104886 SHA512 2ee83fcc0307f64037b55e074020aadf587b919cfa921c97d2fba26dcc6b850d5602e29dc27ee26279a9debf7b5d6b6e0cf526dfda1ff07215cc108ff8212474 WHIRLPOOL bb69938ae9c279461c80d602e103737ce24e3a74b613cc76b44e11fcc099913d685f7618ca84846303842cab3e9863c71b122f1c946238f6ce6d18e116790d6f
 MISC metadata.xml 486 SHA256 1890a542f88b7ad46a66aba2ef3c601a5a4f8b504c75217c0c67185537028b9f SHA512 94b9c947f03cd85113a48ad06e8e708789599103ab1bc028da5d1608b0838b288b11cf28d0687f2e5fd59746a5b49f134719fa39280caac39fae91364bf5c452 WHIRLPOOL c5a49cef5083cb8340fa02e9d34f8aa6c0011540d5fe4c2483fa63f14324c5bfe3f5c2666fd5d17f62f6285f05fa7c4266d9c1c8ea935086c76530273c42bb0c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRB7BKAAoJEFpvPKfnPDWzdOoH/2adHnyEAvqkKExNjLEIf+/9
-AlJT3Tn/pJhoSv7W1pcTt3fPmMuzOc+E7buGZiVv03U226INu9AhSlnTyrNOAxEu
-dN374UQ72cfHXAaA9Owic1AaDPmfmQwcE51oTa1vsEYOqggwrGoGBpicgaCBMTak
-osmwQe4+ZvhilZvc6tcsyfXD25wPAUeYbwxXLkcbGC6+0sG9Bvh2ce2xG9G1QtJc
-VFSFNObFAjTJlZwR9n7zcsleWRPFnr/W0MEX0Fq7Cj5mfrpE5WrJ/S8sJ+Pvpw3S
-7al404ZXfJDDevCUsUjCQ3ZHOUSLH2Ow+dMFD4FxB/R3mWXOywMCVaZ7F4rb3CM=
-=KZR0
+iQEcBAEBCAAGBQJSCUnLAAoJEFpvPKfnPDWzbDoIAKhfI8W1VvtY4ec8TLm1l/W3
+15W031sHXsyTPq+5BMqEaRUiAuWo0iZFMo90LMze3Me9uFeuUmed3SBHyRP5VW2Z
+ae+NWP0VHY66LS73dTuTZmq1LgV2LgsCfCnpm8IPz5aqSxNqMk3hWZvHrDbRn0m+
+7vcUafzhY9AnQaJCmTTewRqcJ2ZGtHSMgF4YT+b2PyZYODe/xyUlOXqr6pSzZjgf
+e+gpsCpjPiMq8g+gE9MAgGsv44TWQL4/+R0D3nCZjERBGUSsTA5TtzejGe1JLHUZ
+dOOewiItdKLTaheQVEKIsR1BxGXaKdTs3t5PZTQaW+VooY2TP3wzKqV9b3F+u+Y=
+=dE5X
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/compton/compton-0.1_beta1.ebuild b/x11-misc/compton/compton-0.1_beta1.ebuild
new file mode 100644
index 000000000000..1ccf5f53fbeb
--- /dev/null
+++ b/x11-misc/compton/compton-0.1_beta1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-0.1_beta1.ebuild,v 1.1 2013/08/12 20:47:00 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_2 python3_3 )
+inherit toolchain-funcs python-r1
+
+DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
+HOMEPAGE="http://github.com/chjj/compton"
+SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +drm opengl +pcre"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libconfig
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( sys-apps/dbus )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre:3 )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-apps/xwininfo
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	x11-proto/xproto
+	drm? ( x11-libs/libdrm )"
+
+nobuildit() { use $1 || echo yes ; }
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake docs
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		emake compton
+}
+
+src_install() {
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		default
+	docinto examples
+	dodoc compton.sample.conf dbus-examples/*
+	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
+}
diff --git a/x11-misc/compton/compton-0_pre20120330.ebuild b/x11-misc/compton/compton-0_pre20120330.ebuild
deleted file mode 100644
index 36ffe82f447e..000000000000
--- a/x11-misc/compton/compton-0_pre20120330.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-0_pre20120330.ebuild,v 1.4 2012/05/06 00:14:51 hasufell Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="http://github.com/chjj/compton"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender"
-RDEPEND="${COMMON_DEPEND}
-	app-shells/bash
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	tc-export CC
-}
diff --git a/x11-misc/compton/compton-0_pre20120913.ebuild b/x11-misc/compton/compton-0_pre20120913.ebuild
deleted file mode 100644
index 62c819fbac70..000000000000
--- a/x11-misc/compton/compton-0_pre20120913.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-0_pre20120913.ebuild,v 1.1 2012/09/24 11:20:28 hasufell Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="http://github.com/chjj/compton"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender"
-RDEPEND="${COMMON_DEPEND}
-	app-shells/bash
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	tc-export CC
-}
diff --git a/x11-misc/compton/compton-0_pre20121114.ebuild b/x11-misc/compton/compton-0_pre20121114.ebuild
deleted file mode 100644
index 7b37435f3770..000000000000
--- a/x11-misc/compton/compton-0_pre20121114.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-0_pre20121114.ebuild,v 1.1 2012/11/17 23:24:46 hasufell Exp $
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="http://github.com/chjj/compton"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/libconfig
-	virtual/opengl
-	dev-libs/libpcre:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender"
-RDEPEND="${COMMON_DEPEND}
-	app-shells/bash
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-libs/libdrm
-	x11-proto/xproto"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	default
-	dodoc compton.sample.conf
-}
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 3a2ce3c8bb1e..792f1d36f91e 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-9999.ebuild,v 1.6 2013/01/29 11:19:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/compton/compton-9999.ebuild,v 1.7 2013/08/12 20:47:00 hasufell Exp $
 
 EAPI=5
 
-inherit toolchain-funcs git-2
+PYTHON_COMPAT=( python3_2 python3_3 )
+inherit toolchain-funcs python-r1 git-2
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
 HOMEPAGE="http://github.com/chjj/compton"
@@ -16,8 +17,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="dbus +drm opengl +pcre"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="dev-libs/libconfig
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libconfig
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
@@ -30,7 +33,8 @@ COMMON_DEPEND="dev-libs/libconfig
 	pcre? ( dev-libs/libpcre:3 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xprop
-	x11-apps/xwininfo"
+	x11-apps/xwininfo
+	virtual/python-argparse[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	virtual/pkgconfig
@@ -40,7 +44,9 @@ DEPEND="${COMMON_DEPEND}
 nobuildit() { use $1 || echo yes ; }
 
 pkg_setup() {
-	tc-export CC
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
 }
 
 src_compile() {
@@ -60,4 +66,5 @@ src_install() {
 		default
 	docinto examples
 	nonfatal dodoc compton.sample.conf dbus-examples/*
+	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
 }