summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-04-09 18:15:44 +0200
committerGilles Dartiguelongue <eva@gentoo.org>2011-04-10 20:03:37 +0200
commit7cc742ccfd38af1b093634631e831e34eae6c959 (patch)
treef857282d2ed7dbb631fa0ce0e42a17a8eb9a24b6 /x11-terms
parentapp-cdr/brasero: QAed, sync with gentoo-x86 (diff)
downloadgnome-7cc742ccfd38af1b093634631e831e34eae6c959.tar.gz
gnome-7cc742ccfd38af1b093634631e831e34eae6c959.tar.bz2
gnome-7cc742ccfd38af1b093634631e831e34eae6c959.zip
x11-terms/gnome-terminal: QAed
* Split phases * fix typo with smclient (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/Manifest22
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild11
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-9999.ebuild13
3 files changed, 20 insertions, 26 deletions
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 8ffc2c73..1fafe699 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,25 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
AUX gnome-terminal-2.33.5-remove-libgnome-dep.patch 6681 RMD160 89c30690d4dd8820c51b3bbd5403792daf5d895a SHA1 9d5c340c4a341d02033d16e9a8a78e63ce154135 SHA256 5785a90b92653bef79bb8fbfeb6339adf83730f8eb73ce5c731b72793dda66ae
DIST gnome-terminal-3.0.0.tar.bz2 2320401 RMD160 9a87d479fdb49bfc114b903bfe8f6e5453757a3e SHA1 63b1fc8316c510b56eb9fc25f0d956b33999529b SHA256 16a3420176bbe5d58ad432306bfc40edb1423d43e311dd1d0de6da16559943f8
-EBUILD gnome-terminal-3.0.0.ebuild 1279 RMD160 000537f879b923d450bcc86e3785e35393262ea0 SHA1 0380e91a9bb40322c6e7ae533852477be72527dc SHA256 b7375066963741fbb941834a8b077c69c7df3c81a3796e2e775dc8ece41a00fe
-EBUILD gnome-terminal-9999.ebuild 1210 RMD160 d33616d3c876a67ded8550f88151d8d670bbec97 SHA1 2700623a636a6e793ebb95f7c0de1a288a3a57b6 SHA256 be58944ef0de592c3679369a1cc992b7ae585e58e76bac0d576fc15ee5aea06b
+EBUILD gnome-terminal-3.0.0.ebuild 1287 RMD160 a40730314d8d4bd27a2b2e39920c305f5c67573e SHA1 bc25eb837b9b9ee8112b1b9f04a6a52345373d3d SHA256 2ddd6fa54aa7a3930ea13097b18b12fabd51253c60e92dddf11c2d8050e9c587
+EBUILD gnome-terminal-9999.ebuild 1287 RMD160 a40730314d8d4bd27a2b2e39920c305f5c67573e SHA1 bc25eb837b9b9ee8112b1b9f04a6a52345373d3d SHA256 2ddd6fa54aa7a3930ea13097b18b12fabd51253c60e92dddf11c2d8050e9c587
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJNnvMaAAoJELHSF2kinlg4UNYP/Rafc9p6Siu4deECXTPoUvUz
-3gDjnejX+ZQcyVpA02+Ntwo89l7Jr6JwwOb4kUBNEtEc85pAMjyW7o39ab6XUiKX
-O4X9dSZmBq3KBie9y1WZAR0tLJ0yfcEnFLtq9Graies0EH06jByHeCiNlENdMTyd
-BDH63XX6mkGwVF0ne+iErUcaV6e7IIpvab7vKJBYB3eA0WYNdSp0S+dTzaTbxKWh
-7W/c5F4ZBK4PccWMsiDXPjG6ILnWcYwBQ7w48/FTl9dLwetaslRRvW+KvrlHOvXQ
-BUdnjjIOCySYekdPVJcdVyAqzsTBNCaJnrGLKT6e5PxKthbMIBHE98/QT+twch9R
-8HNSQmHKDEkRwj4cP5WghsFBpNgjfdvDbajEWCjZC4H4cHfGaOW+Mk6w3wM0nHx4
-ZwjnZt27o1V9TYVyTvfrR+CFwPwuOE1chelE8sBNHOz7vM/2rbExzAtDidHH5RMR
-6wNRLWPoorZITdLbM9HAGmwRqLEYT22lHbshAlJg4RPAaXPbgoEVCx5DcgPyzhCw
-k/VMrTFRxOF3pSrrGnm+oH3yUXPLzDlH05226I70CHkVGbUzKWzgBFNJACCIqifB
-EusT+cS+9bLUVS78PnnAEjxAbnXZEg19XFgXJvN+7eTrLG90EFMQWhTpkUYeW4Q0
-lCvgYuC2jQqcltUnfnnM
-=ZSrV
+iEYEARECAAYFAk2hiDcACgkQ1fmVwcYIWAYM1gCg2OFi9KQYSDPffGiqyp1LoRbq
+KTUAoJHYj/jCc60N9zv85ymC8Mz5avM+
+=waV0
-----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild
index c2c76563..5e72086b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.0.0.ebuild
@@ -15,12 +15,12 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
fi
+IUSE=""
RDEPEND=">=dev-libs/glib-2.26.0:2
>=x11-libs/gtk+-3.0:3
@@ -38,13 +38,14 @@ DEPEND="${RDEPEND}
>=app-text/scrollkeeper-0.3.11
sys-devel/gettext"
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
G2CONF="${G2CONF}
- --with-smclient-backend=xsmp
+ --with-smclient=xsmp
--with-gtk=3.0"
+}
+src_prepare() {
# Use login shell by default (#12900)
epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 5b292cf0..5e72086b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -15,12 +15,12 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-3"
SLOT="0"
-IUSE=""
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
fi
+IUSE=""
RDEPEND=">=dev-libs/glib-2.26.0:2
>=x11-libs/gtk+-3.0:3
@@ -29,20 +29,23 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
>=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}
+ x11-libs/gtk+:2
>=dev-util/intltool-0.40
>=dev-util/pkgconfig-0.9
>=app-text/gnome-doc-utils-0.3.2
>=app-text/scrollkeeper-0.3.11
sys-devel/gettext"
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
G2CONF="${G2CONF}
- --with-smclient-backend=xsmp
+ --with-smclient=xsmp
--with-gtk=3.0"
+}
+src_prepare() {
# Use login shell by default (#12900)
epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch