| 1 |
commit: b042efe67bc4e29868802b2c9aa429a25124a65f |
| 2 |
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 16 15:58:58 2018 +0000 |
| 4 |
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 15:59:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b042efe6 |
| 7 |
|
| 8 |
dev-libs/glib: general fixes |
| 9 |
|
| 10 |
remove gnome-meson and some useless FIXME |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 13 |
Manifest-Sign-Key: 0x7DF238CF0AA182E1 |
| 14 |
|
| 15 |
dev-libs/glib/glib-2.54.3-r1.ebuild | 7 ++----- |
| 16 |
dev-libs/glib/{glib-2.54.3-r1.ebuild => glib-2.54.3-r2.ebuild} | 8 +++----- |
| 17 |
2 files changed, 5 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild b/dev-libs/glib/glib-2.54.3-r1.ebuild |
| 20 |
index 3f54b53e..4e5804f4 100644 |
| 21 |
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild |
| 22 |
+++ b/dev-libs/glib/glib-2.54.3-r1.ebuild |
| 23 |
@@ -167,8 +167,6 @@ multilib_src_configure() { |
| 24 |
# FIXME multilib automagic for libelf |
| 25 |
# FIXME set systemtap/tapse/static-lib install dir and test it. |
| 26 |
# FIXME no selinux, fam, xattr for now. |
| 27 |
- # FIXME is this still valid. |
| 28 |
- # libelf used only by the gresource bin ?? |
| 29 |
# FIXME enable docs if possible. |
| 30 |
|
| 31 |
use static-libs && myconf="-Ddefault_library='static'" |
| 32 |
@@ -177,8 +175,8 @@ multilib_src_configure() { |
| 33 |
gnome-meson_src_configure \ |
| 34 |
${myconf} \ |
| 35 |
-Denable-libmount=$(usex kernel_linux yes no) \ |
| 36 |
- $(gnome-meson_use systemtap dtrace) \ |
| 37 |
- $(gnome-meson_use systemtap) \ |
| 38 |
+ $(meson_use systemtap enable-dtrace) \ |
| 39 |
+ $(meson_use systemtap enable-systemtap) \ |
| 40 |
-Dwith-pcre=system \ |
| 41 |
-Dwith-docs=no \ |
| 42 |
-Dwith-man=yes |
| 43 |
@@ -217,7 +215,6 @@ multilib_src_test() { |
| 44 |
virtx meson_src_test |
| 45 |
} |
| 46 |
|
| 47 |
-# FIXME completentiondir |
| 48 |
multilib_src_install() { |
| 49 |
chmod +x glib-gettextize || die |
| 50 |
gnome-meson_src_install completiondir="$(get_bashcompdir)" |
| 51 |
|
| 52 |
diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild b/dev-libs/glib/glib-2.54.3-r2.ebuild |
| 53 |
similarity index 98% |
| 54 |
copy from dev-libs/glib/glib-2.54.3-r1.ebuild |
| 55 |
copy to dev-libs/glib/glib-2.54.3-r2.ebuild |
| 56 |
index 3f54b53e..8f25e3c9 100644 |
| 57 |
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild |
| 58 |
+++ b/dev-libs/glib/glib-2.54.3-r2.ebuild |
| 59 |
@@ -18,6 +18,7 @@ HOMEPAGE="https://www.gtk.org/" |
| 60 |
SRC_URI="${SRC_URI} |
| 61 |
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
| 62 |
|
| 63 |
+ |
| 64 |
LICENSE="LGPL-2.1+" |
| 65 |
SLOT="2" |
| 66 |
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
| 67 |
@@ -167,8 +168,6 @@ multilib_src_configure() { |
| 68 |
# FIXME multilib automagic for libelf |
| 69 |
# FIXME set systemtap/tapse/static-lib install dir and test it. |
| 70 |
# FIXME no selinux, fam, xattr for now. |
| 71 |
- # FIXME is this still valid. |
| 72 |
- # libelf used only by the gresource bin ?? |
| 73 |
# FIXME enable docs if possible. |
| 74 |
|
| 75 |
use static-libs && myconf="-Ddefault_library='static'" |
| 76 |
@@ -177,8 +176,8 @@ multilib_src_configure() { |
| 77 |
gnome-meson_src_configure \ |
| 78 |
${myconf} \ |
| 79 |
-Denable-libmount=$(usex kernel_linux yes no) \ |
| 80 |
- $(gnome-meson_use systemtap dtrace) \ |
| 81 |
- $(gnome-meson_use systemtap) \ |
| 82 |
+ $(meson_use systemtap enable-dtrace) \ |
| 83 |
+ $(meson_use systemtap enable-systemtap) \ |
| 84 |
-Dwith-pcre=system \ |
| 85 |
-Dwith-docs=no \ |
| 86 |
-Dwith-man=yes |
| 87 |
@@ -217,7 +216,6 @@ multilib_src_test() { |
| 88 |
virtx meson_src_test |
| 89 |
} |
| 90 |
|
| 91 |
-# FIXME completentiondir |
| 92 |
multilib_src_install() { |
| 93 |
chmod +x glib-gettextize || die |
| 94 |
gnome-meson_src_install completiondir="$(get_bashcompdir)" |
Archives