| 1 |
swegener 10/05/28 19:12:14 |
| 2 |
|
| 3 |
Modified: ChangeLog glipper-1.0-r3.ebuild |
| 4 |
Log: |
| 5 |
Adjust python support to force python2, bug 317015. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.17 x11-misc/glipper/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/ChangeLog?rev=1.17&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/ChangeLog?rev=1.17&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/ChangeLog?r1=1.16&r2=1.17 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v |
| 18 |
retrieving revision 1.16 |
| 19 |
retrieving revision 1.17 |
| 20 |
diff -u -r1.16 -r1.17 |
| 21 |
--- ChangeLog 14 Feb 2010 21:47:34 -0000 1.16 |
| 22 |
+++ ChangeLog 28 May 2010 19:12:14 -0000 1.17 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for x11-misc/glipper |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.16 2010/02/14 21:47:34 swegener Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.17 2010/05/28 19:12:14 swegener Exp $ |
| 28 |
+ |
| 29 |
+ 28 May 2010; Sven Wegener <swegener@g.o> glipper-1.0-r3.ebuild: |
| 30 |
+ Adjust python support to force python2, bug 317015. |
| 31 |
|
| 32 |
14 Feb 2010; Sven Wegener <swegener@g.o> glipper-1.0-r3.ebuild: |
| 33 |
Remove pointless .la files, bug #305147. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.3 x11-misc/glipper/glipper-1.0-r3.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild?rev=1.3&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild?rev=1.3&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild?r1=1.2&r2=1.3 |
| 42 |
|
| 43 |
Index: glipper-1.0-r3.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild,v |
| 46 |
retrieving revision 1.2 |
| 47 |
retrieving revision 1.3 |
| 48 |
diff -u -r1.2 -r1.3 |
| 49 |
--- glipper-1.0-r3.ebuild 14 Feb 2010 21:47:34 -0000 1.2 |
| 50 |
+++ glipper-1.0-r3.ebuild 28 May 2010 19:12:14 -0000 1.3 |
| 51 |
@@ -1,8 +1,11 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild,v 1.2 2010/02/14 21:47:34 swegener Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild,v 1.3 2010/05/28 19:12:14 swegener Exp $ |
| 56 |
+ |
| 57 |
+EAPI="2" |
| 58 |
|
| 59 |
GCONF_DEBUG="no" |
| 60 |
+PYTHON_DEPEND="2" |
| 61 |
|
| 62 |
inherit gnome2 python eutils multilib |
| 63 |
|
| 64 |
@@ -15,8 +18,7 @@ |
| 65 |
KEYWORDS="~amd64 ~x86" |
| 66 |
IUSE="" |
| 67 |
|
| 68 |
-DEPEND=">=dev-lang/python-2.4 |
| 69 |
- >=dev-python/pygobject-2.6 |
| 70 |
+DEPEND=">=dev-python/pygobject-2.6 |
| 71 |
>=dev-python/pygtk-2.6 |
| 72 |
>=dev-python/gconf-python-2.22.0 |
| 73 |
>=dev-python/libgnome-python-2.22.0 |
| 74 |
@@ -29,10 +31,12 @@ |
| 75 |
|
| 76 |
DOCS="AUTHORS ChangeLog NEWS" |
| 77 |
|
| 78 |
-src_unpack() { |
| 79 |
- gnome2_src_unpack |
| 80 |
- cd "${S}" |
| 81 |
+pkg_setup() { |
| 82 |
+ python_set_active_version 2 |
| 83 |
+ python_pkg_setup |
| 84 |
+} |
| 85 |
|
| 86 |
+src_prepare() { |
| 87 |
epatch "${FILESDIR}"/${P}-binary-data.patch |
| 88 |
epatch "${FILESDIR}"/${P}-transparent.patch |
| 89 |
epatch "${FILESDIR}"/${P}-pkgconfig.patch |
| 90 |
@@ -40,16 +44,16 @@ |
| 91 |
|
| 92 |
src_install() { |
| 93 |
gnome2_src_install py_compile=true |
| 94 |
- python_version |
| 95 |
+ |
| 96 |
+ python_convert_shebangs 2 "${D}"/usr/$(get_libdir)/glipper/glipper |
| 97 |
|
| 98 |
# remove pointless .la files, bug #305147 |
| 99 |
- rm -f "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/glipper/{keybinder/_keybinder,osutils/_osutils}.la |
| 100 |
+ rm -f "${D}$(python_get_sitedir)"/glipper/{keybinder/_keybinder,osutils/_osutils}.la |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postinst() { |
| 104 |
gnome2_pkg_postinst |
| 105 |
- python_version |
| 106 |
- python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/glipper |
| 107 |
+ python_mod_optimize glipper |
| 108 |
|
| 109 |
elog "Glipper has been completely rewritten as a panel applet. Please remove your" |
| 110 |
elog "existing ~/.glipper directory and then add glipper as a new panel applet." |
Archives