1 |
commit: fbd38277371e11131cea7b96d42d62f61d72cb29 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 9 12:57:03 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 9 12:57:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd38277 |
7 |
|
8 |
media-libs/raptor: Don't use curl-config |
9 |
|
10 |
Closes: https://bugs.gentoo.org/552474 |
11 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
.../files/raptor-2.0.15-dont_use_curl-config.patch | 59 +++++++++++++++++ |
15 |
media-libs/raptor/raptor-2.0.15-r2.ebuild | 74 ++++++++++++++++++++++ |
16 |
2 files changed, 133 insertions(+) |
17 |
|
18 |
diff --git a/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..bab174176cb |
21 |
--- /dev/null |
22 |
+++ b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch |
23 |
@@ -0,0 +1,59 @@ |
24 |
+https://bugs.gentoo.org/552474 |
25 |
+ |
26 |
+--- raptor2-2.0.15/configure.ac |
27 |
++++ raptor2-2.0.15/configure.ac |
28 |
+@@ -524,49 +524,12 @@ |
29 |
+ fi |
30 |
+ fi |
31 |
+ |
32 |
+-dnl curl |
33 |
+-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") |
34 |
+- |
35 |
+-if test "X$curl_config" != "Xno" ; then |
36 |
+- if test "X$curl_config" != "X" ; then |
37 |
+- AC_MSG_CHECKING(for $curl_config) |
38 |
+- |
39 |
+- if test -f $curl_config ; then |
40 |
+- CURL_CONFIG=$curl_config |
41 |
+- AC_MSG_RESULT(yes) |
42 |
+- else |
43 |
+- AC_MSG_RESULT(no - searching PATH) |
44 |
+- fi |
45 |
+- fi |
46 |
+- if test "X$CURL_CONFIG" = "X" ; then |
47 |
+- AC_CHECK_PROGS(CURL_CONFIG, curl-config) |
48 |
+- fi |
49 |
+-fi |
50 |
+- |
51 |
+ libcurl_source=no |
52 |
+-if test "X$CURL_CONFIG" != "X"; then |
53 |
+- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` |
54 |
+- LIBCURL_LIBS=`$CURL_CONFIG --libs` |
55 |
+- |
56 |
+- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" |
57 |
+- LIBS="$LIBS $LIBCURL_LIBS" |
58 |
+- AC_CHECK_HEADER(curl/curl.h) |
59 |
+- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) |
60 |
+- |
61 |
+- AC_MSG_CHECKING(for libcurl via curl-config) |
62 |
+- if test $have_curl_easy_init = yes; then |
63 |
+- libcurl_source="curl-config" |
64 |
+- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` |
65 |
+- fi |
66 |
+- CPPFLAGS="$oCPPFLAGS" |
67 |
+- LIBS="$oLIBS" |
68 |
+-else |
69 |
+- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ |
70 |
+- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` |
71 |
+- libcurl_source="pkg-config" |
72 |
+- ], [:]) |
73 |
+- AC_MSG_CHECKING(for libcurl via pkg-config) |
74 |
+-fi |
75 |
++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ |
76 |
++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` |
77 |
++ libcurl_source="pkg-config" |
78 |
++], [:]) |
79 |
++AC_MSG_CHECKING(for libcurl via pkg-config) |
80 |
+ |
81 |
+ if test "$libcurl_source" = "no"; then |
82 |
+ AC_MSG_RESULT(no - not found) |
83 |
|
84 |
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild |
85 |
new file mode 100644 |
86 |
index 00000000000..4f20b71f815 |
87 |
--- /dev/null |
88 |
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild |
89 |
@@ -0,0 +1,74 @@ |
90 |
+# Copyright 1999-2019 Gentoo Authors |
91 |
+# Distributed under the terms of the GNU General Public License v2 |
92 |
+ |
93 |
+EAPI=7 |
94 |
+ |
95 |
+inherit autotools libtool |
96 |
+ |
97 |
+MY_PN=${PN}2 |
98 |
+MY_P=${MY_PN}-${PV} |
99 |
+ |
100 |
+DESCRIPTION="The RDF Parser Toolkit" |
101 |
+HOMEPAGE="http://librdf.org/raptor/" |
102 |
+SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz" |
103 |
+ |
104 |
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1" |
105 |
+SLOT="2" |
106 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
107 |
+IUSE="+curl debug json static-libs unicode" |
108 |
+ |
109 |
+DEPEND=" |
110 |
+ dev-libs/libxml2 |
111 |
+ dev-libs/libxslt |
112 |
+ curl? ( net-misc/curl ) |
113 |
+ json? ( dev-libs/yajl ) |
114 |
+ unicode? ( dev-libs/icu:= ) |
115 |
+" |
116 |
+RDEPEND="${DEPEND} |
117 |
+ !media-libs/raptor:0 |
118 |
+" |
119 |
+BDEPEND=" |
120 |
+ >=sys-devel/bison-3 |
121 |
+ >=sys-devel/flex-2.5.36 |
122 |
+ virtual/pkgconfig |
123 |
+" |
124 |
+ |
125 |
+S="${WORKDIR}/${MY_P}" |
126 |
+ |
127 |
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README ) |
128 |
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html ) |
129 |
+ |
130 |
+PATCHES=( |
131 |
+ "${FILESDIR}/${P}-heap-overflow.patch" |
132 |
+ "${FILESDIR}/${P}-dont_use_curl-config.patch" #552474 |
133 |
+) |
134 |
+ |
135 |
+src_prepare() { |
136 |
+ default |
137 |
+ eautoreconf #552474 |
138 |
+ elibtoolize # Keep this for ~*-fbsd |
139 |
+} |
140 |
+ |
141 |
+src_configure() { |
142 |
+ # FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn! |
143 |
+ |
144 |
+ local myeconfargs=( |
145 |
+ --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html |
146 |
+ $(usex curl --with-www=curl --with-www=xml) |
147 |
+ $(use_enable debug) |
148 |
+ $(use_with json yajl) |
149 |
+ $(use_enable static-libs static) |
150 |
+ $(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '') |
151 |
+ ) |
152 |
+ |
153 |
+ econf "${myeconfargs[@]}" |
154 |
+} |
155 |
+ |
156 |
+src_test() { |
157 |
+ emake -j1 test |
158 |
+} |
159 |
+ |
160 |
+src_install() { |
161 |
+ default |
162 |
+ find "${ED}" -name '*.la' -delete || die |
163 |
+} |