From 668507ccf731954ca4baa26b6b52fa894bab5457 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sat, 21 Mar 2015 23:44:44 +0000 Subject: [PATCH] Version bump (bug 543846). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090 --- dev-libs/libcss/ChangeLog | 12 +- dev-libs/libcss/Manifest | 20 ++- .../files/libcss-0.1.2-enum-compare.patch | 145 ------------------ .../libcss/files/libcss-0.5.0-glibc2.20.patch | 17 ++ dev-libs/libcss/libcss-0.1.2.ebuild | 73 --------- dev-libs/libcss/libcss-0.2.0.ebuild | 20 --- dev-libs/libcss/libcss-0.5.0.ebuild | 24 +++ 7 files changed, 60 insertions(+), 251 deletions(-) delete mode 100644 dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch create mode 100644 dev-libs/libcss/files/libcss-0.5.0-glibc2.20.patch delete mode 100644 dev-libs/libcss/libcss-0.1.2.ebuild delete mode 100644 dev-libs/libcss/libcss-0.2.0.ebuild create mode 100644 dev-libs/libcss/libcss-0.5.0.ebuild diff --git a/dev-libs/libcss/ChangeLog b/dev-libs/libcss/ChangeLog index 7382623f3c11..77354077c6ea 100644 --- a/dev-libs/libcss/ChangeLog +++ b/dev-libs/libcss/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/libcss -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.13 2014/11/15 12:45:44 xmw Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.14 2015/03/21 23:44:39 xmw Exp $ + +*libcss-0.5.0 (21 Mar 2015) + + 21 Mar 2015; Michael Weber + +files/libcss-0.5.0-glibc2.20.patch, +libcss-0.5.0.ebuild, + -files/libcss-0.1.2-enum-compare.patch, -libcss-0.1.2.ebuild, + -libcss-0.2.0.ebuild: + Version bump (bug 543846). 15 Nov 2014; Michael Weber libcss-0.4.0.ebuild: tighten dependencies diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest index e28eacabeeda..4d9356fba809 100644 --- a/dev-libs/libcss/Manifest +++ b/dev-libs/libcss/Manifest @@ -1,24 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libcss-0.1.2-enum-compare.patch 5422 SHA256 0a01977625900939cd278e095183c2068ed8a810c3d29f2a0b1968c834078f77 SHA512 0a2eb24e4595984805a21b01e27af3d9954dbeb312824862fe593af272de678b4738594c783e258c732fc77312469792f8eb5430888a8325465806db6d133deb WHIRLPOOL eacc63831323a2560fa134ffc8e23d1dd12f8c044da48eaf7bb20e42fe322ff1e103c08c7d3e372b5d70578c5870f11fb5733859538d4567645a9a6e712c41fa AUX libcss-0.4.0-glibc2.20.patch 600 SHA256 a39e422f643f35eca76ba8a42acd1c326c0881514b7e3970e7b86e6180ce6bb7 SHA512 aad84bc75dceeeefd0235c1959b49416d109a5121d9a28e8de2ab962da4542714eabfc7e2a9a10160c035c70102cb0a40eb4f0ffd3ca7dedf1e7189058b11903 WHIRLPOOL 85d413cb5e14d9fce331b1b668e1563f0cd28bbb55a7438a6d8ae28b8e27bdc0ab1d3079ac75199fb80f2333b89ef5ef7c17936611286cde463914fed9a2c9e0 -DIST libcss-0.1.2-src.tar.gz 474621 SHA256 92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e SHA512 b3015ffed496115856c2939c0635c60716ccf784f22029512643531e7e04d77e00ea4251ebfe2870afd51fc7a8ba8289ef70aee32d63b9d1404eed6ffa37f0be WHIRLPOOL 2b75ffca5c0ff598f99074df3e619e9a324b0f8a5e0594de7de83d9615f88cd2f81334505d6a4a3bf6b02cc2b3a93d1a587e51fccbbdc4aa9f94bc55ae18ef3d -DIST libcss-0.2.0-src.tar.gz 460004 SHA256 31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613 SHA512 dbb076dbf2c91835e8514732307fc72cdc393a244e5d80b38366388ae9214e6072152920a8eac4020873ce9153a5cc17ea616ebc1a926fc097e4a00c0b837f40 WHIRLPOOL 884549f15702e3efdbc043a60bbca75c15370a0b79bc33becc807d5a1b4ef2129107f05720168a2d739a21d484e44c2456b82cc6e768d78a0715cb960a869163 +AUX libcss-0.5.0-glibc2.20.patch 629 SHA256 89def9f9659811ed74f0184939996b69fbdfa2a23c8320b4df2b24e236deee31 SHA512 dd2a1726e76b3e9d5ab89b9bbf265a9ffec502c910249f31b1a0a0ff6932b02dfa28e6051386f980f5b66b9453da31f217fc662d39cb1b1570598968dca5bd89 WHIRLPOOL d600d076afd6ed73b2298a96361484a1ff40e173217444ad0ecab2e950ea3ffc36face9763b8bfab2463e068d83b4ce8b4e0fcbb9fe8c58e68aa379d0904adc2 DIST libcss-0.4.0-src.tar.gz 461842 SHA256 0be9509d9d352abdeec87764c1f8ba13950d9dc4f63acade0477209b7fd21748 SHA512 d4e583ed84ceaec5cc92c52c7789cd61d2e345f02536b2d04e5a2198243db029adefa2f14edfba09a6754bc366b2e58d4eb7951ff4849c638f54b192dd25495f WHIRLPOOL 6ff05baf8f057fcf2c99cbd71f4c55f10a92aa306d1b3f696cb93da8ffb9d6c47845b6b4487ac167f87449a963f84bd8c207b4c2adb4bd109c3d3d329477a803 -DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38 +DIST libcss-0.5.0-src.tar.gz 465574 SHA256 ecaa09b07d4ecfd4644163bc0f0332b81aaaffbb9a373465e15e44e06666faf1 SHA512 50cc8427778d2fa265ae547895322e912b2f03e08ff100a2f7366e12fdf6e360a861d128a350ebdd3af3e674cc0a04a8dfa6e0217675aafcf3475593f1a5905f WHIRLPOOL 3312934529c8c25ea5dff119accf6c8437d00edbd749c918ec9686dd545d602b222f5348c0a1a25091b36d0b0d7dea5bc3c3c8e9cf2cf53e78396dc3b5db102a DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c -EBUILD libcss-0.1.2.ebuild 1713 SHA256 478494b30ee5b1e8e11b7ab58d0a5e0f6a2cb1104b2964bd366d0ebf43c2a055 SHA512 ad0e7185ca529939402263b5fb155d2c2157869226bdf128d457ea8f2658123203338e44aa915f7a4cef13fe24b30190789b6956752381efe758a18de2c53ee0 WHIRLPOOL c08ada3ea5f64dab1b3a1840fa9a7e0849eed723cdfcda0e0209a7daf038b0c82e1d15d9196cd965ef0dba1e378e8950b2b7189011dfd5140c96ea615e469bdd -EBUILD libcss-0.2.0.ebuild 618 SHA256 3b5948e268569fab4a1b7e560f118f687f9765751e7ebdc1bb19ba57ed0e06bf SHA512 ec273a1d8d348c4a3e8d6763c647f6efc493941a6fa7c5b1e508ea088c24f823f7fa6282612c8b7ad2aec4630e15c87da5ff313f9fa3dd3b58a9b9e5b203b3f4 WHIRLPOOL 169f772dae92bb62931f4662746f7b4d2b5071a2a4f49794ff73bf15b6b58fc8f3477b5e300fb54bd6b38fbab71c57450153e86cd634ae566e9f3e5693d65e34 +DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980 EBUILD libcss-0.4.0.ebuild 723 SHA256 32bcece9cb8e090367d6ef89bc2ac551ce60e1549a586b514db00701deaeb28e SHA512 3c0dbe7da3575dc1ad83fc3e9662b6e16f6b6785cc289a6a05b19e8a5a55bc868ad4a5615073865704e27b42a366cd406cf7daf9c268056ee44bd3c8faff401b WHIRLPOOL 1491651a2ca9b56e8a26f7d6ba3b8775c89527b5747560b106355754c65a091fade61170c9830f9425edbeeeb623af7cfef4aab9e177b253dd7bde9d4475de86 -MISC ChangeLog 1790 SHA256 09ec1a890f13796f80865afa3ea0be3684c7a6cc1272e9e3db1af8291377cfed SHA512 f3ecad43831f8051ee270874507dd3cfdf92915d74c33cb599ab9f848aa1777aba04820a528e2e3d2b3bc1fdfb97c23bd33354181334634e202eb1f944f96ce3 WHIRLPOOL c5b427b9d1a5fb3f07d98391667ddad1cca83419ab2eff938273053e9a44f08e35590eb642f0ee6b86214126194928000dd9df796cd8b85af5e1bda5bcc8c43d +EBUILD libcss-0.5.0.ebuild 717 SHA256 3561aa54060a0fec7d29f470c7677dac0e49244523ecd41c81c406bdd5b84dd3 SHA512 466ff3eadbdf90fd18e5148aa6bfe2f4d67fef166b188c27100bbdbe9b3cd6d046a1d7a2c237ceec53439d1368fec3d5b56fb5a61071c5129a033416ed26fad7 WHIRLPOOL 5f671181716158533a85d1058f8e1e363e4f9c51cc6d5f02e1e98cff6ecb2bb351eff73717dc899615a71d04d3f694c928d7838a0acb27e38aee2d44086196b1 +MISC ChangeLog 2044 SHA256 4a84db5c04d3539f783e851d1aec20f1a81984545c97759ee0e44328bde525c6 SHA512 d32e161d1d52dd6fb042a7134adbaa8dc543c91e80b6b2bc616983c2e4fcd93f53704dc4ce22b79a10a52dba161bf9e3967b4e73dacfdb2547f15de1c4b8b8c8 WHIRLPOOL 7376afdc17595ea937e971e639c2e655cbc5d390aa49913756dea0711663367ac49bb4359fea8cae1f50a241bde07e2358e82f476018b2616a730150ccff979c MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iL4EAREIAGYFAlRnSv1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +iL4EAREIAGYFAlUOAmxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky -N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDnNgEAhCRKuL5Q/2E+0jrDjbEKHaMe -FvgjcnkTFqQYEyCfZd0A/38y8UtGGCvb65oytM813P1ZaEeFtBY9oB7YLhsnNJ6z -=9Pu4 +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCaGgEAkeCNeuVZkmxkQtHDLQfQLy// +71wxdxTvrErLOsjITfkA/2yORKJFUaykrzl7WqcxOub94C3DN1kv0B0uecaCigRY +=R/de -----END PGP SIGNATURE----- diff --git a/dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch b/dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch deleted file mode 100644 index 9a3ede78ce44..000000000000 --- a/dev-libs/libcss/files/libcss-0.1.2-enum-compare.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- libcss-0.1.2/src/select/properties/helpers.c -+++ libcss-0.1.2/src/select/properties/helpers.c -@@ -52,10 +52,12 @@ - uint16_t value = CSS_BACKGROUND_COLOR_INHERIT; - css_color color = 0; - -- assert(CSS_BACKGROUND_COLOR_INHERIT == CSS_BORDER_COLOR_INHERIT); -- assert(CSS_BACKGROUND_COLOR_COLOR == CSS_BORDER_COLOR_COLOR); -+ assert(CSS_BACKGROUND_COLOR_INHERIT == -+ (enum css_background_color_e)CSS_BORDER_COLOR_INHERIT); -+ assert(CSS_BACKGROUND_COLOR_COLOR == -+ (enum css_background_color_e)CSS_BORDER_COLOR_COLOR); - assert(CSS_BACKGROUND_COLOR_CURRENT_COLOR == -- CSS_BORDER_COLOR_CURRENT_COLOR); -+ (enum css_background_color_e)CSS_BORDER_COLOR_CURRENT_COLOR); - - if (isInherit(opv) == false) { - switch (getValue(opv)) { ---- libcss-0.1.2/src/parse/important.c -+++ libcss-0.1.2/src/parse/important.c -@@ -101,9 +101,9 @@ - case CSS_PROP_BACKGROUND_COLOR: - case CSS_PROP_COLUMN_RULE_COLOR: - assert(BACKGROUND_COLOR_SET == -- BORDER_COLOR_SET); -+ (enum op_background_color)BORDER_COLOR_SET); - assert(BACKGROUND_COLOR_SET == -- COLUMN_RULE_COLOR_SET); -+ (enum op_background_color)COLUMN_RULE_COLOR_SET); - - if (value == BACKGROUND_COLOR_SET) - offset++; /* colour */ -@@ -113,10 +113,12 @@ - case CSS_PROP_CUE_AFTER: - case CSS_PROP_CUE_BEFORE: - case CSS_PROP_LIST_STYLE_IMAGE: -- assert(BACKGROUND_IMAGE_URI == CUE_AFTER_URI); -- assert(BACKGROUND_IMAGE_URI == CUE_BEFORE_URI); -+ assert(BACKGROUND_IMAGE_URI == -+ (enum op_background_image)CUE_AFTER_URI); -+ assert(BACKGROUND_IMAGE_URI == -+ (enum op_background_image)CUE_BEFORE_URI); - assert(BACKGROUND_IMAGE_URI == -- LIST_STYLE_IMAGE_URI); -+ (enum op_background_image)LIST_STYLE_IMAGE_URI); - - if (value == BACKGROUND_IMAGE_URI) - offset++; /* string table entry */ -@@ -141,9 +143,10 @@ - case CSS_PROP_BORDER_LEFT_WIDTH: - case CSS_PROP_OUTLINE_WIDTH: - case CSS_PROP_COLUMN_RULE_WIDTH: -- assert(BORDER_WIDTH_SET == OUTLINE_WIDTH_SET); -+ assert(BORDER_WIDTH_SET == -+ (enum op_border_width)OUTLINE_WIDTH_SET); - assert(BORDER_WIDTH_SET == -- COLUMN_RULE_WIDTH_SET); -+ (enum op_border_width)COLUMN_RULE_WIDTH_SET); - - if (value == BORDER_WIDTH_SET) - offset += 2; /* length + units */ -@@ -161,14 +164,14 @@ - case CSS_PROP_WIDTH: - case CSS_PROP_COLUMN_WIDTH: - case CSS_PROP_COLUMN_GAP: -- assert(BOTTOM_SET == LEFT_SET); -- assert(BOTTOM_SET == RIGHT_SET); -- assert(BOTTOM_SET == TOP_SET); -- assert(BOTTOM_SET == HEIGHT_SET); -- assert(BOTTOM_SET == MARGIN_SET); -- assert(BOTTOM_SET == WIDTH_SET); -- assert(BOTTOM_SET == COLUMN_WIDTH_SET); -- assert(BOTTOM_SET == COLUMN_GAP_SET); -+ assert(BOTTOM_SET == (enum op_bottom)LEFT_SET); -+ assert(BOTTOM_SET == (enum op_bottom)RIGHT_SET); -+ assert(BOTTOM_SET == (enum op_bottom)TOP_SET); -+ assert(BOTTOM_SET == (enum op_bottom)HEIGHT_SET); -+ assert(BOTTOM_SET == (enum op_bottom)MARGIN_SET); -+ assert(BOTTOM_SET == (enum op_bottom)WIDTH_SET); -+ assert(BOTTOM_SET == (enum op_bottom)COLUMN_WIDTH_SET); -+ assert(BOTTOM_SET == (enum op_bottom)COLUMN_GAP_SET); - - if (value == BOTTOM_SET) - offset += 2; /* length + units */ -@@ -231,7 +234,7 @@ - case CSS_PROP_COUNTER_INCREMENT: - case CSS_PROP_COUNTER_RESET: - assert(COUNTER_INCREMENT_NONE == -- COUNTER_RESET_NONE); -+ (enum op_counter_increment)COUNTER_RESET_NONE); - - while (value != COUNTER_INCREMENT_NONE) { - offset+=2; /* string + integer */ -@@ -276,7 +279,8 @@ - - case CSS_PROP_LETTER_SPACING: - case CSS_PROP_WORD_SPACING: -- assert(LETTER_SPACING_SET == WORD_SPACING_SET); -+ assert(LETTER_SPACING_SET == -+ (enum op_letter_spacing)WORD_SPACING_SET); - - if (value == LETTER_SPACING_SET) - offset += 2; /* length + units */ -@@ -296,7 +300,8 @@ - - case CSS_PROP_MAX_HEIGHT: - case CSS_PROP_MAX_WIDTH: -- assert(MAX_HEIGHT_SET == MAX_WIDTH_SET); -+ assert(MAX_HEIGHT_SET == -+ (enum op_max_height)MAX_WIDTH_SET); - - if (value == MAX_HEIGHT_SET) - offset += 2; /* length + units */ -@@ -311,11 +316,11 @@ - case CSS_PROP_PAUSE_AFTER: - case CSS_PROP_PAUSE_BEFORE: - case CSS_PROP_TEXT_INDENT: -- assert(MIN_HEIGHT_SET == MIN_WIDTH_SET); -- assert(MIN_HEIGHT_SET == PADDING_SET); -- assert(MIN_HEIGHT_SET == PAUSE_AFTER_SET); -- assert(MIN_HEIGHT_SET == PAUSE_BEFORE_SET); -- assert(MIN_HEIGHT_SET == TEXT_INDENT_SET); -+ assert(MIN_HEIGHT_SET == (enum op_min_height)MIN_WIDTH_SET); -+ assert(MIN_HEIGHT_SET == (enum op_min_height)PADDING_SET); -+ assert(MIN_HEIGHT_SET == (enum op_min_height)PAUSE_AFTER_SET); -+ assert(MIN_HEIGHT_SET == (enum op_min_height)PAUSE_BEFORE_SET); -+ assert(MIN_HEIGHT_SET == (enum op_min_height)TEXT_INDENT_SET); - - if (value == MIN_HEIGHT_SET) - offset += 2; /* length + units */ -@@ -331,10 +336,10 @@ - case CSS_PROP_RICHNESS: - case CSS_PROP_STRESS: - case CSS_PROP_WIDOWS: -- assert(ORPHANS_SET == PITCH_RANGE_SET); -- assert(ORPHANS_SET == RICHNESS_SET); -- assert(ORPHANS_SET == STRESS_SET); -- assert(ORPHANS_SET == WIDOWS_SET); -+ assert(ORPHANS_SET == (enum op_orphans)PITCH_RANGE_SET); -+ assert(ORPHANS_SET == (enum op_orphans)RICHNESS_SET); -+ assert(ORPHANS_SET == (enum op_orphans)STRESS_SET); -+ assert(ORPHANS_SET == (enum op_orphans)WIDOWS_SET); - - if (value == ORPHANS_SET) - offset++; /* value */ diff --git a/dev-libs/libcss/files/libcss-0.5.0-glibc2.20.patch b/dev-libs/libcss/files/libcss-0.5.0-glibc2.20.patch new file mode 100644 index 000000000000..e8c1e7decf21 --- /dev/null +++ b/dev-libs/libcss/files/libcss-0.5.0-glibc2.20.patch @@ -0,0 +1,17 @@ +--- libcss-0.5.0/Makefile ++++ libcss-0.5.0/Makefile +@@ -15,13 +15,7 @@ + WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wnested-externs +-# BeOS/Haiku/AmigaOS4 standard library headers create warnings +-ifneq ($(HOST),i586-pc-haiku) +- ifneq ($(findstring amigaos,$(HOST)),amigaos) +- WARNFLAGS := $(WARNFLAGS) -Werror +- endif +-endif +-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \ ++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \ + -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) + ifneq ($(GCCVER),2) + CFLAGS := $(CFLAGS) -std=c99 diff --git a/dev-libs/libcss/libcss-0.1.2.ebuild b/dev-libs/libcss/libcss-0.1.2.ebuild deleted file mode 100644 index a3a2422b4ca1..000000000000 --- a/dev-libs/libcss/libcss-0.1.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v 1.9 2013/06/17 17:10:34 xmw Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="CSS parser and selection engine, written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" -SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="debug static-libs test" - -RDEPEND="dev-libs/libparserutils - dev-libs/libwapcaplet" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-lang/perl )" - -pkg_setup(){ - netsurf_src_prepare() { - sed -e "/^CCOPT :=/s:=.*:=:" \ - -e "/^CCNOOPT :=/s:=.*:=:" \ - -e "/^CCDBG :=/s:=.*:=:" \ - -i build/makefiles/Makefile.{gcc,clang} || die - sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ - -i Makefile || die - sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ - -i ${PN}.pc.in || die - } - netsurf_src_configure() { - echo "Q := " >> Makefile.config - echo "CC := $(tc-getCC)" >> Makefile.config - echo "AR := $(tc-getAR)" >> Makefile.config - } - - netsurf_make() { - emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@" - use static-libs && \ - emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@" - } -} - -src_prepare() { - netsurf_src_prepare - - sed -e 's/x86_64-pc-linux-gnu-gcc/$(CC)/' \ - -i src/parse/properties/Makefile || die - - epatch "${FILESDIR}"/${P}-enum-compare.patch -} - -src_configure() { - netsurf_src_configure -} - -src_compile() { - netsurf_make -} - -src_test() { - netsurf_make test -} - -src_install() { - netsurf_make DESTDIR="${D}" PREFIX=/usr install - - dodoc README -} diff --git a/dev-libs/libcss/libcss-0.2.0.ebuild b/dev-libs/libcss/libcss-0.2.0.ebuild deleted file mode 100644 index e313b8961af3..000000000000 --- a/dev-libs/libcss/libcss-0.2.0.ebuild +++ /dev/null @@ -1,20 +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/libcss/libcss-0.2.0.ebuild,v 1.3 2014/01/05 19:15:58 grobian Exp $ - -EAPI=5 - -inherit netsurf - -DESCRIPTION="CSS parser and selection engine, written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~m68k-mint" -IUSE="test" - -RDEPEND=">=dev-libs/libparserutils-0.1.2[static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/libwapcaplet-0.2.0[static-libs?,${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - test? ( dev-lang/perl )" diff --git a/dev-libs/libcss/libcss-0.5.0.ebuild b/dev-libs/libcss/libcss-0.5.0.ebuild new file mode 100644 index 000000000000..023e94ddda7e --- /dev/null +++ b/dev-libs/libcss/libcss-0.5.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.5.0.ebuild,v 1.1 2015/03/21 23:44:39 xmw Exp $ + +EAPI=5 + +NETSURF_BUILDSYSTEM=buildsystem-1.3 +inherit netsurf + +DESCRIPTION="CSS parser and selection engine, written in C" +HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~m68k-mint" +IUSE="test" + +RDEPEND=">=dev-libs/libparserutils-0.2.1[static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/libwapcaplet-0.2.2[static-libs?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-lang/perl )" + +PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch ) -- 2.26.2