From fa8bd509f288bbff2c6ae88b0f0ba342495bb311 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 22 Dec 2014 18:10:21 +0000 Subject: [PATCH] Version bump for Gnome 3.14. Clean up old revision. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806 --- dev-libs/libgweather/ChangeLog | 9 +- dev-libs/libgweather/Manifest | 13 +- .../files/libgweather-3.12.2-yr_no-api.patch | 119 ------------------ ....2-r1.ebuild => libgweather-3.14.2.ebuild} | 14 +-- dev-libs/libpeas/ChangeLog | 8 +- dev-libs/libpeas/Manifest | 12 +- ...as-1.10.0.ebuild => libpeas-1.12.1.ebuild} | 60 ++++----- 7 files changed, 55 insertions(+), 180 deletions(-) delete mode 100644 dev-libs/libgweather/files/libgweather-3.12.2-yr_no-api.patch rename dev-libs/libgweather/{libgweather-3.12.2-r1.ebuild => libgweather-3.14.2.ebuild} (74%) rename dev-libs/libpeas/{libpeas-1.10.0.ebuild => libpeas-1.12.1.ebuild} (51%) diff --git a/dev-libs/libgweather/ChangeLog b/dev-libs/libgweather/ChangeLog index ab20cba83f9e..0f51fd25e610 100644 --- a/dev-libs/libgweather/ChangeLog +++ b/dev-libs/libgweather/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libgweather # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.118 2014/12/19 13:35:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/ChangeLog,v 1.119 2014/12/22 18:10:18 eva Exp $ + +*libgweather-3.14.2 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue + -libgweather-3.12.2-r1.ebuild, +libgweather-3.14.2.ebuild, + -files/libgweather-3.12.2-yr_no-api.patch: + Version bump for Gnome 3.14. Clean up old revision. 19 Dec 2014; Pacho Ramos libgweather-3.12.3.ebuild: amd64 stable, bug 529964 diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index c3f367c1bf32..9f2dceeb5672 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,17 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libgweather-3.12.2-yr_no-api.patch 8422 SHA256 a3e42d7facd4ea2aa2c3424f94baa936b3aa81a7769cde1ae5b6345217ca90d5 SHA512 06ad2b1a539449432cf01ce7deb7a6321d4c4ac310969c767fef410ddf73e3be0af1242fdfad7dee51c8f5526a5092f5c55f0737db262f4f767f7867a1498aa8 WHIRLPOOL a1a50a407910f67a8eccd9411c6b459cb3f19d74d2fa8e2785c9b64ab0d06b705715ff4ea552605db699f90a60cb540d8d58e121e52aeb1eb9e57427a0e731c2 -DIST libgweather-3.12.2.tar.xz 3985056 SHA256 54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37 SHA512 04e3e7be923813e1dedca90931a12270b6e6d9b0329c35f8dbc0398f0a413e0511dcaa7aab7191b8e72c66b929f381c9cd810702cefb35ea0d79c3af0a6db5d2 WHIRLPOOL 384dada98adc101414063e3d6301e821abf79261d00e9532e2287643963d0556da254e9bcbfbb183eb36b8acde1278c31904dd75bb2eaf92d16fa6926ebb8846 DIST libgweather-3.12.3.tar.xz 3982352 SHA256 89f65b1ffb84775c2d73e8daa67dd97f930afe73bae57985ade1e9e37019b435 SHA512 30b0bf57a3ddc090156f3abacd19168f1a3e4eb661e4113eac15f5acb231eb369187806ec6b61518e330b5185d4d9269f5421be056d7502fa700a4379bd9294f WHIRLPOOL 181f51c2a4cafb69ccc7ace69ecff8c61dd9c98de4c1acddc3c460c561f3ee6289dbd9f13f51da7eb3e57bc9122723bdec14cd5acfea0cf1df6ead4bf7a84a95 -EBUILD libgweather-3.12.2-r1.ebuild 1607 SHA256 2426336c253591b41092a95a9331af77252b8c1195793c290f371c57799b94d4 SHA512 bfa10f4815ce50a163fc7737c2999b8a5b09b4a0738d2704bb16a3c422e1b1b0354cb5586af057fdb3a43bc884d5d59e6ddd790df5cc39d05c0c99c0e4c2777e WHIRLPOOL cba323c4e4fcc58d3f52558b42e60ca0c9cef0f608ece7ada03cbfa47c3e1432bb37c907eaa9dc03dc1b9a8b67e35794c840aeb0cd9eddf70c86c858aaed1410 +DIST libgweather-3.14.2.tar.xz 3543696 SHA256 aa0d03132fc6c446cf549df1d91e319e1abcc676f1d9f8bc1dc01f033dcff493 SHA512 ae488bfbe46b95ab874767a9d604f28307cc5138c58080b9aa7d7bf2c29abf3c0a285772a4681b5c1227176735c890a7f27ce9c46e6adf1fb308ebefc33d1a96 WHIRLPOOL 3bea7e42d93917fbbad8ee0d5b3664fc04113e02b7d1dc0610ebd5e66aebfad992db1fda5c0aea59e66915efadc114da86e40fc6b44ae99a4bcef1a624f1ba2c EBUILD libgweather-3.12.3.ebuild 1491 SHA256 6c6a68409d28b347093a11d13bed518c9b6d6154af1e7861b8f1634f7b0479cd SHA512 999b4937c0a42a9437551f787091f13aa138f1c1aec26cb6a75d3ab1716a9af3afcc9baae307b1efd8760a44f5bc6a1cb7c776d41958f60f15922c8c19fb4dd9 WHIRLPOOL 57fb70f52b26c008e8d66260e582ae6d2fe74396cca7bd8461d5c145009fa87d473805223fbe563ef50496e2e754ee66ded659de257d0bff9ea20afbc428bda6 -MISC ChangeLog 16809 SHA256 3014f534b1216720684b69ae3ac55b67d47ff7cd96f71329bc1ca213ae86cb1f SHA512 9d79fb921ef8263fc91d7b38328e451d38f1a9f71bdcd058b3af13ae24a837f03b589fcbb2f5a9c3a64ebde16477d92363887fa956e277f05bbb42bf0ede09f6 WHIRLPOOL 4d35f0b7772daaf1fc17ef41b7a0a17016d56b4c3b59e571d0e97fc01f62ec3b65a35ccd6e5b1c1dcc07a3fede1f7ed0ffbf0a0d91f5d186a8fade69e1d03bd1 +EBUILD libgweather-3.14.2.ebuild 1512 SHA256 ae55134f094e13431605c28d30af8f1a9168e47b13eccb2922c8f3824b5caa9a SHA512 b3e5ef08556f360ef2651b77a33b81152a27d144be1ab06dcfe522fa06edae402bf1abb9bde1b8c4f0acb09d9ea9ca8284fde2e3b19526155b487f3a08b87c69 WHIRLPOOL 0bf9bc6e9a85e95c91a661eddaa12c84ffb9d2dcadec8d1930d7ced11bd9f9c64458a3922a1eea23332bbc0b83c9b85b0286418a5354c29cac3d7d5bc5c27b2c +MISC ChangeLog 17057 SHA256 0796c597dd42d908ef35878a3fbb2917cc0fe8b6888576a58a2b3c88eef7e55b SHA512 8496d2d1d24e4506940dcdafd353e09ab04cf25e87f8da757e0d9c47c0dbdccd1244077a4893830f7a05df552b399dcb3a76d5cea4ab88902f9c2430e6c1214b WHIRLPOOL 8b5e60305f97f59cc306f48742043911f31c4b3c9dde36c059c570d3834296500d910751ac29447e9705b87e00d096b3c1a9c300ac5bb47fadb5d98d383f4972 MISC metadata.xml 255 SHA256 46fe560312c5a99fbd5a22a133b1f29a8c05a832b5d368809d39467e2a03ca00 SHA512 ba171878fa6c0faf41fcf9171e47e8a40871e57adfe816afa1aff814520af6e739a3cd48940ed9c9e99e660004e4d7c24f635b0f60b768c45f13b40a25e4bf00 WHIRLPOOL dbcd3a1f9de18ce3229431938eb17033710ada6827899a3b9e35f8bccf6eab41330c4b548e1f47764523a5be12add795b279c564c1d8698dde760b6cecc0d4fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSUKakACgkQCaWpQKGI+9TimwCeOInsZiyBcUFSbsXWqZPOSX5N -9LgAnRBKh6kn126Ud9ZQJEkGCnYggBNx -=PzR4 +iEYEAREIAAYFAlSYXosACgkQ1fmVwcYIWAaY7gCfZabTzxS2JpxYijChCNujyvS+ +FIkAnjo5gvKT8NUUKt4+MWdmkxPsIva4 +=23Km -----END PGP SIGNATURE----- diff --git a/dev-libs/libgweather/files/libgweather-3.12.2-yr_no-api.patch b/dev-libs/libgweather/files/libgweather-3.12.2-yr_no-api.patch deleted file mode 100644 index ee93d19d25e7..000000000000 --- a/dev-libs/libgweather/files/libgweather-3.12.2-yr_no-api.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 89de9f95660f2fcdaf8ffc4ebe3c7c192d42f464 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Tue, 9 Sep 2014 14:15:43 -0700 -Subject: Yr.no: update to version 1.9 of the online API - -The old version has been discontinued (without notice), start -using the new one. - -https://bugzilla.gnome.org/show_bug.cgi?id=736334 - -diff --git a/libgweather/weather-yrno.c b/libgweather/weather-yrno.c -index f7db931..af47861 100644 ---- a/libgweather/weather-yrno.c -+++ b/libgweather/weather-yrno.c -@@ -44,25 +44,46 @@ static struct { - GWeatherSky sky; - GWeatherConditions condition; - } symbols[] = { -- { GWEATHER_SKY_CLEAR, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* Sun / clear sky */ -- { GWEATHER_SKY_BROKEN, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* Fair */ -- { GWEATHER_SKY_SCATTERED, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* Partly cloudy */ -+ { GWEATHER_SKY_CLEAR, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* Sun */ -+ { GWEATHER_SKY_BROKEN, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* LightCloud */ -+ { GWEATHER_SKY_SCATTERED, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* PartlyCloudy */ - { GWEATHER_SKY_OVERCAST, { FALSE, GWEATHER_PHENOMENON_NONE, GWEATHER_QUALIFIER_NONE } }, /* Cloudy */ -- { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_SHOWERS } }, /* Rain showers */ -- { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* Rain showers with thunder */ -- { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_SHOWERS } }, /* Sleet showers */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_SHOWERS } }, /* Snow showers */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_LIGHT } }, /* LightRainSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* LightRainThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_NONE } }, /* SleetSun */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_NONE } }, /* SnowSun */ - { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_NONE } }, /* Rain */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_HEAVY } }, /* Heavy rain */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* Rain and thunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* RainThunder */ - { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_NONE } }, /* Sleet */ - { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_NONE } }, /* Snow */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* Snow and thunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* SnowThunder */ - { GWEATHER_SKY_CLEAR, { TRUE, GWEATHER_PHENOMENON_FOG, GWEATHER_QUALIFIER_NONE } }, /* Fog */ -- { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* Sleet showers and thunder */ -- { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* Snow showers and thunder */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_HEAVY } }, /* Rain and thunder */ -- { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_HEAVY } } /* Sleet and thunder */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* SleetSunThunder */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* SnowSunThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* LightRainThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* SleetThunder */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_DRIZZLE, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* DrizzleThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* RainThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_LIGHT } }, /* LightSleetThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySleetThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_LIGHT } }, /* LightSnowThunderSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySnowThunderSun */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_DRIZZLE, GWEATHER_QUALIFIER_THUNDERSTORM } }, /* DrizzleThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_LIGHT } }, /* LightSleetThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySleetThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_LIGHT } }, /* LightSnowThunder */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySnowThunder */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_DRIZZLE, GWEATHER_QUALIFIER_NONE } }, /* DrizzleSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_RAIN, GWEATHER_QUALIFIER_NONE } }, /* RainSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_LIGHT } }, /* LightSleetSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySleetSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_LIGHT } }, /* LightSnowSun */ -+ { GWEATHER_SKY_BROKEN, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySnowSun */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_DRIZZLE, GWEATHER_QUALIFIER_NONE } }, /* Drizzle */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_LIGHT } }, /* LightSleet */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_ICE_PELLETS, GWEATHER_QUALIFIER_HEAVY } }, /* HeavySleet */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_LIGHT } }, /* LightSnow */ -+ { GWEATHER_SKY_OVERCAST, { TRUE, GWEATHER_PHENOMENON_SNOW, GWEATHER_QUALIFIER_HEAVY } } /* HeavySnow */ - }; - - static struct { -@@ -207,6 +228,22 @@ read_pressure (GWeatherInfo *info, - } - - static inline void -+read_humidity (GWeatherInfo *info, -+ xmlNodePtr node) -+{ -+ xmlChar *val; -+ double percent; -+ -+ val = xmlGetProp (node, XC("value")); -+ if (val == NULL) -+ return; -+ -+ percent = g_ascii_strtod ((char*) val, NULL); -+ info->priv->humidity = percent; -+ info->priv->hasHumidity = TRUE; -+} -+ -+static inline void - read_child_node (GWeatherInfo *info, - xmlNodePtr node) - { -@@ -220,6 +257,8 @@ read_child_node (GWeatherInfo *info, - read_temperature (info, node); - else if (strcmp ((char*) node->name, "pressure") == 0) - read_pressure (info, node); -+ else if (strcmp ((char*) node->name, "humidity") == 0) -+ read_humidity (info, node); - } - - static inline void -@@ -532,7 +571,7 @@ yrno_start_open_new (GWeatherInfo *info) - g_ascii_dtostr (latstr, sizeof(latstr), RADIANS_TO_DEGREES (loc->latitude)); - g_ascii_dtostr (lonstr, sizeof(lonstr), RADIANS_TO_DEGREES (loc->longitude)); - -- url = g_strdup_printf("http://api.yr.no/weatherapi/locationforecast/1.8/?lat=%s;lon=%s", latstr, lonstr); -+ url = g_strdup_printf("http://api.yr.no/weatherapi/locationforecast/1.9/?lat=%s;lon=%s", latstr, lonstr); - - message = soup_message_new ("GET", url); - _gweather_info_begin_request (info, message); --- -cgit v0.10.1 - diff --git a/dev-libs/libgweather/libgweather-3.12.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.14.2.ebuild similarity index 74% rename from dev-libs/libgweather/libgweather-3.12.2-r1.ebuild rename to dev-libs/libgweather/libgweather-3.14.2.ebuild index 8b80f4ce72a9..90f2f76afed2 100644 --- a/dev-libs/libgweather/libgweather-3.12.2-r1.ebuild +++ b/dev-libs/libgweather/libgweather-3.14.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.12.2-r1.ebuild,v 1.2 2014/09/21 10:26:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-3.14.2.ebuild,v 1.1 2014/12/22 18:10:18 eva Exp $ EAPI="5" GCONF_DEBUG="no" VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" -inherit eutils gnome2 vala +inherit gnome2 vala DESCRIPTION="Library to access weather information from online services" HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" @@ -17,13 +17,14 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix) IUSE="glade +introspection vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" COMMON_DEPEND=" - >=x11-libs/gtk+-3.5.6:3[introspection?] + >=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 + sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) @@ -41,15 +42,12 @@ DEPEND="${COMMON_DEPEND} " src_prepare() { - # Yr.no: update to version 1.9 of the online API (from 3.12 branch) - epatch "${FILESDIR}"/${P}-yr_no-api.patch - use vala && vala_src_prepare gnome2_src_prepare } src_configure() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS" + DOCS="AUTHORS MAINTAINERS NEWS README" gnome2_src_configure \ --disable-static \ $(use_enable glade glade-catalog) \ diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog index 1c82b7b582e1..d835fd1624c7 100644 --- a/dev-libs/libpeas/ChangeLog +++ b/dev-libs/libpeas/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libpeas # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.40 2014/12/19 13:35:42 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.41 2014/12/22 18:10:01 eva Exp $ + +*libpeas-1.12.1 (22 Dec 2014) + + 22 Dec 2014; Gilles Dartiguelongue -libpeas-1.10.0.ebuild, + +libpeas-1.12.1.ebuild: + Version bump for Gnome 3.14. Clean up old revision. 19 Dec 2014; Pacho Ramos libpeas-1.10.1.ebuild: amd64 stable, bug 529964 diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest index e8880754bd68..900814ce600d 100644 --- a/dev-libs/libpeas/Manifest +++ b/dev-libs/libpeas/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST libpeas-1.10.0.tar.xz 507084 SHA256 4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47 SHA512 8d992635cd27279086c3ae1940720f45432449dcba6dd17ce399b909914374408f52b547662cee739185d4d9a216eac742ddd8b0ff8bdb30ccdf38df3794b421 WHIRLPOOL 3dcd43ae6ebde1df9191373a78ff6e3f987e3e122235d1e83a947a0225e83c4e50ccdc98c6ee07f7101957e31bb7a0c2f18f6fe42edbd271663489a9a90837b9 DIST libpeas-1.10.1.tar.xz 512052 SHA256 ba9fb1ff0b1bf6921b10fcd9d89d3995713e11a3e373f6852278699d03d2571d SHA512 99a5c290e13b6ff5330cd629ea70c1ce24e93ec142576b7dd646111f2019397368a4253482c9268ce2ecc924f9ec85b30d203005462efdd711b45b7eb7a39279 WHIRLPOOL d5e6d7b85e77418d7977793a8b5d12410d616bde93426558b164d90b2535b67c70be52b79183c048c41ce381ac146c826032440bda8cf5b9ff0134c9d18412f6 -EBUILD libpeas-1.10.0.ebuild 2599 SHA256 49653bae37f2c47ebe88204648a666ddde069331df6df989e51720d15589eb3c SHA512 1d0f38ee0fd388b6ce6d75f5a77e130beb2b41805ad6dc56eab42fe2779e4655b35b7bd3a9235b20c568b4e32244f3d969d0d16ab37c1e64686294d67c82b338 WHIRLPOOL 789b1aa6427eee8a04ce515b498e3a6b35a4a63694444dc893c74efba269684586c0e9ce808778fde3b1978dbbc832a7e2658233306da16a9d16d91dbaf4c76e +DIST libpeas-1.12.1.tar.xz 522616 SHA256 e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6 SHA512 3b3f973066d8237da666b60fd8b34c93159c98742b255dd0205d2cfeb474635e823b60412f833564ce6116101c2c2b263fed7a59f1fc624d0a727c9e2897b58c WHIRLPOOL adbaff8093c8d5b0f1c174be2d2011512aa98da471302910a7a52f5b70a39333f514e68b71803f5c74022146a0b6dfb657c9cc960fa755c98f453216e4ef2d25 EBUILD libpeas-1.10.1.ebuild 2559 SHA256 b6ae8008c9853102a17e2f0bea3b7d7a30bde2a44e10392794b923a41d0c0c9f SHA512 103f3f03aa23b1f31d35de1911f0b392171c29cf0038b463f76a318fa645d4d53b9039f8f279e6bb99a8d594ced1e8cf4de21b5de5f6b266a14306044e733602 WHIRLPOOL 8c6fa5d9c7e38ce3327d783d55f80886670dd079fd45859035a47d3cc57f3dfb9c32a320c51d3531caa6d8f5c9b432573cb88feeeacd12ac83abe02b0f3f88c1 -MISC ChangeLog 5830 SHA256 3697bb3ba21908488af4ee89423255a2d9c593ede002fdf14d24361a94e25942 SHA512 76ec0735e5529e5e3a03829611b6a370d22890560daed97b4edfca5c8e1fcf1beb5c1a198f1e540e503b4fdf778cd857094ec62e147c278829f2478adea84dd1 WHIRLPOOL 8ed763b902757df9598e1402f09f3eb077e346376ad5296a8b27be2753cb62403e58807a4962f2e72f1d07cb03768b6af87daaabdc716701db3e9496e0710c75 +EBUILD libpeas-1.12.1.ebuild 2078 SHA256 4f7b6e1c66af1414f8e0088eef0c924411c4e1b45aa8bac8c8139a3f28c99ab1 SHA512 0b081d1674b6250dfe4fe1851b5a79e74d608d781aafc9bc52798fca1e80f0f4cdc297a451c10cf854b466c13629c38c708b20869ed5775b14208232da2b9714 WHIRLPOOL f2d64d7120e8f0f2ca74c5bf036d0e0ad87bfde0d8494d3705e0c9b6e3bea89a18593db6c3b3868411d6d6f555849cd391197d109a8b1076a00c8521f96b83b5 +MISC ChangeLog 6018 SHA256 1d79882740d866f5370bee6867bd95973e5772618e1b6a56dd6435b48dfbb9f1 SHA512 19c7ec5d8593a383fbad6280c177aa7698f2c48be227f80ef430d3a6d6321b2cdd56c6063fb543be13dec5e0996c974f1a957e2b2dfe068faddc812169afe559 WHIRLPOOL d8baad97b36d8bd2a0184ead3648435b0eaa98c61fa390ed4fbd9563c8edf0cb4dbd6db1ab2e61472b8acbb47055b81d83c74f76d8f4f3e206321fc6ec780209 MISC metadata.xml 427 SHA256 da5ea54a44636f4e4c008c16af0161b26f784bf9ab64858c7ba227a9e0a68a22 SHA512 ddc445acce98c61bd27330906281d19d8dfe0ef8f9cf9f0d350036b07c2bfd6f105e78f067e9eb9f99acbf3b5f1f1b6e2def04db90fe70bec23a2a2911cecdd5 WHIRLPOOL d8bb1163550d94781146b9c7f7da4980cd09171058f1d986f40203a95acaaaff90b083e340d40631ad2b115457fb77c8db5ac8e998f23eac61ff67b7680b7d22 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEUEAREIAAYFAlSUKa8ACgkQCaWpQKGI+9T2PgCeLjxwo5EFIxT7pmMA4xcGasN0 -oZMAmORE5KlAXhfqJ16UO0u34W+ctJE= -=wbOf +iEYEAREIAAYFAlSYXnoACgkQ1fmVwcYIWAZHfgCdHPac4yTbcrH6wfMPI3OaAhl8 +yHoAoIV6Dv1csIusV9pai2ynEtVdand1 +=VAWA -----END PGP SIGNATURE----- diff --git a/dev-libs/libpeas/libpeas-1.10.0.ebuild b/dev-libs/libpeas/libpeas-1.12.1.ebuild similarity index 51% rename from dev-libs/libpeas/libpeas-1.10.0.ebuild rename to dev-libs/libpeas/libpeas-1.12.1.ebuild index 73f8e4688cd8..45d10dc4a7cf 100644 --- a/dev-libs/libpeas/libpeas-1.10.0.ebuild +++ b/dev-libs/libpeas/libpeas-1.12.1.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.10.0.ebuild,v 1.6 2014/11/25 21:05:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.12.1.ebuild,v 1.1 2014/12/22 18:10:01 eva Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit eutils gnome2 multilib python-r1 virtualx +inherit gnome2 multilib python-r1 virtualx DESCRIPTION="A GObject plugins library" HOMEPAGE="http://developer.gnome.org/libpeas/stable/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" IUSE="+gtk glade +python seed" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )" @@ -34,49 +34,33 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -if_use_python_python_foreach_impl() { - if use python; then - python_foreach_impl run_in_build_dir "$@" - else - "$@" - fi -} - -src_prepare() { - use python && python_copy_sources - if_use_python_python_foreach_impl gnome2_src_prepare -} - src_configure() { - local myconf=" + local myconf=( $(use_enable glade glade-catalog) $(use_enable gtk) $(use_enable seed) --disable-deprecation - --disable-static" + --disable-static + + # possibly overriden below + --disable-python{2,3} + ) # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov # What do we do about gdb, valgrind, gcov, etc? - configuration() { - local myconf="$@" - [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 --disable-python3 PYTHON2_CONFIG=/usr/bin/python-config-${EPYTHON#python}" - [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 --disable-python2 PYTHON3_CONFIG=/usr/bin/python-config-${EPYTHON#python}" - gnome2_src_configure ${myconf} + python_configure() { + local v + python_is_python3 && v=3 || v=2 + myconf+=( + "--enable-python${v}" + # it is just 'PYTHON' for py3 in the build system + "PYTHON${v#3}=${PYTHON}" + "PYTHON${v}_CONFIG=${PYTHON}-config" + ) } + use python && python_foreach_impl python_configure - if use python; then - python_foreach_impl run_in_build_dir configuration ${myconf} - else - gnome2_src_configure ${myconf} - fi -} - -src_compile() { - if_use_python_python_foreach_impl gnome2_src_compile -} - -src_install() { - if_use_python_python_foreach_impl gnome2_src_install + gnome2_src_configure "${myconf[@]}" } src_test() { @@ -86,5 +70,5 @@ src_test() { # >>> from gi.repository import Gtk # >>> Gtk.IconTheme.get_default().has_icon("gtk-about") # This should return True, it returns False for Xvfb - if_use_python_python_foreach_impl Xemake check + Xemake check } -- 2.26.2