x11-terms/terminator: Backport patch for brightness setting problems, #485750

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 123 insertions, 6 deletions

diff --git a/x11-terms/terminator/ChangeLog b/x11-terms/terminator/ChangeLog
index 7350fd3b0a86..ca9315d33be6 100644
--- a/x11-terms/terminator/ChangeLog
+++ b/x11-terms/terminator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/terminator
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.29 2013/04/30 12:59:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.30 2013/09/25 15:51:09 jlec Exp $
+
+*terminator-0.97-r1 (25 Sep 2013)
+
+  25 Sep 2013; Justin Lecher <jlec@gentoo.org> +terminator-0.97-r1.ebuild,
+  +files/terminator-0.97-brightness.patch:
+  Backport patch for brightness setting problems, #485750
 
 *terminator-0.97 (30 Apr 2013)
 
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 2c6835f166a2..a6548269908e 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -4,18 +4,30 @@ Hash: SHA512
 AUX 0.90-without-icon-cache.patch 305 SHA256 b20fe414e6a443c0cb52c4da0da4be5c5f8ac8af90d5e9763b43c5383623978b SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca WHIRLPOOL 3d50d9de569a48d4097cadb6b73525eb5b7fb4895eb917d92f219615072f65097e5c3674fd6356e5323fe9779b6e2aa4528b6aaf82844145f752497a5f6af5af
 AUX 0.93-session.patch 505 SHA256 977cd4f3bf3cf1f044cb044d40328809836a2414a80af514bfff6f7828f7b7fd SHA512 d80313fa7f5ad81d162fece87d315ba6d5254f1e746b929578ffa2f1288fe1ab89832eeb324eb496a0347ec7781e8dc1e4011ac8e3b1303999745153e1e8e5d7 WHIRLPOOL af4d52de55a37d4d0b9dd4c29b80dc2c6c697eca4252c152b35553c9b789cd36082e7085b3ab12ed8293f178e14b950d975f75af53cfbb41357b61ed676b72df
 AUX 0.94-session.patch 496 SHA256 3db9e1065294e3c47b80b44c6e4cbfd4970fa963386d875ccd92efe02aaba05a SHA512 3a753cfe2be04132229327167d120c35814a9cdaf2eae2837eb4d294e90ce07ece7a6e4fbb69129474967fab3ad14e596d6c5a4eab55c909e234d19801aaaaae WHIRLPOOL 46a9c6b63dac7fd4a1abe1524fde02850d6169be19b754cb180f425f2a8a36d56bd82fbf7bcb8435a4b6353c9564d8958b13040a79524ab8693566307ff7ef46
+AUX terminator-0.97-brightness.patch 1622 SHA256 9164b379b6df3530c89e716031b676ba0fda2c838f255d9bd03246b6b1b96dcf SHA512 d87fbce864014d32ba57d3c81664384a13faacb7fb5b890b3eb524c915b505a98a86222700e22c6fce81031fa2b262d4830fb9ae608d5078608bb4a3507e4973 WHIRLPOOL 08d436c7f3ebce663fe0200cda3ade5632c132c4785ca20c8e61943adbb0258192902d024fc5dad5e7ef85a1138abce1915b1ab5d702d4d1a41ee6ef5982d6e5
 DIST terminator-0.97.tar.gz 5025337 SHA256 0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470 WHIRLPOOL 9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
 DIST terminator_0.96.tar.gz 264226 SHA256 d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201 SHA512 f74b5887ea7a11bf5c6866eae5e879a60badd81dd5056cfd0fdb5e4940b81917e6cd05ea50b56a9c7beba8e9fc9e842b25d3c8ad3ed7b574b72f43a1d4fc6c5e WHIRLPOOL 53fed7d74a3a76e7cca01cb0ab7f1780f981b81aec9606a1f4416c3e786773aca41abac174e40f1b49b9285edc9d7c8fcf599395c09a9a23ec3ec4d745e35b55
 EBUILD terminator-0.96-r1.ebuild 1184 SHA256 32fc52aa8b119217efdb37bc6bc1f5663b26af3353718581f5f2c980e1d8137c SHA512 6c67e8291d02eadf86d27af2aedcb7ebb7c577c20aa7dfee00c6f7b9b958935bd823fe790bbb932bf2d99a56883003e46dd7bf94ac4071fa6e33339c99497cb6 WHIRLPOOL e5bc2a21c6a178271b18346118eb2d5c49896807be4268639a8d6f8b29b71827d4676c83d2439226872ab75f8fece37cec76b277fade13cf6f9ea0498eeb599e
 EBUILD terminator-0.96-r2.ebuild 1158 SHA256 308cfa020c5b04fa71dbbc88ca5486d972f95ec11b52fbfa5f3cbdead3d6cb24 SHA512 7e0aa85fd6642574d44d4bd168e416e681a7313a4f878a656e4b505b536cf1bc9a110d013d455ce5e2fd82cf2a84e10cad7736157f6208279ec65a0243c26ec5 WHIRLPOOL c9025bdb76428ef77121f56956d8404930b185d0ff31288fbd6e7a1588b3f6ba14b354d90a64b3d333be6329d1f31af73a92c11846b273eb663bf37923a4d903
 EBUILD terminator-0.96-r3.ebuild 1371 SHA256 c4b04f18a0f72c0a5f758707164c6b77c8b31b78025553295b8963282612ac2a SHA512 18e99c954361b31bf6e1b620e9fb6fb06b1255da96592b326576afa1b0c9988dc751e52ab9199ad70b092d11f861ee4aafb7404fa789453179b0f46023211324 WHIRLPOOL 2a40ccda70140fe7aab0e4574ef4d76c9237e365b9a889f0db051f5f70d91ae9920ef1c39820fd933ada1c441e87816bc5bfa1933faa9a3f9be783406cc1e4b5
