summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-16 21:23:25 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-16 21:23:25 +0000
commit412d11c1286a2670a14a2b6207bc9350ffb645b0 (patch)
treea9f0d9b43453eae881565d56f2ab898564d6c59c /dev-libs
parentverbose build for bug #447488 and clean out old/unneeded ebuilds (diff)
downloadhistorical-412d11c1286a2670a14a2b6207bc9350ffb645b0.tar.gz
historical-412d11c1286a2670a14a2b6207bc9350ffb645b0.tar.bz2
historical-412d11c1286a2670a14a2b6207bc9350ffb645b0.zip
Port to python-single-r1.eclass and EAPI5. Drop old.
Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64 Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libpeas/ChangeLog10
-rw-r--r--dev-libs/libpeas/Manifest19
-rw-r--r--dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch57
-rw-r--r--dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch25
-rw-r--r--dev-libs/libpeas/libpeas-1.6.0.ebuild73
-rw-r--r--dev-libs/libpeas/libpeas-1.6.2-r1.ebuild (renamed from dev-libs/libpeas/libpeas-1.6.1.ebuild)28
6 files changed, 26 insertions, 186 deletions
diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 758438c680e7..a819debae7cb 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/libpeas
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.9 2012/11/25 21:21:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.10 2012/12/16 21:23:19 tetromino Exp $
+
+*libpeas-1.6.2-r1 (16 Dec 2012)
+
+ 16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -files/libpeas-1.2.0-PeasPluginInfo-annotation.patch,
+ -files/libpeas-1.4.0-pkgconfig.patch, -libpeas-1.6.0.ebuild,
+ -libpeas-1.6.1.ebuild, +libpeas-1.6.2-r1.ebuild:
+ Port to python-single-r1.eclass and EAPI5. Drop old.
*libpeas-1.6.2 (25 Nov 2012)
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index f8a1208bbf00..b104d29733e9 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,20 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX libpeas-1.2.0-PeasPluginInfo-annotation.patch 2255 SHA256 2b187f0681021ea1cca8f805e9eaf452cd7c5611c80bfa1e04315aac68b75f80 SHA512 abc843a75ed6572530771b4fa2dbafe4c3b5b09a0fc4c6871f9b52c96c67914289315bad6a1397aa724dcdc048affbd274b5a74392b62e5616d9f274774b9514 WHIRLPOOL 82a024775c3fd06880d3382dfaa0c8a684ef9f1ec6955fedfd878ea5bfaad6f98e4073a58c096807d0e0b57db03c5af5bb808a5d835854877eabbd01b5ab2bbe
-AUX libpeas-1.4.0-pkgconfig.patch 1009 SHA256 58dd1842947442f9b548e9bde969ba0e122b407fc956da439c323a444c3e128e SHA512 d5c8317eba938826c903884191d1acf125a1d1c742ac06ff8316d54c1392a8c87d2b83ef2a11f128d061982bd78f3499e7da9ac45256695dfeb73bf33a11f0e2 WHIRLPOOL 15253ad6d7426e39e6102cafa97e4c41d2212674f3fd89e01f2b00177e716bb1e1ab7a4b4c78764e203860cd0288eccf5ab515e217fe65dc139ad13c2a129178
-DIST libpeas-1.6.0.tar.xz 521520 SHA256 23c1385cba2e32201588c988ea6894b27a115efc01cb4acb927e984456ffd63c SHA512 e6b0bc9c8efe954dbf30fe8363d8e45224c03f53b64d41a217d9aee6f29e4e7a826877bd392dea5d555ce339cc91fc730d8ccd986fa3d78468cdf0b70878380c WHIRLPOOL 22f8f44fa8868444f523a848bbcea045cc3408f61d7d38bfd5243b38d26d52a4d3e4d7ba647f30e4990bf49900e0ecbe1210659e32cc5b25ebcd50d32dc4768e
-DIST libpeas-1.6.1.tar.xz 523800 SHA256 7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39 SHA512 8160730bd6f97e1e9d01c497c9053e5f070a7f555fa0c073a5f257220b9525a65a94ced2651ca3897bf0f2a0915082fc10915aad67906cf3afff9c8734de7f38 WHIRLPOOL 68e87c21580a962d4cf0d8f00358a8d94e25465fde3c55b34821b43faeb7eb869733558a4c6837f1a25cd9319bf7a0ad41d240c0e80590958a754414044e421c
DIST libpeas-1.6.2.tar.xz 525540 SHA256 26fb143ce4e89eb809f96113cd010d33fd337833bd70ab3b29c567f19376a65f SHA512 d8c21bb808f8cdd440fc5dfb2e5376b0935a4d6599eb3951fd03d700aa212688c0fecd112adefede9911be9db9b9dff4e1e866f032a79153bd0e750b5fdbdd25 WHIRLPOOL 9b876c43880d4548777b6ad1325caf6b84ed33fac7843b166769805b2be37cccc2ae33f9274faaaefe122910e48228ae7961e083fc1e26ba4d2864d0ebec0934
-EBUILD libpeas-1.6.0.ebuild 1977 SHA256 3b0f294678623928cfb1f89eaf9cd83eb3e66e9a8213ffc6292866ba94ed37d3 SHA512 fe37d28a8623a7440b6bada3aec9191fa44a2c6b9ae5bd0aeccba4a973da8aac78adc212d36ad6c11a6cbb1c43081a6175460b9f26d7d40fdc152a48bb51adc7 WHIRLPOOL b9fbd6780c59267db9fc4df0afd224dcadc575fbf6c9cf3db09a0d1340e05f92f28033a8be79188f9120c495a9b83c6c0e007d1227f6112a3bd7c2f20d137425
-EBUILD libpeas-1.6.1.ebuild 1957 SHA256 3ba05310efdb9f879fcdbef4b3b0130f6ffe32359f1f41abc24c94e6f39699b6 SHA512 7a251492e3d380c71fe18d5125f2072144afa1e0776fbab52c64c48c2eb21a45b387f7ae8d9d3bb948277b16a79ee8a90b4f7591c278d2d158ed1118baf1ff00 WHIRLPOOL 0e7332466f80f4b3a3a0a4bf570b87faeeabff83c678771f0125069556b898bbaed8763bcd910bc733e95c55ef897eb484067da7b555d9e6a2b489190635d8ba
+EBUILD libpeas-1.6.2-r1.ebuild 1721 SHA256 7421969f3a9839a903ede5fef6c189e688b42454648cab52e5f6247ffdc029a6 SHA512 585b47c3e849184299f115a1fcd06a3efceb22a4624ebfaabb76313b3ff2349a254b80ba9b4c20f8d143171f2634dbb788d05e13769d05b8d212eff4147a3c78 WHIRLPOOL 137a069427a64beac92f2bb59043a4982b572d0f9c6223e1e2fcc8bc251304839d76efabdd1dca9f90fd402a2f3920dc891144b529027ab0720f98be23cd6732
EBUILD libpeas-1.6.2.ebuild 1955 SHA256 8097d3ffcdce9ebdc9d20834981456033f6b0b3f794b02a62eeb918f6474ee6c SHA512 780ee1bfbc3c319274934c303cc7335ed313225b8219b5279752d6f6024a42eecf4783029a43fba44babec462b9b9dd89320570bd0f16368341457f86fcdb34f WHIRLPOOL 803fb8d613e8f0809229cfe2920dd43d8b330941360367ea26eb43d1bd138af6b27ddeb13b17decbda537d70fc8e479bd8a15dde20cd25077f1544ff423237eb
-MISC ChangeLog 1943 SHA256 1b9cf08cde2166d82446f38a4f8f0082ff7e66d6c11b16ef41bb3fb9ef9e6e6f SHA512 b47269d13035d9beb1b13f4b3607672817a8fe35086e265a4af7793d8ae6c8785567ebcaa9db38f3ba9488dec85b444ff12639af9134554f9b9c65f48ec1525a WHIRLPOOL 51a1b248f16b098e45d66182213f31209dd7d728dfbbc1ba1805f522e041cf4a8e145b54460cced21712e91b951d2c5fad2159a65bbfe40c86c322cbe311e2f9
+MISC ChangeLog 2268 SHA256 6d38e8efe188c06e081e402452a624047ec9f4edf20a3ee6b0c8d6d8d69fd55e SHA512 7b1f2e3f157937b1fb0ef21c8b8b94e7738f7a6e719acdb670fdc899f0f5e4bac7b8dc4206dcb078688575c04b765596832219978012a2bac2e045b9c7e348e3 WHIRLPOOL 2c20723161002b1ec3a56a6b554dea9badb3c1d2dffbc03710eb2d824ab5a33185c5c115291792ad333fb603159b5e2d486d036cfb57f82437cc36cd6a3cea5e
MISC metadata.xml 531 SHA256 51dd5faefa5c4d563cd93744c74166cd21b2fbaba1ddb8b64239c25d53962c21 SHA512 237be10858c63fd7e3c335692ca2276b3b2062b52b30de2bcc99cfbcb0fb2d059cf8facebc65a1aecd0bf9a3092c51e1cc287d35cc13f52b5b5e8d11bdbf877c WHIRLPOOL 3375f4b5fad86a6ecc774b4071c7c637a01d58ee1305210c56a5d7f5dca0b76cd183f285348366b80c202c0f5b5c42d6bd7c5c7c3d6501a414a2481e142efb48
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCyi+oACgkQ1fmVwcYIWAb4QgCgpf6gzlo9WpglHHB1Go5+HqDr
-LloAoLIbRXuMSd8JF1sfqSTBQeio3T9u
-=H/3d
+iQEcBAEBCAAGBQJQzjvJAAoJEJ0WA1zPCt1hAyAH/Aiy5/kFrr5uOAd5uAwJYWXR
+yKTT9/xMPD+BdXy62HxOqB+NBfDic+vJDcrxYR74bIVIipuu1NIEIHrpyX7pNOFT
+OuBixPDAl/pIHWBUsuygVXqCs5Vgc4tN56mYDCh12GIX9on3JXQmmoNPpYc0uHvL
+3YBbJotZeRJt9nRk6+T5mkdODjB1GBP4bOhx3YcPdwQWv+wyUvDo5NI0ph7ZznxL
+syFTT8jx0IRRYvWksPCocNiXsbHodbpFBTFids0BqfX4H0tSEIGbTBUa0L/YlwKZ
+hHPTCUE2w7uLQfXVOYObxMio1DxJMFCCdauVRZk0C7Vj2eFwCgsBLD0yg/1aW0s=
+=0DWr
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch b/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
deleted file mode 100644
index 3a2e9b4c88d8..000000000000
--- a/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From afa50c526ce1aab53eff3c3373a97180fc90abe2 Mon Sep 17 00:00:00 2001
-From: Garrett Regier <garrettregier@gmail.com>
-Date: Thu, 29 Sep 2011 15:46:49 -0700
-Subject: [PATCH] Annotate PeasPluginInfo return values as transfer none
-
-Otherwise GObject-Introspection says that it is transfer full.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660524
----
- libpeas-gtk/peas-gtk-plugin-manager-view.c | 2 +-
- libpeas/peas-engine.c | 2 +-
- libpeas/peas-extension-base.c | 3 ++-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libpeas-gtk/peas-gtk-plugin-manager-view.c b/libpeas-gtk/peas-gtk-plugin-manager-view.c
-index 7eb7361..5f8f55f 100644
---- a/libpeas-gtk/peas-gtk-plugin-manager-view.c
-+++ b/libpeas-gtk/peas-gtk-plugin-manager-view.c
-@@ -952,7 +952,7 @@ peas_gtk_plugin_manager_view_set_selected_plugin (PeasGtkPluginManagerView *view
- *
- * Returns the currently selected plugin, or %NULL if a plugin is not selected.
- *
-- * Returns: the selected plugin.
-+ * Returns: (transfer none): the selected plugin.
- */
- PeasPluginInfo *
- peas_gtk_plugin_manager_view_get_selected_plugin (PeasGtkPluginManagerView *view)
-diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
-index 1adf4ff..7b57d56 100644
---- a/libpeas/peas-engine.c
-+++ b/libpeas/peas-engine.c
-@@ -733,7 +733,7 @@ compare_plugin_info_and_name (PeasPluginInfo *info,
- * Gets the #PeasPluginInfo corresponding with @plugin_name,
- * or %NULL if @plugin_name was not found.
- *
-- * Returns: the #PeasPluginInfo corresponding with
-+ * Returns: (transfer none): the #PeasPluginInfo corresponding with
- * a given plugin module name.
- */
- PeasPluginInfo *
-diff --git a/libpeas/peas-extension-base.c b/libpeas/peas-extension-base.c
-index 329a25f..7c4cba0 100644
---- a/libpeas/peas-extension-base.c
-+++ b/libpeas/peas-extension-base.c
-@@ -141,7 +141,8 @@ peas_extension_base_class_init (PeasExtensionBaseClass *klass)
- *
- * Get information relative to @extbase.
- *
-- * Return value: the #PeasPluginInfo relative to the #PeasExtensionBase.
-+ * Return value: (transfer none): the #PeasPluginInfo relative
-+ * to the #PeasExtensionBase.
- */
- PeasPluginInfo *
- peas_extension_base_get_plugin_info (PeasExtensionBase *extbase)
---
-1.7.7.2
-
diff --git a/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch b/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch
deleted file mode 100644
index 125af02657b9..000000000000
--- a/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d6ea307cf45af6b92b1cd708d0ee288aca0b3fe Mon Sep 17 00:00:00 2001
-From: Olav Vitters <olav@vitters.nl>
-Date: Wed, 28 Mar 2012 15:28:40 +0200
-Subject: [PATCH] fix forgotten @ in pkgconfig file
-
----
- data/libpeas-1.0.pc.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/libpeas-1.0.pc.in b/data/libpeas-1.0.pc.in
-index 9523067..704d686 100644
---- a/data/libpeas-1.0.pc.in
-+++ b/data/libpeas-1.0.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
-
- Name: libpeas
- Description: libpeas, a GObject plugins library
--Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@
-+Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED@ gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@
- Version: @VERSION@
- Cflags: -I${includedir}/libpeas-1.0
- Libs: -L${libdir} -lpeas-1.0
---
-1.7.8.6
-
diff --git a/dev-libs/libpeas/libpeas-1.6.0.ebuild b/dev-libs/libpeas/libpeas-1.6.0.ebuild
deleted file mode 100644
index ce77a2d2a011..000000000000
--- a/dev-libs/libpeas/libpeas-1.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.0.ebuild,v 1.1 2012/09/30 07:36:54 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit eutils gnome2 multilib python virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="doc gjs +gtk glade +python seed"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- >=dev-libs/gobject-introspection-0.10.1
- gjs? ( >=dev-libs/gjs-1.31.11 )
- glade? ( >=dev-util/glade-3.9.1:3.10 )
- gtk? ( >=x11-libs/gtk+-3:3[introspection] )
- python? ( >=dev-python/pygobject-3.0.0:3 )
- seed? ( >=dev-libs/seed-2.91.91 )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- $(use_enable gjs)
- $(use_enable glade glade-catalog)
- $(use_enable gtk)
- $(use_enable python)
- $(use_enable seed)
- --disable-deprecation
- --disable-static"
- # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
- # What do we do about gdb, valgrind, gcov, etc?
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- use python && python_clean_py-compile_files
- gnome2_src_prepare
-}
-
-src_test() {
- # FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
- # DO NOT REPORT UPSTREAM, this is not a libpeas bug.
- # To reproduce:
- # >>> from gi.repository import Gtk
- # >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
- # This should return True, it returns False for Xvfb
- Xemake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- use python && python_mod_optimize /usr/$(get_libdir)/peas-demo
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/$(get_libdir)/peas-demo
-}
diff --git a/dev-libs/libpeas/libpeas-1.6.1.ebuild b/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
index 1b9b2951ddd7..f057c0f4dc9c 100644
--- a/dev-libs/libpeas/libpeas-1.6.1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.1.ebuild,v 1.1 2012/10/20 06:46:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild,v 1.1 2012/12/16 21:23:19 tetromino Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils gnome2 multilib python virtualx
+inherit eutils gnome2 multilib python-single-r1 virtualx
DESCRIPTION="A GObject plugins library"
HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
@@ -22,20 +22,19 @@ RDEPEND=">=dev-libs/glib-2.32:2
gjs? ( >=dev-libs/gjs-1.31.11 )
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
- python? ( >=dev-python/pygobject-3.0.0:3 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
seed? ( >=dev-libs/seed-2.91.91 )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
>=sys-devel/gettext-0.17"
pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
+ use python && python-single-r1_pkg_setup
}
src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README"
-
G2CONF="${G2CONF}
$(use_enable gjs)
$(use_enable glade glade-catalog)
@@ -47,7 +46,6 @@ src_prepare() {
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
- use python && python_clean_py-compile_files
gnome2_src_prepare
}
@@ -60,13 +58,3 @@ src_test() {
# This should return True, it returns False for Xvfb
Xemake check
}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- use python && python_mod_optimize /usr/$(get_libdir)/peas-demo
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/$(get_libdir)/peas-demo
-}