mgorny 15/05/21 15:53:05
Modified: ChangeLog
Added: jsoncpp-1.6.2-r1.ebuild jsoncpp-0.10.2-r1.ebuild
Removed: jsoncpp-0.10.1.ebuild jsoncpp-0.10.2.ebuild
jsoncpp-0.6.0_rc2.ebuild jsoncpp-1.6.2.ebuild
Log:
Fix includedir path in pkg-config file, patch applied upstream. Remove old.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.20 dev-libs/jsoncpp/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?rev=1.20&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?rev=1.20&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 20 May 2015 00:28:41 -0000 1.19
+++ ChangeLog 21 May 2015 15:53:05 -0000 1.20
@@ -1,6 +1,15 @@
# ChangeLog for dev-libs/jsoncpp
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.19
2015/05/20 00:28:41 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.20
2015/05/21 15:53:05 mgorny Exp $
+
+*jsoncpp-1.6.2-r1 (21 May 2015)
+*jsoncpp-0.10.2-r1 (21 May 2015)
+
+ 21 May 2015; Michał Górny <mgo...@gentoo.org>
+ +files/jsoncpp-1.6.2-fix-pkgconfig.patch, +jsoncpp-0.10.2-r1.ebuild,
+ +jsoncpp-1.6.2-r1.ebuild, -jsoncpp-0.10.1.ebuild, -jsoncpp-0.10.2.ebuild,
+ -jsoncpp-0.6.0_rc2.ebuild, -jsoncpp-1.6.2.ebuild:
+ Fix includedir path in pkg-config file, patch applied upstream. Remove old.
20 May 2015; Matt Turner <matts...@gentoo.org> jsoncpp-0.10.2.ebuild,
jsoncpp-1.6.2.ebuild:
1.1 dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: jsoncpp-1.6.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-1.6.2-r1.ebuild,v
1.1 2015/05/21 15:53:05 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit cmake-utils python-any-r1
DESCRIPTION="C++ JSON reader and writer"
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp";
SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( public-domain MIT )"
SLOT="0/1"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86"
IUSE="doc test"
DEPEND="
doc? (
app-doc/doxygen
${PYTHON_DEPS}
)
test? (
${PYTHON_DEPS}
)"
RDEPEND=""
PATCHES=(
# fix broken path subst in .pc file
"${FILESDIR}"/jsoncpp-1.6.2-fix-pkgconfig.patch
)
pkg_setup() {
if use doc || use test; then
python-any-r1_pkg_setup
fi
}
src_configure() {
local mycmakeargs=(
-DJSONCPP_WITH_TESTS=$(usex test)
-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-DBUILD_SHARED_LIBS=ON
# Follow Debian, Ubuntu, Arch convention for headers location
# bug #452234
-DINCLUDE_INSTALL_DIR="${EPREFIX}"/usr/include/jsoncpp
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
if use doc; then
"${EPYTHON}" doxybuild.py --doxygen=/usr/bin/doxygen || die
fi
}
src_test() {
emake -C "${BUILD_DIR}" jsoncpp_check
}
src_install() {
cmake-utils_src_install
if use doc; then
dohtml dist/doxygen/jsoncpp*/*
fi
}
1.1 dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: jsoncpp-0.10.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild,v
1.1 2015/05/21 15:53:05 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit cmake-utils python-any-r1
DESCRIPTION="C++ JSON reader and writer"
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp";
SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( public-domain MIT )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86"
IUSE="doc test"
DEPEND="
doc? (
app-doc/doxygen
${PYTHON_DEPS}
)
test? (
${PYTHON_DEPS}
)"
RDEPEND=""
PATCHES=(
# fix broken path subst in .pc file
"${FILESDIR}"/jsoncpp-1.6.2-fix-pkgconfig.patch
)
pkg_setup() {
if use doc || use test; then
python-any-r1_pkg_setup
fi
}
src_configure() {
local mycmakeargs=(
-DJSONCPP_WITH_TESTS=$(usex test)
-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-DBUILD_SHARED_LIBS=ON
# Follow Debian, Ubuntu, Arch convention for headers location
# bug #452234
-DINCLUDE_INSTALL_DIR="${EPREFIX}"/usr/include/jsoncpp
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
if use doc; then
"${EPYTHON}" doxybuild.py --doxygen=/usr/bin/doxygen || die
fi
}
src_test() {
emake -C "${BUILD_DIR}" jsoncpp_check
}
src_install() {
cmake-utils_src_install
if use doc; then
dohtml dist/doxygen/jsoncpp*/*
fi
}
