diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-12-01 11:40:53 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-12-01 11:40:53 +0000 |
| commit | b74f72fb98e93c548503721c5c3a613b4550190c (patch) | |
| tree | 67f594f405eb0ed236f59100fa58b6d1d8fd6e65 /app-editors | |
| parent | Add a new snapshot fixing multiple bugs, including bug #506128 by Tim Mohlmann. (diff) | |
| download | historical-b74f72fb98e93c548503721c5c3a613b4550190c.tar.gz historical-b74f72fb98e93c548503721c5c3a613b4550190c.tar.bz2 historical-b74f72fb98e93c548503721c5c3a613b4550190c.zip | |
Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use the correct implementation.
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/gedit-plugins/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/gedit-plugins/Manifest | 22 | ||||
| -rw-r--r-- | app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild | 11 |
3 files changed, 30 insertions, 9 deletions
diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog index ad822ae06929..7f1be531fdb2 100644 --- a/app-editors/gedit-plugins/ChangeLog +++ b/app-editors/gedit-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/gedit-plugins # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.51 2014/11/25 15:38:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.52 2014/12/01 11:40:51 mgorny Exp $ + + 01 Dec 2014; Michał Górny <mgorny@gentoo.org> gedit-plugins-3.12.1-r1.ebuild: + Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use + the correct implementation. 25 Nov 2014; Pacho Ramos <pacho@gentoo.org> gedit-plugins-3.12.1-r1.ebuild: Support python 3.4 diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index d85aeda0f0e7..65ea464d90ae 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -2,14 +2,26 @@ Hash: SHA256 DIST gedit-plugins-3.12.1.tar.xz 1291692 SHA256 431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f SHA512 6ed7265b90ed6ef2fcde65a5cec807a6583110b33a1255ed71fa1dd0c3d4ffa9874a5304d9e0f957151cfe0b58cef21b1af842dd066a04c865e5483e98f885a2 WHIRLPOOL a937ea666a9249696d640d1b288bfae526898db961f5fffbd99ebc9e925660081be17e208c7086df5e58c082f5322d3889e0dfb4021cc0b929caf1a937530c74 -EBUILD gedit-plugins-3.12.1-r1.ebuild 2124 SHA256 1e11982335fadd97ab5e4ba8bf516aa8c265452ad1a63327c99557393b5fcd7e SHA512 6bff9fec1b88e0bd1a545ba0fe9a4ee43f2df140cb0d46c6f1699144f54bb8424f19d253b1694b26aad606e1da7a76e90b8448cc6b185a0ceffcdd282649abef WHIRLPOOL 4ebb32bd24ecc4679dbdb4a30852b4d959cb479def2c5123819f97a779cfa10508140d3fb1ef221192fc82423fb76ef238e468c30290f38a98ee20e87df402f1 +EBUILD gedit-plugins-3.12.1-r1.ebuild 2281 SHA256 efe9b2fe0e74ca6afa8586035c58fd23ccb00db8badda2f573637ed59421c15c SHA512 e9c1b34ac647b6ec9224fa137a2d4292abcbd2f9f657b61c77859b77ca313af8c39d7768428b1ebd445ae69bf8bd843dd541d2e3305e4a82c4f48cf8828e6529 WHIRLPOOL 10333b8af987c5f2c8cc07c9603975b5537688398f8b0a71d0f380192915da7bf4ded0c69e66e0abf7d6e496f98a5bcf9e6b0538dd6d1770584330fa4e4669f8 EBUILD gedit-plugins-3.12.1.ebuild 2115 SHA256 75d1f493699fde79ed6cb2b83d8c26a2cf6d8e5cb221e4e1a7c324a8eda74014 SHA512 963dab2d8bb0b3f1aa8ee22f409754af9edea4f1f578ffa72a8d34b4846bcb525167c11f72a3fa9f80dcfa8e2fd3ff81a811146d99b7cf5d484951ec6584d927 WHIRLPOOL a8608db9f48817474f39a01a1e8b765c5c50266e762e0be50b8ef6b0fb63c46a2f131a80b14b1ab9ecca40a665941f2a8d39e53ed1446b5be730bd7def7b6b5d -MISC ChangeLog 9598 SHA256 97e6ef98b24922a8dc71584371efeb9e398c73d3cbc60f50e4aa8bf152728898 SHA512 b5034d4ea04d6b43fb3d0e3e531145f39b1c5d2785f68a1869566e1ac4ab036bee524849da5981c5a1e978cdca0c888e83c3e5105a8745d12650e5d79292ec03 WHIRLPOOL d16e03e3bb1ca2d31f7caba8b4f38d585e202867e11012d8a89bc40e5fc15208ddb7ea3f0abdf5e408ab57ec7e5cb0b501483ee89c537250888fa44c850abf25 +MISC ChangeLog 9793 SHA256 817215ed103c8180042409e4af0947987b37819bb7df0daf164eec075e985d0e SHA512 a19969e9bf235b499947312458a4d93deb796c3a867d738d96a36ca8d0ce4a6f320de02ce4e8ae0d7800981be1e71cd0d05e135e1cfe6cde43f398663a953601 WHIRLPOOL cf1fa1bcb099a6e391221979d5789ddcd3b4e08cee232a7fe533e79cbbd8356e753b5d838ef2c165c65ffbd5f9bb8f77e949750b248837bcd948b49304176e92 MISC metadata.xml 451 SHA256 c9f3d589eeb5cca603c8ab821303ce6b872b82deaf227be40fc8478256bfe8a3 SHA512 26c2c2b34400f6ca2e591229d47df1e1fdc308eec37dedd9d579d1646f48cd13c0e160244aa393d7e47a8390fa99b49d5ef9033ce4953b08e02d609bf66f988c WHIRLPOOL edfc68ba7da806d320358a51e78cfbc280e221871ebda8034800df8509339ec8e6eae2f7f2d15a8420f2eb8f9a364507c19ef1d603db09d0a046b6bf12eda603 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR0onoACgkQCaWpQKGI+9RuVACfVy5Aq64x0UBHQmuX/DROzvGU -snAAn2cH4flQ6PM6y78J1QKtysAlPjdq -=Z5RP +iQJ8BAEBCABmBQJUfFPEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOKcP/ivFDTbHU/XdkMEf7238F8rL +DFGLt4tTvGhQ6AXVS2VSwLpqCeEio6A0ulO5xsLFszOrcMJssuT+2t61jpmUE/5A +4FljrtcAqm7Z//+SQ4Upw8qAPaB1oLG59zMvamaF3i0sAzx+Y6nOt73JMPttLp4S +s69GWvCvWnjkUH23e7fMHC413i4xGplMzDJ68LhbcNRCj13WkpfzPgQGgcKQb56L +seMQ2GayqbqPPWlr9nrWMVwhB01zL+Gg/jwLSX2SS9B2UXXhyWhFVaQYdiGb/YCg +uuAItxhORRqK7kBwR2I41ii6bOyxcaHPfKUH721IQn6zp8rwLJGgT/gEuQq8Gu7p +0OnkuvVYfa42UiR/aHX5OQiCl3B7sa3o2in7o/m4YDhXMtmCFTyQXAh7u+I75R1v ++rAVQUB71WyDqbF9cQ0Ej+oTtO5oCSBO8EPGFqHW8afky1MQ36gJ8CDRnEwjFaBU +qGyexOZG/Uh6iNHOvW9Wh9cEHW2jqnzAw43OWReeqPEj2B8zgbEVOrUgltcRM0xL +4UtWJwi4BzZHkVJe1i2wMyy+Gtn3JyoKtNcwjKhhc568aA/dG0TbKourvdYM50wZ +qD1jziFPZc5Gry4ISUjTy2PmHhIa4gjmgnhEYfPu5Igs8w8LW5+GqNyAdwd5z8eg +0FNyaxR0DzcNLQX2dd/R +=51Cp -----END PGP SIGNATURE----- diff --git a/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild index 21b817b42fdd..621ee6bd49a2 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild,v 1.2 2014/11/25 15:38:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild,v 1.3 2014/12/01 11:40:51 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{2,3,4} ) +PYTHON_COMPAT=( python3_{3,4} ) PYTHON_REQ_USE="xml" inherit eutils gnome2 multilib python-r1 @@ -19,11 +19,12 @@ SLOT="0" IUSE_plugins="charmap git terminal" IUSE="+python ${IUSE_plugins}" +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas REQUIRED_USE=" charmap? ( python ) git? ( python ) + python? ( ^^ ( $(python_gen_useflags '*') ) ) terminal? ( python ) - python? ( ${REQUIRED_PYTHON_USE} ) " RDEPEND=" @@ -54,6 +55,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +pkg_setup() { + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup +} + src_configure() { gnome2_src_configure \ $(use_enable python) \ |