diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 16:31:49 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-11 16:31:49 +0000 |
commit | 252bde4b5ec4b0e2c9722a0c8af4f6aa130e65a4 (patch) | |
tree | bd11b283e4e17a9490ee5bc6f722ee42fcd80d97 /xfce-base | |
parent | Marked ~ppc for bug #313563. (diff) | |
download | historical-252bde4b5ec4b0e2c9722a0c8af4f6aa130e65a4.tar.gz historical-252bde4b5ec4b0e2c9722a0c8af4f6aa130e65a4.tar.bz2 historical-252bde4b5ec4b0e2c9722a0c8af4f6aa130e65a4.zip |
Set python_set_active_version to make sure Python 2.x is used. Fix opera-browser.desktop for >= 10.60 wrt #327081 by Christopher Head.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r-- | xfce-base/exo/ChangeLog | 7 | ||||
-rw-r--r-- | xfce-base/exo/Manifest | 5 | ||||
-rw-r--r-- | xfce-base/exo/exo-0.5.3.ebuild | 11 | ||||
-rw-r--r-- | xfce-base/exo/files/exo-0.5.3-opera-10_60.patch | 11 |
4 files changed, 30 insertions, 4 deletions
diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog index 887632340df7..c45f4cd9ed35 100644 --- a/xfce-base/exo/ChangeLog +++ b/xfce-base/exo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/exo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.39 2010/08/10 15:50:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.40 2010/08/11 16:31:48 ssuominen Exp $ + + 11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> exo-0.5.3.ebuild, + +files/exo-0.5.3-opera-10_60.patch: + Set python_set_active_version to make sure Python 2.x is used. Fix + opera-browser.desktop for >= 10.60 wrt #327081 by Christopher Head. 10 Aug 2010; Jeroen Roovers <jer@gentoo.org> exo-0.3.107.ebuild: Stable for HPPA (bug #323729). diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest index b95620f7ab7e..e30d2c51ea9f 100644 --- a/xfce-base/exo/Manifest +++ b/xfce-base/exo/Manifest @@ -1,9 +1,10 @@ AUX exo-0.3.4-interix.patch 2766 RMD160 876452cf6009fb1530cf0f296104ba4105dc10de SHA1 8ad881d9cca3811fba0b1a7080caed024e37381b SHA256 e7a5864241cbae1ac1442af31aea2b3365e9936740954e06a45e4da7e810e471 +AUX exo-0.5.3-opera-10_60.patch 382 RMD160 ffc537d7dcb8c734b9bc8e90391b78b116fa6c42 SHA1 77a4bce472bc84388587d96185188a5c4b04ae5b SHA256 84c2885105f39b016500c40d8f42526a554db1a3aa550e6cede98506aedb8c37 DIST exo-0.3.106.tar.bz2 1732898 RMD160 eaac845d16ea4bab64634faa34831bc570ed56d9 SHA1 152a395e3b01d7280b37966085fa57a651c6f3f8 SHA256 0b9b8625eb27896402d2a4f219dfb92ac9a1fe1f3e7367709f87fc866f1c02d9 DIST exo-0.3.107.tar.bz2 1889276 RMD160 d9c97d73c543a411fe09688eb3fdc7ad7b49a5f9 SHA1 5121f433b14c5840706cedbc220284a4516e83df SHA256 0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3 DIST exo-0.5.3.tar.bz2 1561330 RMD160 eafadec6586c6ab844e1b01c33179a89f024c2f9 SHA1 c6bb558eeaf0528599120928023f7979f65d81c7 SHA256 fcca7ad3d35ee3ab85637d7d88ee8163ddab35213d55090b035352ea8bba17a7 EBUILD exo-0.3.106.ebuild 1542 RMD160 528d8b97195beabc06c5e1a06ec3dea55137f7be SHA1 3664c06e4c001d786f1eddd541baeff28fa118d2 SHA256 148e301e5492ba8574e8a1a2f661f848f122d45b717e91ec5360898eb1f45f72 EBUILD exo-0.3.107.ebuild 1538 RMD160 cb4b640ec24edf7c0d50e26425aff0e2f450a4c1 SHA1 ccdc7d7ae8b8684c8d2127263003c8f77cf30bb7 SHA256 2c6adc98b721e7ab80325e3e0cd60bb32b9f559fa0fd7f044f3c6ddcb74116c2 -EBUILD exo-0.5.3.ebuild 1481 RMD160 87e9540e4ac55ff57894f2bc8c9172ee54f5111a SHA1 28365e7722df0fba1c1877e25845378c910cdc68 SHA256 f675a58a388721b05aa0a32d8eeb3970ad1c108f5b36e62e34ac0704bf3145ce -MISC ChangeLog 4988 RMD160 aee7f818556a137e2da7b1f06324cf9bdc4cdd2b SHA1 b31932f56f342252dc621a185bd85ff228d5f6dd SHA256 29a5403770fbb72af0fe0abdc309a0049d6c63fc6dabb7e064fc3204d3b3b60d +EBUILD exo-0.5.3.ebuild 1634 RMD160 c0eec46a07c11d54c0752bc797f3ace143a66828 SHA1 19274cbbdd0549bc25d60fea91616bb2194e0cdf SHA256 32914c063c35c1f95562a2091e85da723d6d636fbb9fdb28abfc005c2c0ac43e +MISC ChangeLog 5244 RMD160 4645702f374f8a422ca07f0b7a99873a96eec270 SHA1 46331eb17be2748080d1de2b1e3da217a6b65a94 SHA256 ad5d8c70b09bfa003b78164b83ddcbf2d4f8c1663fd0fbd75a60a6be2dd0406a MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-base/exo/exo-0.5.3.ebuild b/xfce-base/exo/exo-0.5.3.ebuild index 8ea6d0515876..46cb1c43d567 100644 --- a/xfce-base/exo/exo-0.5.3.ebuild +++ b/xfce-base/exo/exo-0.5.3.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.5.3.ebuild,v 1.1 2010/07/26 15:47:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.5.3.ebuild,v 1.2 2010/08/11 16:31:48 ssuominen Exp $ EAPI=3 + +PYTHON_DEPEND="python? 2" + inherit xfconf python DESCRIPTION="Extensions, widgets and framework library with session management support" @@ -26,6 +29,12 @@ DEPEND="${RDEPEND} sys-devel/gettext" pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi + + PATCHES=( "${FILESDIR}"/${P}-opera-10_60.patch ) XFCONF="--disable-dependency-tracking --disable-static $(use_enable python) diff --git a/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch b/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch new file mode 100644 index 000000000000..3941b14de691 --- /dev/null +++ b/xfce-base/exo/files/exo-0.5.3-opera-10_60.patch @@ -0,0 +1,11 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=6604 +http://bugs.gentoo.org/327081 + +--- exo-helper/helpers/opera-browser.desktop.in.in ++++ exo-helper/helpers/opera-browser.desktop.in.in +@@ -8,4 +8,4 @@ + X-XFCE-Binaries=opera; + X-XFCE-Category=WebBrowser + X-XFCE-Commands=%B; +-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B "%s"; ++X-XFCE-CommandsWithParameter=%B "%s"; |