+EBUILD terminator-0.97-r1.ebuild 1424 SHA256 4a48ccd9648fe81aef8a1cc03c9d30d30971d6d3a1ab9cf1859ffb285212ae24 SHA512 d0f5c347273579b79beea851a403d7bc92fe81c6238a8dd7278d10ee3f863143346c685a0f967961922b0d915284d68a909e0bf65d7dc930dc0224d5c9241bef WHIRLPOOL 77483bb11e733922bd5c0c190a345c799c96045af67b0f5963481cb88fa62dc9914e67c1df88aad79dba9ff18329a0daf42b6e14ad92b9c173467d7c1c6deaaf
 EBUILD terminator-0.97.ebuild 1383 SHA256 cdfe71c113587f413b1b34fe4ad084ecba62dc1eca83321cfc36f417e3b4de81 SHA512 d830d80669e55d3179df75d3937c93b6b790820d2f81cf0de15a788ca536ffb10251e57d9b7982c0837e2b1cf07cb4d3751f2f17d3b8e2128d88127fcd7f67a8 WHIRLPOOL eaa883fa3035fe970d6c17d6e2129571caad739752e125c66084db96ae1e0fde74ced3eb39de21d37a3d1fd29828e34dcd0d0f42e773ee5e1f82b9ee820d6b9d
