[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/
Date: Mon,  6 Nov 2017 07:10:59 +0000 (UTC)	[thread overview]
Message-ID: <1509952243.db01d59aa45c2be75b088ed5ae41cd6a1baa8811.soap@gentoo> (raw)

commit:     db01d59aa45c2be75b088ed5ae41cd6a1baa8811
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 07:10:43 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 07:10:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db01d59a

media-sound/audacious: Readd support for GTK+3

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/audacious/Manifest              |  1 +
 media-sound/audacious/audacious-3.9.ebuild  | 18 +++++++++++++-----
 media-sound/audacious/audacious-9999.ebuild | 18 +++++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index d663c459ec5..b30fd688980 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -4,5 +4,6 @@ DIST audacious-3.7.1-gtk3.tar.bz2 571720 SHA256 30d63066916d0de32891c74b6b39e3c9
 DIST audacious-3.7.1.tar.bz2 571450 SHA256 c8366870aea21d5f4a5a282dee45fba99390e4e3d5164cd119e343f79e9ecbbf SHA512 4c74fcfa6e575375501828905f01ed1e769d88fa346a99162c6800da5bc6aa33ec5598c5de1201c4e24cadb31b8c36768ea390aa4884de6bdbf42b0bea5a31a8 WHIRLPOOL 19fb9e0bd4b606e09ef21a66b8684fbc5ccac4e97c0f26abe96b42851fc3a2c629d89b39ec3f9a5ec82a779a2d6a5ae56ab36ab0993a2e0c1ff48861e6c28518
 DIST audacious-3.8.2-gtk3.tar.bz2 591423 SHA256 4ec6bd82d812c5cdcb1c32f4b0912b219edc8f1ce2603b07f714e0c4f2ed08bc SHA512 fc2c69748c8f044aa8eae1848771b45088d85fbb67baf5dcd3ab2ff52e0848ba626e138d1a37756df98249f32cb3d6c54de29355b218602c6a47ff15c8ba0b96 WHIRLPOOL 7d9e2c295e89ec40ef91613f4a4c1f808446f156bbbc6e6be89511fa94a4b9cce5bef209187d1396edd008dd4474c127ad97a493cf9bf3deffd6064f07cdec8e
 DIST audacious-3.8.2.tar.bz2 591209 SHA256 bdf1471cce9becf9599c742c03bdf67a2b26d9101f7d865f900a74d57addbe93 SHA512 13914d837ab5f283c45297424033486d9a5158f78f17f5538ecce780125fa76585e9e45852d15f6ecf3ed974e7a2f6289ceaaeffa97b2ea79b2bef449d8c786b WHIRLPOOL 9027baf4fe10e69fd41417d46db2d9105701a6a8c8b80f5bfa3f0aa9615b07a0103b159585b601c01b3483f93872ed890ed81f921b512d295648bffc820267f0
+DIST audacious-3.9-gtk3.tar.bz2 588784 SHA256 f671657f53115d3ee90dee84cccdfc01a3cd968c62731e15cacab5d27f840633 SHA512 7410e27d90a236dca6c988a05fe6cd5ed73fb2c7dbf3779cc29bf5b23618b9430ecb2bf340b67bef07aa821130734d978738c976d09cf216ba5140b569e9190f WHIRLPOOL 16bf9c0b49c66ce429bd7c5eccbfa42c8d167f22342280e31573da50cc36f513fdb91f935d176e1ef071702d0a9e97568122d3af2527d169bfa8ed9ced290ce9
 DIST audacious-3.9.tar.bz2 599488 SHA256 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa WHIRLPOOL a3e3d4f6b9fb0b3e2e90ea249101ae9cc0263d8dda0e49696e44ee00492218d9e19770669abcbcc4b8adfc4e53c263de1e8c9b5d5cdcc9a43d90e9b70d76e282
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd

diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9.ebuild
index 464c12ddd85..8d0969f7e2f 100644
--- a/media-sound/audacious/audacious-3.9.ebuild
+++ b/media-sound/audacious/audacious-3.9.ebuild
@@ -13,7 +13,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
-	SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -21,8 +23,8 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk nls qt5"
-REQUIRED_USE="^^ ( gtk qt5 )"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -30,7 +32,8 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk?  ( x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -43,6 +46,11 @@ PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
 src_unpack() {
 	default
+
+	if use gtk3; then
+		mv "${MY_P}"{-gtk3,} || die
+	fi
+
 	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 }
 
@@ -60,7 +68,7 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable gtk) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable nls) \
 		$(use_enable qt5 qt)
 }

diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index 464c12ddd85..8d0969f7e2f 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -13,7 +13,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
-	SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	SRC_URI="
+		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -21,8 +23,8 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk nls qt5"
-REQUIRED_USE="^^ ( gtk qt5 )"
+IUSE="gtk gtk3 nls qt5"
+REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -30,7 +32,8 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk?  ( x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -43,6 +46,11 @@ PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
 src_unpack() {
 	default
+
+	if use gtk3; then
+		mv "${MY_P}"{-gtk3,} || die
+	fi
+
 	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 }
 
@@ -60,7 +68,7 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable gtk) \
+		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable nls) \
 		$(use_enable qt5 qt)
 }

next             reply	other threads:[~2017-11-06  7:11 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-06  7:10 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-07 13:55 [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/ Miroslav Šulc
2024-12-06 10:11 Sam James
2024-12-06 10:04 Sam James
2024-11-04  9:13 Miroslav Šulc
2024-10-01 21:01 Matt Turner
2023-06-01  7:01 Miroslav Šulc
2023-05-31 12:42 Arthur Zamarin
2023-05-31 12:42 Arthur Zamarin
2023-05-10  5:21 Miroslav Šulc
2023-05-09  5:52 Arthur Zamarin
2023-05-08 12:35 Sam James
2023-04-30  7:16 Miroslav Šulc
2023-04-07  8:12 Miroslav Šulc
2022-08-13  4:13 Miroslav Šulc
2022-08-12 10:33 Agostino Sarubbo
2022-08-12 10:17 Agostino Sarubbo
2022-07-11  4:22 Miroslav Šulc
2021-12-22 12:59 Agostino Sarubbo
2021-12-22 11:25 Jakov Smolić
2021-12-01 21:27 Sam James
2021-12-01 21:27 Sam James
2021-11-21 12:59 Joonas Niilola
2021-11-21 12:59 Joonas Niilola
2021-11-21 12:59 Joonas Niilola
2021-11-21 12:59 Joonas Niilola
2021-09-23  5:41 Yixun Lan
2020-07-28 14:25 Andreas Sturmlechner
2020-07-28 14:11 Sam James
2020-07-27 13:54 Sam James
2020-07-15 16:28 Andreas Sturmlechner
2020-06-02 11:27 Andreas Sturmlechner
2020-06-02 11:27 Andreas Sturmlechner
2020-05-28 18:56 Andreas Sturmlechner
2020-05-28 18:56 Andreas Sturmlechner
2020-05-28 15:45 Agostino Sarubbo
2020-05-28 15:37 Agostino Sarubbo
2020-04-30 20:03 Andreas Sturmlechner
2020-04-30 20:03 Andreas Sturmlechner
2020-04-16 19:54 Andreas Sturmlechner
2020-04-16 19:54 Andreas Sturmlechner
2020-03-24 23:03 Andreas Sturmlechner
2020-03-21 22:40 Andreas Sturmlechner
2020-03-21 22:40 Andreas Sturmlechner
2020-01-25 17:38 David Seifert
2020-01-25 15:40 David Seifert
2019-11-15  0:36 Andreas Sturmlechner
2019-11-15  0:36 Andreas Sturmlechner
2019-11-12 10:45 Agostino Sarubbo
2019-02-14 23:06 Andreas Sturmlechner
2018-12-13  0:32 Andreas Sturmlechner
2018-12-13  0:32 Andreas Sturmlechner
2018-11-24 23:44 Andreas Sturmlechner
2018-11-24 23:18 Andreas Sturmlechner
2018-11-24 23:18 Andreas Sturmlechner
2018-11-24 23:18 Andreas Sturmlechner
2018-11-24 23:18 Andreas Sturmlechner
2018-11-23 21:33 Andreas Sturmlechner
2018-11-19 22:53 Andreas Sturmlechner
2018-11-19 21:52 Andreas Sturmlechner
2018-02-08 19:15 Andreas Sturmlechner
2017-12-24 22:01 David Seifert
2017-11-07  6:40 David Seifert
2017-11-05 17:50 Andreas Hüttel
2017-11-05 13:17 David Seifert
2017-11-05 11:49 David Seifert
2017-08-13 11:11 David Seifert
2017-05-13 11:49 Jeroen Roovers
2016-03-27  1:26 Robin H. Johnson
2015-12-24 21:42 Manuel Rüger
2015-11-13  9:48 Agostino Sarubbo
2015-11-12 10:37 Agostino Sarubbo
2015-09-29 13:38 Tobias Klausmann
2015-09-29 13:35 Tobias Klausmann
2015-09-24 11:02 Agostino Sarubbo
2015-09-24 11:01 Agostino Sarubbo

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d663c459ec dfblob:b30fd68898 dfblob:464c12ddd8
dfblob:8d0969f7e2 dfblob:464c12ddd8 dfblob:8d0969f7e2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/" )
	(help)

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=1509952243.db01d59aa45c2be75b088ed5ae41cd6a1baa8811.soap@gentoo \
    --to=soap@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