summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-03-19 11:47:40 +0000
committerPacho Ramos <pacho@gentoo.org>2015-03-19 11:47:40 +0000
commit830ee4fdaeae7b96463fbb92cb8622f66e8c6a24 (patch)
tree0d96893270be244b81ba07b3915fe838dc5aa4dd /dev-libs/json-glib
parentVersion bump, drop old (diff)
downloadhistorical-830ee4fdaeae7b96463fbb92cb8622f66e8c6a24.tar.gz
historical-830ee4fdaeae7b96463fbb92cb8622f66e8c6a24.tar.bz2
historical-830ee4fdaeae7b96463fbb92cb8622f66e8c6a24.zip
Version bump, drop old
Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-libs/json-glib')
-rw-r--r--dev-libs/json-glib/ChangeLog9
-rw-r--r--dev-libs/json-glib/Manifest15
-rw-r--r--dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch47
-rw-r--r--dev-libs/json-glib/json-glib-0.16.2.ebuild33
-rw-r--r--dev-libs/json-glib/json-glib-1.0.4.ebuild (renamed from dev-libs/json-glib/json-glib-1.0.0.ebuild)30
5 files changed, 36 insertions, 98 deletions
diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 2a9dd975493a..142f9ec871a8 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/json-glib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.78 2015/03/15 13:18:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.79 2015/03/19 11:47:39 pacho Exp $
+
+*json-glib-1.0.4 (19 Mar 2015)
+
+ 19 Mar 2015; Pacho Ramos <pacho@gentoo.org> +json-glib-1.0.4.ebuild,
+ -files/json-glib-0.16.0-bsymbolic.patch, -json-glib-0.16.2.ebuild,
+ -json-glib-1.0.0.ebuild:
+ Version bump, drop old
15 Mar 2015; Pacho Ramos <pacho@gentoo.org> json-glib-1.0.2-r1.ebuild:
x86 stable, bug 534012
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index e301efa25bf9..5fd0f9bc459a 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,20 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX json-glib-0.16.0-bsymbolic.patch 1781 SHA256 7fa2b96f99788974c2c71ef6b5873dedfe50b22965a0262ba10c48f854a9b985 SHA512 aadfd889803a574d623efc1bfb64fb04274dabf687e164f58fbef81b6a03b30aeff35318b1c4f02f95c09bf2ebd3de6158d9b66008bda381ec91f1322345781a WHIRLPOOL d76e2226eaa750d8ac5fbf1bc1350beb885e62c92f5a5d2d820b2bf0967859df5f76e642d217be26408bd7e5686caed457464d237a927915a8cbce6cc28dcadb
-DIST json-glib-0.16.2.tar.xz 506640 SHA256 a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c SHA512 6e1d9f0c1dcf02f93f22089d4669948e3b3c8217ac0b78b626d5877445e705bc28aa4b47d410fa0e35ba0a1a14df594ac069f1f86fbd0e384a942f74e60b6a12 WHIRLPOOL c58c2269f7746f1491d5a9d0996aabd739c7ac73521c0bd8f37dd82bdd537eab26334e113bbfd0be17eb88950e11c2424018b62e9a815c95382c2cb664f75f43
-DIST json-glib-1.0.0.tar.xz 547100 SHA256 dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde SHA512 9c798f473804c672447599a66db88ad5ee9e46cc55cd2051e386fe960731dc4e3d46cfcc607ff7bbf60786ae00ca88aaf4e83795133bf54988f7fe5715479b37 WHIRLPOOL 7863a63d9ceec9ebd3f337d0dc61ce24d7609930808e2a89f5dbf762721a15d351800f36e7e5e5f7ae2cc4d5d535353a4aa0bcd7e82e15868cbcd7155cedce1f
DIST json-glib-1.0.2.tar.xz 550340 SHA256 887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a SHA512 c2934298d146749514706bcafda21e47a815480e2a85ae34560a6e4fd9063be2761786b8f8532965b417ccb18f96d2487ca5118c70d6112b3bbcdfe193bfcefd WHIRLPOOL 67ec22e65b847e7395c3f0a10000191b4d9ea296f24c334b0d1d0f06da4859be7c752a046757c64ec0c07c4c6e314108dc4a5a79f048370bf0682b3bd64af7d1
-EBUILD json-glib-0.16.2.ebuild 898 SHA256 04b4d381c79097cd2bdf0af205ff886934701e1315c3942763061010715dffbf SHA512 6db141f3cc479d4df919f0081f863162565b7cf0298dc15b36b53929a2ff0cd02460afaf092057cd606c6a9609424ab49c1723dd07d38f32d8483bb28fdee2a2 WHIRLPOOL 207ab2efdaa14716bf284b1264217372539db71d6f5ad4353253da5298afc92796f4f5b5bf2d4b3fb60c9f904efd2325713e358b18a2824b64af17b5e6aa2427
-EBUILD json-glib-1.0.0.ebuild 1173 SHA256 5c2c21b8750de123bdf2ef31cd3522cb5463c6e4c8d6c5f803f3a1486dc61412 SHA512 15790c484735c7413e8f174611c2c47c3f726ce6149956f44b20b907e4bf4dce50defef6a4105f93f2afd45cca570929e52116efc9222eb9a2ead8b994d25964 WHIRLPOOL 0f5a2de81f4746fd139004661eec5f6da37644d9edf0fded19099c7a658091e41e266c60862ce243d887bef8461e3d83e7729b2a027be8a2a7aca78a8e17deeb
+DIST json-glib-1.0.4.tar.xz 557236 SHA256 80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd SHA512 491a2353b7a82015516b5029d400874f35ba9d8ad914eb3f97e6106eaf2daa300147725ffbaaf5a67a6bf0da192beb47cd4edee47ecdb6a4be7dfd5f51463e5b WHIRLPOOL 337bdbd8108c5f94d212c0cb249f514aef10d5cc373ad24687cd52d115fd6c148d50aecfe664423c21f486b8ce2e88d4b8dffd18ac7d3a15332177c5aac88c25
EBUILD json-glib-1.0.2-r1.ebuild 1479 SHA256 41ec7de38b3a02e7a95cb3cb4f17ea0893af91f54ee1f37ef45970a10c36c6a5 SHA512 ed0c62f8329eef2fc3dcf201f3c9c3fe7f6f8b347ea30e3713c717c5508ceba40a20cf5d900ae267b272c5672eef5d8f90800aad1300d589653d17a426abb0c4 WHIRLPOOL 2421fd9e0f9df3cf6d6c56264dcb9178a6cf34afd25b196cd78487da61a56b4b5e7b8b792f9833eddbf92f7d5098d074e474ce32985706b36323038f6fab1c1e
EBUILD json-glib-1.0.2.ebuild 1177 SHA256 005b9fe606a0676fa107ea53da31379547e3ce4921fd4d4738d46c0dca0ed75f SHA512 f6437e480ebfec7597fa810b791af4cfaa65b829683faac8bd1fb914b881aa83a6b69920f6d6aa2208faf49792a96e6222a535d40d43b5104fb61bb0fa0119cc WHIRLPOOL f58c95edcdd26e14ef32812d3ce9d903e7818e2993a78b1321e746683e267e7d04ec7a122c8f54a4a3f089ff006230b3aecf1481b6838c31319f769eba0ff80d
-MISC ChangeLog 10360 SHA256 2c8358fe50bcbbc20f86cfb53a2fc49e1d2391ef84df0660d6b1e7a918d26d24 SHA512 8f7f1fd24bf37576a3567d016a75b489616fda2c7b3122224b78c8e3ae5bee535365ea613e36ad59837a894f48e17c7e7d13d1467a16655b2be69735bf28ab41 WHIRLPOOL 565e749b302322186fae3d02185578eb0d2804b11a332ef961f214ee8d1be78120db0f1f373592811790d5fd4f76f01281f6048b8586d767ec06c0d98b256bca
+EBUILD json-glib-1.0.4.ebuild 1501 SHA256 e0e8b721ef39ed60a057b3646fff3a3e64e1490ce88d5f2517cad7f78def283f SHA512 be7dac07f2fcf24933ef22ef9390b5d028d0d012038c1b34d5921bf2cd0e4025ca1bb8c45630d7b85fb6e5a2f98f62fb1594bf8674f260fc99ddc5eb81a8f977 WHIRLPOOL ceb27d9ccccd6e1d4d8ac01b387a393219e7a03418e39c492daf2ae6638c697daf1e5b6fd0b9b570fce0c535c7275ca127a48caeed537372f04993a66b0ec9ae
+MISC ChangeLog 10585 SHA256 a722096ba3aa3a5966a4e321802c260da6dcbaed2e5b8ff0ecff1f2e1b4522bf SHA512 49955e0b9b1e97b85555899c8da2e297efc449003e7c7c06c06a87e75df3f301084c57adc189b076d122b3e4c286be9bfeb1c40ad275234604124e405e4300f8 WHIRLPOOL ec6503540ff9498b66268d7a0912c13aee53b9eed8f4aad5edfa766664f6c652466c67c49ee45522a81819ab52f6d082a345b80a100f0989e8aca29970d0f4ff
MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlUFhnoACgkQCaWpQKGI+9RIYwCeLKXOQC8b3X4S7oaohbkPANm3
-rLsAnionxozcDP1xT4sw1l1kyWie5BUj
-=FmNF
+iEYEAREIAAYFAlUKt0YACgkQCaWpQKGI+9T/rwCfZDmnuxsN7fuNahHTdFcKzSKj
+aYgAoIGiUmqJZHRQFc0ISqE3DNz9Q87t
+=eqv+
-----END PGP SIGNATURE-----
diff --git a/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch b/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
deleted file mode 100644
index 81593a8f5b67..000000000000
--- a/dev-libs/json-glib/files/json-glib-0.16.0-bsymbolic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a9327484746820a5a2b8c1acf4a78470b004f0a0 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 11 Jul 2013 15:49:14 +0000
-Subject: build: Add configure option to enable -Bsymbolic
-
-We should always compile with -Bsymbolic enabled to avoid intra-library
-PLT jumps.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703734
----
-diff --git a/configure.ac b/configure.ac
-index 7c640fa..90654c6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,6 +93,30 @@ AC_MSG_RESULT([$platform_win32])
- AM_CONDITIONAL(OS_LINUX, [test "$platform_linux" = "yes"])
- AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
-
-+# Check for -Bsymbolic-functions to avoid intra-library PLT jumps
-+AC_ARG_ENABLE([Bsymbolic],
-+ [AS_HELP_STRING([--disable-Bsymbolic],
-+ [Avoid linking with -Bsymbolic])],
-+ [],
-+ [
-+ saved_LDFLAGS="${LDFLAGS}"
-+ AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-+ LDFLAGS=-Wl,-Bsymbolic-functions
-+ AC_TRY_LINK([], [int main (void) { return 0; }],
-+ [
-+ AC_MSG_RESULT([yes])
-+ enable_Bsymbolic=yes
-+ ],
-+ [
-+ AC_MSG_RESULT([no])
-+ enable_Bsymbolic=no
-+ ])
-+ LDFLAGS="${saved_LDFLAGS}"
-+ ])
-+
-+AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_LINK_FLAGS=-Wl[,]-Bsymbolic-functions])
-+JSON_LT_LDFLAGS="$JSON_LT_LDFLAGS $JSON_LINK_FLAGS"
-+
- AC_SUBST(JSON_LT_LDFLAGS)
-
- dnl === Dependencies ==========================================================
---
-cgit v0.9.2
diff --git a/dev-libs/json-glib/json-glib-0.16.2.ebuild b/dev-libs/json-glib/json-glib-0.16.2.ebuild
deleted file mode 100644
index ad6b6dc47bc2..000000000000
--- a/dev-libs/json-glib/json-glib-0.16.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.16.2.ebuild,v 1.10 2014/05/17 15:31:09 ago Exp $
-
-EAPI=5
-GCONF_DEBUG=yes
-
-inherit gnome2
-
-DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/JsonGlib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.34.0:2
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.13
- >=sys-devel/gettext-0.18
- virtual/pkgconfig
-"
-
-src_configure() {
- # Coverage support is useless, and causes runtime problems
- gnome2_src_configure \
- --disable-gcov \
- $(use_enable introspection)
-}
diff --git a/dev-libs/json-glib/json-glib-1.0.0.ebuild b/dev-libs/json-glib/json-glib-1.0.4.ebuild
index 126a2a0f3a19..18b907aa76ab 100644
--- a/dev-libs/json-glib/json-glib-1.0.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.0.4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.0.ebuild,v 1.1 2014/04/27 16:22:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.4.ebuild,v 1.1 2015/03/19 11:47:39 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
-inherit gnome2
+inherit gnome2 multilib-minimal
DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="https://wiki.gnome.org/JsonGlib"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
LICENSE="LGPL-2.1+"
SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
IUSE="debug +introspection"
RDEPEND="
- >=dev-libs/glib-2.37.6:2
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
DEPEND="${RDEPEND}
@@ -25,19 +25,33 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.18
- virtual/pkgconfig
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
"
src_prepare() {
# Do not touch CFLAGS
sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die
+ gnome2_src_prepare
}
-src_configure() {
+multilib_src_configure() {
# Coverage support is useless, and causes runtime problems
+ ECONF_SOURCE=${S} \
gnome2_src_configure \
--enable-man \
--disable-gcov \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
- $(use_enable introspection)
+ $(multilib_native_use_enable introspection)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/reference/html doc/reference/html || die
+ fi
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
}