[gentoo-commits] proj/qt:master commit in: x11-misc/compton-conf/

[gentoo-commits] proj/qt:master commit in: x11-misc/compton-conf/

[Michael Palimaka]

commit:     3d5695e8a62e9fd66db29bc2e5b4d22075a90ada
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 11 13:16:44 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 11 13:16:44 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3d5695e8

[x11-misc/compton-conf] Avoid needless src_unpack override.

Package-Manager: portage-2.2.10

---
 x11-misc/compton-conf/compton-conf-0.1.0.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11-misc/compton-conf/compton-conf-0.1.0.ebuild b/x11-misc/compton-conf/compton-conf-0.1.0.ebuild
index bbcb112..cb675d5 100644
--- a/x11-misc/compton-conf/compton-conf-0.1.0.ebuild
+++ b/x11-misc/compton-conf/compton-conf-0.1.0.ebuild
@@ -28,7 +28,4 @@ DEPEND="dev-qt/qtcore:4
 	x11-misc/compton"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-	S=${WORKDIR}
-}
+S=${WORKDIR}

[gentoo-commits] proj/qt:master commit in: x11-misc/compton-conf/

[Ben de Groot]

commit:     a67c5ba0c1bfb9bfc0932143ceb97326f32936a3
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 25 14:10:16 2014 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Thu Dec 25 14:10:16 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a67c5ba0

x11-misc/compton-conf: add qt5 support to live ebuild

---
 x11-misc/compton-conf/compton-conf-9999.ebuild | 28 +++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/x11-misc/compton-conf/compton-conf-9999.ebuild b/x11-misc/compton-conf/compton-conf-9999.ebuild
index 0f4665f..73d0220 100644
--- a/x11-misc/compton-conf/compton-conf-9999.ebuild
+++ b/x11-misc/compton-conf/compton-conf-9999.ebuild
@@ -19,11 +19,25 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
+IUSE="qt4 +qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	x11-libs/libX11
-	x11-misc/compton"
-RDEPEND="${DEPEND}"
+RDEPEND="x11-libs/libX11
+	x11-misc/compton
+	qt4? ( dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4 )
+	qt5? ( dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtwidgets:5 )"
+DEPEND="${RDEPEND}
+	dev-libs/libconfig
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		$( cmake-utils_use_use qt5 QT5 )
+	)
+	cmake-utils_src_configure
+}

[gentoo-commits] proj/qt:master commit in: x11-misc/compton-conf/

[Michael Palimaka]

commit:     f6c1b2863353bb1e26a5a134121b0344ac0556f5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 14:22:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 14:27:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6c1b286

x11-misc/compton-conf: dev-qt/linguist-tools is a build-time dependency

Package-Manager: portage-2.2.20.1

 x11-misc/compton-conf/compton-conf-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/compton-conf/compton-conf-9999.ebuild b/x11-misc/compton-conf/compton-conf-9999.ebuild
index c88d244..1bc13d1 100644
--- a/x11-misc/compton-conf/compton-conf-9999.ebuild
+++ b/x11-misc/compton-conf/compton-conf-9999.ebuild
@@ -27,12 +27,12 @@ RDEPEND="x11-libs/libX11
 	qt4? ( dev-qt/qtcore:4
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4 )
-	qt5? ( dev-qt/linguist-tools:5
-		dev-qt/qtcore:5
+	qt5? ( dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtwidgets:5 )"
 DEPEND="${RDEPEND}
 	dev-libs/libconfig
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 src_configure() {