summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch59
-rw-r--r--media-libs/raptor/raptor-2.0.15-r2.ebuild74
2 files changed, 133 insertions, 0 deletions
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
new file mode 100644
index 00000000000..bab174176cb
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/552474
+
+--- raptor2-2.0.15/configure.ac
++++ raptor2-2.0.15/configure.ac
+@@ -524,49 +524,12 @@
+ fi
+ fi
+
+-dnl curl
+-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="")
+-
+-if test "X$curl_config" != "Xno" ; then
+- if test "X$curl_config" != "X" ; then
+- AC_MSG_CHECKING(for $curl_config)
+-
+- if test -f $curl_config ; then
+- CURL_CONFIG=$curl_config
+- AC_MSG_RESULT(yes)
+- else
+- AC_MSG_RESULT(no - searching PATH)
+- fi
+- fi
+- if test "X$CURL_CONFIG" = "X" ; then
+- AC_CHECK_PROGS(CURL_CONFIG, curl-config)
+- fi
+-fi
+-
+ libcurl_source=no
+-if test "X$CURL_CONFIG" != "X"; then
+- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags`
+- LIBCURL_LIBS=`$CURL_CONFIG --libs`
+-
+- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS"
+- LIBS="$LIBS $LIBCURL_LIBS"
+- AC_CHECK_HEADER(curl/curl.h)
+- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no)
+-
+- AC_MSG_CHECKING(for libcurl via curl-config)
+- if test $have_curl_easy_init = yes; then
+- libcurl_source="curl-config"
+- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'`
+- fi
+- CPPFLAGS="$oCPPFLAGS"
+- LIBS="$oLIBS"
+-else
+- PKG_CHECK_MODULES([LIBCURL],[libcurl],[
+- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
+- libcurl_source="pkg-config"
+- ], [:])
+- AC_MSG_CHECKING(for libcurl via pkg-config)
+-fi
++PKG_CHECK_MODULES([LIBCURL],[libcurl],[
++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
++ libcurl_source="pkg-config"
++], [:])
++AC_MSG_CHECKING(for libcurl via pkg-config)
+
+ if test "$libcurl_source" = "no"; then
+ AC_MSG_RESULT(no - not found)
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
new file mode 100644
index 00000000000..4f20b71f815
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="2"
+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"
+IUSE="+curl debug json static-libs unicode"
+
+DEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ curl? ( net-misc/curl )
+ json? ( dev-libs/yajl )
+ unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}
+ !media-libs/raptor:0
+"
+BDEPEND="
+ >=sys-devel/bison-3
+ >=sys-devel/flex-2.5.36
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
+
+PATCHES=(
+ "${FILESDIR}/${P}-heap-overflow.patch"
+ "${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
+)
+
+src_prepare() {
+ default
+ eautoreconf #552474
+ elibtoolize # Keep this for ~*-fbsd
+}
+
+src_configure() {
+ # FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+ local myeconfargs=(
+ --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+ $(usex curl --with-www=curl --with-www=xml)
+ $(use_enable debug)
+ $(use_with json yajl)
+ $(use_enable static-libs static)
+ $(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}