From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/
Date: Sun, 11 Oct 2015 20:46:58 +0000 (UTC) [thread overview]
Message-ID: <1444596374.bb474b9fda256ab0fb0214c6c2f014481423f36f.tranquility@gentoo> (raw)
commit: bb474b9fda256ab0fb0214c6c2f014481423f36f
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 20:44:46 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:46:14 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bb474b9f
x11-terms/gnome-terminal: Bump version to 3.18.0
The patches couln't be applied so they are removed for now
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
...al-9999.ebuild => gnome-terminal-3.18.0.ebuild} | 35 ++++------------------
.../gnome-terminal/gnome-terminal-9999.ebuild | 22 +++++++-------
2 files changed, 16 insertions(+), 41 deletions(-)
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
similarity index 64%
copy from x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
copy to x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
index 8673595..1809985 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.0.ebuild
@@ -7,27 +7,20 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2 readme.gentoo
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="The Gnome Terminal"
HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
LICENSE="GPL-3+"
SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-fi
+IUSE="debug +gnome-shell +nautilus"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
# FIXME: automagic dependency on gtk+[X]
RDEPEND="
- >=dev-libs/glib-2.40:2[dbus]
+ >=dev-libs/glib-2.42:2[dbus]
>=x11-libs/gtk+-3.10:3[X]
- >=x11-libs/vte-0.40.2:2.91
+ >=x11-libs/vte-0.42.0:2.91
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -52,32 +45,14 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh"
-src_prepare() {
- gnome2_src_prepare
- if ! use vanilla; then
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=695371
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=721932
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
- fi
-}
-
src_configure() {
- local myconf=""
-
- if [[ ${PV} != 9999 ]]; then
- myconf="${myconf}
- VALAC=$(type -P true)
- "
- fi
-
gnome2_src_configure \
--disable-static \
--disable-migration \
$(use_enable debug) \
$(use_enable gnome-shell search-provider) \
$(use_with nautilus nautilus-extension) \
- ${myconf}
+ VALAC=$(type -P true)
}
src_install() {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 8673595..e9be986 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -25,9 +25,9 @@ fi
# FIXME: automagic dependency on gtk+[X]
RDEPEND="
- >=dev-libs/glib-2.40:2[dbus]
+ >=dev-libs/glib-2.42:2[dbus]
>=x11-libs/gtk+-3.10:3[X]
- >=x11-libs/vte-0.40.2:2.91
+ >=x11-libs/vte-0.42.0:2.91
>=gnome-base/dconf-0.14
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/util-linux
@@ -52,15 +52,15 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh"
-src_prepare() {
- gnome2_src_prepare
- if ! use vanilla; then
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=695371
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
- # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=721932
- epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
- fi
-}
+# src_prepare() {
+# gnome2_src_prepare
+# if ! use vanilla; then
+# # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=695371
+# epatch "${FILESDIR}"/${PN}-3.16.2-restore-transparency.patch
+# # Fedora patch, https://bugzilla.gnome.org/show_bug.cgi?id=721932
+# epatch "${FILESDIR}"/${PN}-3.16.2-restore-dark.patch
+# fi
+# }
src_configure() {
local myconf=""
next reply other threads:[~2015-10-11 20:47 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 20:46 Ole Reifschneider [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-07 21:21 [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/ Mart Raudsepp
2018-09-13 7:38 Mart Raudsepp
2018-09-13 7:38 Mart Raudsepp
2018-04-15 19:00 Ole Reifschneider
2018-01-12 15:05 Dennis Lamm
2016-05-11 6:35 Remi Cardona
2015-05-19 13:56 Alexandre Rostovtsev
2015-05-19 0:36 Alexandre Rostovtsev
2015-05-12 18:44 Gilles Dartiguelongue
2015-04-26 13:53 Ole Reifschneider
2014-12-26 21:53 Gilles Dartiguelongue
2014-11-23 22:49 Gilles Dartiguelongue
2014-10-13 21:51 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-22 20:26 Gilles Dartiguelongue
2013-11-15 8:00 Gilles Dartiguelongue
2013-10-14 7:22 Gilles Dartiguelongue
2012-12-24 11:28 Gilles Dartiguelongue
2012-10-27 22:38 Gilles Dartiguelongue
2012-04-13 4:00 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
2011-04-29 17:29 Nirbheek Chauhan
2011-04-12 7:04 Gilles Dartiguelongue
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-02-23 21:18 Nirbheek Chauhan
2011-02-21 22:35 Nirbheek Chauhan
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=1444596374.bb474b9fda256ab0fb0214c6c2f014481423f36f.tranquility@gentoo \
--to=tranquility@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