Add missing python cairo deps; modernize py-compile idiom.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index e3fcf1c818718743f363f8895c015db87f66648c..c665ee4606854143b1803ba815fec72a3e43c73c 100644 (file)
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gedit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.332 2011/12/21 23:00:58 eva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.333 2012/01/13 17:28:42 tetromino Exp $
+
+  13 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gedit-3.2.3.ebuild,
+  gedit-3.2.5.ebuild:
+  Add missing python cairo deps; modernize py-compile idiom.
 
 *gedit-3.2.5 (21 Dec 2011)
 

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 0c3ff5b04b64cc74bdcf7ba971b0ef135cb5048e..c85f72f707f298070e7d352d8e632d42dd0f0e0c 100644 (file)
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gedit-2.30.2-tests-skip.patch 1402 RMD160 ba1984f9207a57254be2f6904789f8403fc619c5 SHA1 42424dbb1472d55d3b2ba0a383154bd4c2935955 SHA256 faf11f3817052dd76aa9d34af938c4cd8136a71b7b7f4dc5a42e38abd90402e9
 DIST gedit-2.30.4.tar.bz2 4705692 RMD160 b2659b8847ef02c66a70acd2f4a492555e1e4d21 SHA1 ff7f4088d0b89224b84406557a7d9970323fdcc3 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
 DIST gedit-3.2.3.tar.xz 2894872 RMD160 b718379da5eefdb5dbf04049312b603490b15052 SHA1 719a046b618f70aaaa726aad792abc83efec268b SHA256 9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751
 DIST gedit-3.2.5.tar.xz 2895420 RMD160 4521dcd81ac8141d30cf7f2ce835330cb91484f6 SHA1 a95b9ae7e859c64b621961999462f37b6fc7c596 SHA256 0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81
 EBUILD gedit-2.30.4.ebuild 2162 RMD160 a8755808fa4a89d05b4135928c0cb0a2fbba3134 SHA1 df5f15ad6377cae2c8f3d510ffa27661098296be SHA256 7cca178576a8dd373e1be89fc8c0ced344106069722e7b812fd41bd348a2c367
-EBUILD gedit-3.2.3.ebuild 2732 RMD160 6d2f0f4a19ad90f33a4771ac1bea789891dca079 SHA1 7c78875bb71135b6b7bbc135bd54557c705b44d6 SHA256 37fe8551bbd2739ecd49c8f89fa6eb50622ff14f0eadb0ca4ce6effd79335eaa
-EBUILD gedit-3.2.5.ebuild 2834 RMD160 344569fa3da97e961e286e34d4d4a315464ff63d SHA1 5041069e97ad085dafcb847f533d58a64ab74e1e SHA256 cef34a6e6e81f707e39b2aaf82c4736492323fa8799fd49108591fa7288bc14b
-MISC ChangeLog 41747 RMD160 63bbc59476dceeedae6d0a9ac68fe2637f22dac1 SHA1 68c62a2ab2c19b74470c4dd6e4e7655656739a67 SHA256 781f30d8dcf762cf65c7aefe57f4a44a421137bb5aa666c0defc11a37a086aeb
+EBUILD gedit-3.2.3.ebuild 2699 RMD160 55694c3626a1b1720478856d678e58f56d17bf28 SHA1 6cfa38b97881939d08d16093bba7f3ebd6123277 SHA256 bd158e801ec620502bc0d50bd01c06a76596830179258bfe9a4d45410e29562c
+EBUILD gedit-3.2.5.ebuild 2801 RMD160 ec8e0a7b0d9319192e8d47175b3618aae30dab38 SHA1 a4c9cd1792a627ff202862276e206739f80ad55f SHA256 48bda5d81accce4d4d838953aa89a02fd3279dad56f2dd022ed91226ca0030bd
+MISC ChangeLog 41916 RMD160 b946979ec9e129670209a5f179ff3ef7d88a2f4b SHA1 fc878ad07dd2a2d1501375b5036e29d670060002 SHA256 cc41a91ac8f5a316c1fc023a25271fe55f799d66d0c292c2ce51745b93c706da
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7yZS8ACgkQ1fmVwcYIWAZcQACghbmgi043mhNd+yPzRfBifnfX
-lJEAoJNrBDCN3SI5/4y5eB68TCRafvPW
-=iRfw
+iF4EAREIAAYFAk8QadAACgkQdjK8w9WeBnCJrQD/bqKc2pVdCrtMm92u9h1ObOL1
+BngtQ6tCj/5wN1ItHJ4A+QHCFcGdZKssjbD1eOLqRoHy7jJPDIBCRzHng63KjjmX
+=In4G
 -----END PGP SIGNATURE-----

diff --git a/app-editors/gedit/gedit-3.2.3.ebuild b/app-editors/gedit/gedit-3.2.3.ebuild
index 00ba14d5645ff60ce44c01382e3c4787471630ad..d4a718d0dd3136172cafc93fe1e4d71c595d4704 100644 (file)
--- a/app-editors/gedit/gedit-3.2.3.ebuild
+++ b/app-editors/gedit/gedit-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.3.ebuild,v 1.1 2011/11/20 22:19:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.3.ebuild,v 1.2 2012/01/13 17:28:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -40,7 +40,8 @@ COMMON_DEPEND="
                >=dev-libs/gobject-introspection-0.9.3
                >=x11-libs/gtk+-3.0:3[introspection]
                >=x11-libs/gtksourceview-2.91.9:3.0[introspection]
-               >=dev-python/pygobject-3.0.0:3 )
+               dev-python/pycairo
+               >=dev-python/pygobject-3.0.0:3[cairo] )
        spell? (
                >=app-text/enchant-1.2
                >=app-text/iso-codes-0.35
@@ -81,8 +82,7 @@ src_prepare() {
        gnome2_src_prepare
 
        # disable pyc compiling
-       mv "${S}"/py-compile "${S}"/py-compile.orig
-       ln -s $(type -P true) "${S}"/py-compile
+       echo > py-compile
 }
 
 src_test() {

diff --git a/app-editors/gedit/gedit-3.2.5.ebuild b/app-editors/gedit/gedit-3.2.5.ebuild
index e6dba6a3eeaefe7362a3cced00e35559f8f5c818..f5f2a59a957dd42b1eb014b3059ccc65f6b96325 100644 (file)
--- a/app-editors/gedit/gedit-3.2.5.ebuild
+++ b/app-editors/gedit/gedit-3.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.5.ebuild,v 1.1 2011/12/21 23:00:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.5.ebuild,v 1.2 2012/01/13 17:28:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -40,7 +40,8 @@ COMMON_DEPEND="
                >=dev-libs/gobject-introspection-0.9.3
                >=x11-libs/gtk+-3.0:3[introspection]
                >=x11-libs/gtksourceview-2.91.9:3.0[introspection]
-               >=dev-python/pygobject-3.0.0:3 )
+               dev-python/pycairo
+               >=dev-python/pygobject-3.0.0:3[cairo] )
        spell? (
                >=app-text/enchant-1.2
                >=app-text/iso-codes-0.35
@@ -81,8 +82,7 @@ src_prepare() {
        gnome2_src_prepare
 
        # disable pyc compiling
-       mv "${S}"/py-compile "${S}"/py-compile.orig
-       ln -s $(type -P true) "${S}"/py-compile
+       echo > py-compile
 
        # Fix missing file in POTFILES.in
        echo "plugins/quickopen/quickopen/__init__.py" >> po/POTFILES.in