| 1 |
commit: 1b1d0e6e361461acd389521433516b980bffa1d8 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 6 23:53:21 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Mar 6 23:53:21 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b1d0e6e |
| 7 |
|
| 8 |
dev-libs/gobject-introspection: 1.31.10 → 1.31.20 |
| 9 |
|
| 10 |
Lots of g-ir-doc-tool changes (and it's now optional). Require |
| 11 |
python-2.7 due to extensive use of {} syntax for mutable sets. |
| 12 |
|
| 13 |
--- |
| 14 |
...ebuild => gobject-introspection-1.31.20.ebuild} | 16 +++++++--------- |
| 15 |
.../gobject-introspection-9999.ebuild | 16 +++++++--------- |
| 16 |
2 files changed, 14 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.31.10.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.31.20.ebuild |
| 19 |
similarity index 90% |
| 20 |
rename from dev-libs/gobject-introspection/gobject-introspection-1.31.10.ebuild |
| 21 |
rename to dev-libs/gobject-introspection/gobject-introspection-1.31.20.ebuild |
| 22 |
index 0083c02..4d57120 100644 |
| 23 |
--- a/dev-libs/gobject-introspection/gobject-introspection-1.31.10.ebuild |
| 24 |
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.31.20.ebuild |
| 25 |
@@ -5,7 +5,7 @@ |
| 26 |
EAPI="4" |
| 27 |
GCONF_DEBUG="no" |
| 28 |
GNOME2_LA_PUNT="yes" |
| 29 |
-PYTHON_DEPEND="2:2.5" |
| 30 |
+PYTHON_DEPEND="2:2.7" |
| 31 |
|
| 32 |
inherit python gnome2 |
| 33 |
if [[ ${PV} = 9999 ]]; then |
| 34 |
@@ -23,9 +23,10 @@ else |
| 35 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 36 |
fi |
| 37 |
|
| 38 |
-IUSE="doc test" |
| 39 |
+IUSE="doc doctool test" |
| 40 |
|
| 41 |
RDEPEND=">=dev-libs/glib-2.29.7:2 |
| 42 |
+ doctool? ( dev-python/mako ) |
| 43 |
virtual/libffi" |
| 44 |
DEPEND="${RDEPEND} |
| 45 |
dev-util/pkgconfig |
| 46 |
@@ -41,6 +42,7 @@ pkg_setup() { |
| 47 |
G2CONF="${G2CONF} |
| 48 |
--disable-static |
| 49 |
YACC=$(type -p yacc) |
| 50 |
+ $(use_enable doctool) |
| 51 |
$(use_enable test tests)" |
| 52 |
|
| 53 |
python_set_active_version 2 |
| 54 |
@@ -51,14 +53,9 @@ src_prepare() { |
| 55 |
# FIXME: Parallel compilation failure with USE=doc |
| 56 |
use doc && MAKEOPTS="-j1" |
| 57 |
|
| 58 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=659824 |
| 59 |
- sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die |
| 60 |
- |
| 61 |
gnome2_src_prepare |
| 62 |
|
| 63 |
- # Don't pre-compile .py |
| 64 |
- echo > py-compile |
| 65 |
- echo > build-aux/py-compile |
| 66 |
+ python_clean_py-compile_files |
| 67 |
|
| 68 |
gi_skip_tests= |
| 69 |
if ! has_version "x11-libs/cairo[glib]"; then |
| 70 |
@@ -83,7 +80,8 @@ src_test() { |
| 71 |
|
| 72 |
src_install() { |
| 73 |
gnome2_src_install |
| 74 |
- python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,doc-tool,scanner} |
| 75 |
+ python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,scanner} |
| 76 |
+ use doctool && python_convert_shebangs 2 "${ED}"usr/bin/g-ir-doc-tool |
| 77 |
} |
| 78 |
|
| 79 |
pkg_postinst() { |
| 80 |
|
| 81 |
diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild |
| 82 |
index 0083c02..4d57120 100644 |
| 83 |
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild |
| 84 |
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild |
| 85 |
@@ -5,7 +5,7 @@ |
| 86 |
EAPI="4" |
| 87 |
GCONF_DEBUG="no" |
| 88 |
GNOME2_LA_PUNT="yes" |
| 89 |
-PYTHON_DEPEND="2:2.5" |
| 90 |
+PYTHON_DEPEND="2:2.7" |
| 91 |
|
| 92 |
inherit python gnome2 |
| 93 |
if [[ ${PV} = 9999 ]]; then |
| 94 |
@@ -23,9 +23,10 @@ else |
| 95 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 96 |
fi |
| 97 |
|
| 98 |
-IUSE="doc test" |
| 99 |
+IUSE="doc doctool test" |
| 100 |
|
| 101 |
RDEPEND=">=dev-libs/glib-2.29.7:2 |
| 102 |
+ doctool? ( dev-python/mako ) |
| 103 |
virtual/libffi" |
| 104 |
DEPEND="${RDEPEND} |
| 105 |
dev-util/pkgconfig |
| 106 |
@@ -41,6 +42,7 @@ pkg_setup() { |
| 107 |
G2CONF="${G2CONF} |
| 108 |
--disable-static |
| 109 |
YACC=$(type -p yacc) |
| 110 |
+ $(use_enable doctool) |
| 111 |
$(use_enable test tests)" |
| 112 |
|
| 113 |
python_set_active_version 2 |
| 114 |
@@ -51,14 +53,9 @@ src_prepare() { |
| 115 |
# FIXME: Parallel compilation failure with USE=doc |
| 116 |
use doc && MAKEOPTS="-j1" |
| 117 |
|
| 118 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=659824 |
| 119 |
- sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die |
| 120 |
- |
| 121 |
gnome2_src_prepare |
| 122 |
|
| 123 |
- # Don't pre-compile .py |
| 124 |
- echo > py-compile |
| 125 |
- echo > build-aux/py-compile |
| 126 |
+ python_clean_py-compile_files |
| 127 |
|
| 128 |
gi_skip_tests= |
| 129 |
if ! has_version "x11-libs/cairo[glib]"; then |
| 130 |
@@ -83,7 +80,8 @@ src_test() { |
| 131 |
|
| 132 |
src_install() { |
| 133 |
gnome2_src_install |
| 134 |
- python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,doc-tool,scanner} |
| 135 |
+ python_convert_shebangs 2 "${ED}"usr/bin/g-ir-{annotation-tool,scanner} |
| 136 |
+ use doctool && python_convert_shebangs 2 "${ED}"usr/bin/g-ir-doc-tool |
| 137 |
} |
| 138 |
|
| 139 |
pkg_postinst() { |
Archives