From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/
Date: Mon, 24 Dec 2012 11:28:24 +0000 (UTC) [thread overview]
Message-ID: <1356348391.45a661eeab42d7975fe506a3a799f0026d03830e.eva@gentoo> (raw)
commit: 45a661eeab42d7975fe506a3a799f0026d03830e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 11:26:31 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 11:26:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=45a661ee
x11-terms/gnome-terminal: moved to gx86
* Add metadata.xml.
* Sync live ebuild with gx86 changes.
---
.../gnome-terminal/gnome-terminal-3.6.1-r1.ebuild | 51 --------------------
.../gnome-terminal/gnome-terminal-9999.ebuild | 20 +++++---
x11-terms/gnome-terminal/metadata.xml | 5 ++
3 files changed, 17 insertions(+), 59 deletions(-)
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
deleted file mode 100644
index 347f54d..0000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.26.0:2
- >=x11-libs/gtk+-3.3.17:3[X]
- >=x11-libs/vte-0.30.0:2.90
- >=gnome-base/gconf-2.31.3
- >=gnome-base/gsettings-desktop-schemas-0.1.0
- x11-libs/libSM
- x11-libs/libICE"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
- || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
- app-text/yelp-tools
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- # FIXME: leave smclient configure unset until it accepts values from the
- # switch and not from GDK_TARGET, bug #363033
- G2CONF="${G2CONF} --with-gtk=3.0"
-
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
- ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
- elog "Gnome Terminal no longer uses login shell by default, switching"
- elog "to upstream default. Because of this, if you have some command you"
- elog "want to be run, be sure to have it placed in your ~/.bashrc file."
- fi
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 9d43bb7..4c8e8f6 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
@@ -15,37 +15,41 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-3+"
SLOT="0"
+IUSE="nautilus"
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 ~x86-linux"
fi
-IUSE="nautilus"
+
# FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.33.2:2
+RDEPEND="
+ >=dev-libs/glib-2.33.2:2
>=x11-libs/gtk+-3.5.3:3[X]
>=x11-libs/vte-0.33.0:2.90
>=gnome-base/dconf-0.13.4
>=gnome-base/gconf-2.31.3:2
>=gnome-base/gsettings-desktop-schemas-0.1.0
sys-apps/dbus
- nautilus? ( >=gnome-base/nautilus-3 )"
+ nautilus? ( >=gnome-base/nautilus-3 )
+"
DEPEND="${RDEPEND}
+ || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
app-text/yelp-tools
dev-libs/libxml2
dev-util/gdbus-codegen
- dev-util/gtk-builder-convert
>=dev-util/intltool-0.40
sys-devel/gettext
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
-src_prepare() {
+src_configure() {
DOCS="AUTHORS ChangeLog HACKING NEWS README"
G2CONF="${G2CONF}
$(use_with nautilus nautilus-extension)"
- gnome2_src_prepare
+ gnome2_src_configure
}
pkg_postinst() {
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
next reply other threads:[~2012-12-24 11:28 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-24 11:28 Gilles Dartiguelongue [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-10-11 20:46 Ole Reifschneider
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-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=1356348391.45a661eeab42d7975fe506a3a799f0026d03830e.eva@gentoo \
--to=eva@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