-MISC ChangeLog 4231 SHA256 4b78d1d6e7fc769e403b89b546a8622eb9834ba1a24c7da98e3a2571a4852542 SHA512 c032154e66c08276ce7d03891df6d7818ec1314142d9443b61297f44141bd621f2e6b1a0761bcf8ac80e2e98d91720ef3abf9bf53280dc68365a3f9366e1a8aa WHIRLPOOL 33b5dd757a7abbb9a1d9a4de578beecc2e3917deaa4ff18b3a216756d63afc40cff5cede5521faf7e153a7f9fa51668832aadd18146eca77e4be8cedf6276bc8
+MISC ChangeLog 4443 SHA256 f7208a4d637414862c635a7d54107fc43458e2035d81bc2c9351058ace4ac522 SHA512 b57b8f4d854ba5028e3279ab755c817ae30b1fc509697b6fa442f696a4fe55f6736d3d8f3c269d70d8ecd50c2c4de01f6023acd542bf91d10139a2d69b04245d WHIRLPOOL 1eaa666f615612d70af7d6e61a54216ca59d178598a499d90e967ca8f15e07d3c3cfd22699d00aedcffa563470bea35ae2f76186bd7519ca63d8a6d7a5a75466
 MISC metadata.xml 687 SHA256 c12e83902509b863524aeedc9c275a3d6305a660c6ad70bb17bae0ef5d8556e0 SHA512 a716bb11c90ec827f95ace222a8b5ac80334592a8484dfb6aedfc4bce98ec49eec8c65a1de999fe457e3ee7ba8c4ee9ee6081d60821d52a6c86c54beed86bc83 WHIRLPOOL ed7d59cd01aaef07d8bbdb2f8d3a52678436f93d5705c66430957288df934deb129e5c27b0d8041ff4fe2bc79994e245b69663c0aeee898a4a8b4d6936bae098
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREKAAYFAlF/wEYACgkQgAnW8HDreRZvkwCgstrgypXW9nHJ3GX5DAewuj7t
-ztUAnRBQh0k8EkcKtevzIuXk5t6BeFNr
-=qlw2
+iQIcBAEBCgAGBQJSQwZgAAoJELnU8jG9FVir790P/052WZJm10g1y0P1RHlCO7mE
+xT2jPBdlezyb3iilWOopC4HBOx+MdQHIouLOiiNHn8DEmt3bbkG/CKrmwlg5Th8t
+t7da3RtVXcTgB952/+21B02vNbr1dkOfzu+arFpgMeK4zfwvNA8niheoRsUp7l/M
+nbUaXg0lv0Qbj4Qx/r7L40aP8PbpMioMtVdawDWgucBz/9yh+B6lYoQNl4+2sl5x
+pKG8q3eMR660Hrel+dLb/ah0jars9fc6BnRmv3I8SwkHpcdlFyCh4ipJ27YYikAi
+lPfANdo+rSZ7dcHUsfudwSfgNiJNL9k9YQhkc15xttM1J+rpRoDBayd49SjvbPpo
+rw5H4J8Co3ZyPt/2PwsWdRpX2Rr1s0PCRpN5zu4BljwQ88TfTFim7IQcAshDgy6i
+BSDaw5qf8gjhU3YEy1u9yY1pZNe6w1S33Cvll07CbfxhIdivIiYHV+UGGoddbLFw
+CtJ0pk0amuAAaWiBzc8sj+sRnXgNVkXGwCbVNJuvecChkKaHFoZQ3Qv47YxcJOiD
+vw/dOFVHsHMdg/AAcoA5NnNJLgXtTplyiu4yzQM/US4AvZtbF2IBGpnRr3Dr+rZR
+cwH8DPABYXAHCYVL5d0JkZ4AyPjWbhGXwMz2Bu5G54Fh18ZaOVnVyGLcxocf8lXW
+68kr7TgqgwOEf2EHiqBU
+=hJYu
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/terminator/files/terminator-0.97-brightness.patch b/x11-terms/terminator/files/terminator-0.97-brightness.patch
new file mode 100644
index 000000000000..9e35d7d593f6
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-0.97-brightness.patch
@@ -0,0 +1,35 @@
+=== modified file 'terminatorlib/prefseditor.py'
+--- terminatorlib/prefseditor.py	2013-02-16 00:10:45 +0000
++++ terminatorlib/prefseditor.py	2013-05-11 22:03:46 +0000
+@@ -923,6 +923,8 @@
+ 
+     def on_inactive_color_offset_change_value(self, widget, scroll, value):
+         """Inactive color offset setting changed"""
++        if value > 1.0:
++          value = 1.0
+         self.config['inactive_color_offset'] = round(value, 2)
+         self.config.save()
+ 
+
+=== modified file 'terminatorlib/terminal.py'
+--- terminatorlib/terminal.py	2013-02-15 15:10:55 +0000
++++ terminatorlib/terminal.py	2013-05-11 22:03:46 +0000
+@@ -621,11 +621,17 @@
+ 
+         factor = self.config['inactive_color_offset']
+         self.fgcolor_inactive = self.fgcolor_active.copy()
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+ 
+         for bit in ['red', 'green', 'blue']:
+             setattr(self.fgcolor_inactive, bit,
+                     getattr(self.fgcolor_inactive, bit) * factor)
+ 
++        dbg(("fgcolor_inactive set to: RGB(%s,%s,%s)", getattr(self.fgcolor_inactive, "red"),
++                                                      getattr(self.fgcolor_inactive, "green"),
++                                                      getattr(self.fgcolor_inactive, "blue")))
+         colors = self.config['palette'].split(':')
+         self.palette_active = []
+         self.palette_inactive = []
+
diff --git a/x11-terms/terminator/terminator-0.97-r1.ebuild b/x11-terms/terminator/terminator-0.97-r1.ebuild
new file mode 100644
index 000000000000..6c4d76c8b853
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.97-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.97-r1.ebuild,v 1.1 2013/09/25 15:51:09 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus gnome +libnotify"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	x11-libs/vte:0[python]
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-python/gconf-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}"/trunk
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/0.94-session.patch
+		"${FILESDIR}"/${P}-brightness.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}