public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jason Zaman" <perfinion@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/
Date: Sun,  8 May 2016 04:30:41 +0000 (UTC)	[thread overview]
Message-ID: <1462681176.33aa498599d070ece03bac11c3c2e8af654a937f.perfinion@gentoo> (raw)

commit:     33aa498599d070ece03bac11c3c2e8af654a937f
Author:     Jan Chren <dev.rindeal <AT> gmail <DOT> com>
AuthorDate: Thu Apr 28 20:59:55 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun May  8 04:19:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aa4985

net-libs/libproxy: EAPI6 + update mycmakeargs

- `-DWITH_KDE4` -> `-DWITH_KDE` (https://github.com/libproxy/libproxy/commit/bd9bf72e15107e6c6133b438c700dd42d79c9d60)

Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Gentoo-Bug: 574046

 net-libs/libproxy/libproxy-0.4.13.ebuild | 54 ++++++++++++++------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild
index 0a9b94c..9b8a91a 100644
--- a/net-libs/libproxy/libproxy-0.4.13.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-multilib eutils flag-o-matic mono python-r1
@@ -49,6 +50,28 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.4.12-macosx.patch"
 )
 
+multilib_src_configure() {
+	local mycmakeargs=(
+		'-DPERL_VENDORINSTALL=ON'
+		# WITH_VALA just copies the .vapi file over and needs no deps,
+		# hence always enable it unconditionally
+		'-DWITH_VALA=ON'
+		"-DCMAKE_C_FLAGS=${CFLAGS}"
+		"-DCMAKE_CXX_FLAGS=${CXXFLAGS}"
+		"-DWITH_GNOME3=$(usex gnome)"
+		"-DWITH_KDE=$(usex kde)"
+		"-DWITH_DOTNET=$(multilib_is_native_abi	&& usex mono || echo 'OFF')"
+		"-DWITH_NM=$(usex networkmanager)"
+		"-DWITH_PERL=$(multilib_is_native_abi	&& usex perl || echo 'OFF')"
+		"-DWITH_PYTHON=$(multilib_is_native_abi	&& usex python || echo 'OFF')"
+		"-DWITH_MOZJS=$(multilib_is_native_abi	&& usex spidermonkey || echo 'OFF')"
+		"-DWITH_WEBKIT=$(multilib_is_native_abi	&& usex webkit || echo 'OFF')"
+		"-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')"
+		"-DBUILD_TESTING=$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
 src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
 
@@ -56,35 +79,6 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
-multilib_src_configure() {
-	# WITH_VALA just copies the .vapi file over and needs no deps,
-	# hence always enable it unconditionally
-	local mycmakeargs=(
-			-DPERL_VENDORINSTALL=ON
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-			$(cmake-utils_use_with gnome GNOME3)
-			$(multilib_is_native_abi && cmake-utils_use_with kde KDE4 \
-				|| echo -DWITH_KDE4=OFF)
-			$(multilib_is_native_abi && cmake-utils_use_with mono DOTNET \
-				|| echo -DWITH_DOTNET=OFF)
-			$(cmake-utils_use_with networkmanager NM)
-			$(multilib_is_native_abi && cmake-utils_use_with perl PERL \
-				|| echo -DWITH_PERL=OFF)
-			$(multilib_is_native_abi && cmake-utils_use_with python PYTHON \
-				|| echo -DWITH_PYTHON=OFF)
-			$(multilib_is_native_abi && cmake-utils_use_with spidermonkey MOZJS \
-				|| echo -DWITH_MOZJS=OFF)
-			$(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT \
-				|| echo -DWITH_WEBKIT=OFF)
-			$(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT3 \
-				|| echo -DWITH_WEBKIT3=OFF)
-			-DWITH_VALA=ON
-			$(cmake-utils_use test BUILD_TESTING)
-	)
-	cmake-utils_src_configure
-}
-
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	einstalldocs


             reply	other threads:[~2016-05-08  4:30 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-08  4:30 Jason Zaman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-14 16:54 [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/ Arthur Zamarin
2025-10-13  3:02 Sam James
2025-10-12 19:43 Sam James
2025-10-12 19:43 Sam James
2025-10-12 19:43 Sam James
2025-09-17 17:47 Sam James
2025-09-10  4:47 Sam James
2025-01-09 20:10 Andreas Sturmlechner
2025-01-09  0:08 Sam James
2024-12-14 17:47 Sam James
2024-12-09 19:20 Arthur Zamarin
2024-12-08 18:26 Sam James
2024-12-08 17:34 Arthur Zamarin
2024-12-08 17:34 Arthur Zamarin
2024-12-08 17:34 Arthur Zamarin
2024-12-08 17:34 Arthur Zamarin
2024-10-30 15:28 Matt Turner
2024-09-10 19:27 Andreas Sturmlechner
2024-06-16 19:11 Arthur Zamarin
2024-05-05  9:33 Sam James
2024-05-05  9:33 Sam James
2024-05-05  9:33 Sam James
2024-05-05  9:33 Sam James
2024-05-05  8:18 Sam James
2024-05-05  8:18 Sam James
2024-05-05  8:18 Sam James
2024-04-07 15:45 Pacho Ramos
2024-03-26 16:32 Andreas Sturmlechner
2024-03-26 16:32 Andreas Sturmlechner
2024-02-24 20:15 Matt Turner
2023-07-21 23:01 Matt Turner
2023-07-19 15:07 Sam James
2023-07-19  9:33 Sam James
2023-07-18 21:25 Sam James
2023-07-18 21:25 Sam James
2023-07-18 21:25 Sam James
2023-07-18 21:25 Sam James
2023-07-09  7:59 Sam James
2023-06-17  2:25 Sam James
2023-06-17  2:25 Sam James
2023-05-16 23:32 Matt Turner
2022-08-17 14:29 Sam James
2022-08-17 13:09 Agostino Sarubbo
2022-08-17  4:53 Arthur Zamarin
2022-08-17  4:53 Arthur Zamarin
2022-08-17  4:53 Arthur Zamarin
2022-08-16 18:17 Arthur Zamarin
2022-08-16 18:16 Arthur Zamarin
2022-05-26  4:45 WANG Xuerui
2021-05-21  0:51 Yixun Lan
2021-02-26 21:19 Andreas Sturmlechner
2021-02-25 11:30 Sam James
2021-02-18 21:47 Sam James
2021-02-18  8:39 Sam James
2021-02-17  0:10 Sam James
2021-02-12 13:47 Sam James
2021-02-11  9:30 Sam James
2020-12-31  1:38 Sam James
2020-12-31  1:38 Sam James
2020-12-21  9:41 Sergei Trofimovich
2020-12-20 16:40 Thomas Deutschmann
2020-12-18 10:25 Sergei Trofimovich
2020-12-18 10:16 Sergei Trofimovich
2020-12-17 11:54 Sam James
2020-12-17 11:41 Sam James
2020-12-17  7:59 Sam James
2020-03-29  8:38 Mart Raudsepp
2020-02-24 13:11 Agostino Sarubbo
2020-02-24 11:43 Agostino Sarubbo
2020-02-24 11:31 Agostino Sarubbo
2020-02-24 11:28 Agostino Sarubbo
2020-02-24 10:07 Agostino Sarubbo
2020-02-20 18:47 Sergei Trofimovich
2020-02-20 18:47 Sergei Trofimovich
2020-02-18 16:24 Agostino Sarubbo
2020-01-16 19:44 Andreas Sturmlechner
2020-01-16 19:42 Andreas Sturmlechner
2020-01-16 19:42 Andreas Sturmlechner
2020-01-16 19:14 Ben Kohler
2020-01-13 19:26 Andreas Sturmlechner
2018-06-28 19:05 Andreas Sturmlechner
2018-03-25 20:40 Gilles Dartiguelongue
2017-06-23 11:44 Alexis Ballier
2017-02-11 14:49 Pacho Ramos
2017-02-10 18:47 Pacho Ramos
2017-01-29 19:33 Fabian Groffen
2016-08-17  4:19 Jeroen Roovers
2016-08-17  3:53 Jeroen Roovers
2016-07-06  9:23 Agostino Sarubbo
2016-06-25 20:14 Agostino Sarubbo
2016-06-11 16:44 Agostino Sarubbo
2016-06-08 19:35 Markus Meier
2016-06-01 15:10 Tobias Klausmann
2016-05-08  9:26 Pacho Ramos
2016-05-08  4:30 Jason Zaman
2016-05-08  4:30 Jason Zaman
2016-05-08  4:30 Jason Zaman
2016-05-08  4:30 Jason Zaman
2016-05-08  4:30 Jason Zaman
2016-05-08  4:30 Jason Zaman

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=1462681176.33aa498599d070ece03bac11c3c2e8af654a937f.perfinion@gentoo \
    --to=perfinion@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