From 259ffad483e593ed3c371df0ea1d8e9c3945ce61 Mon Sep 17 00:00:00 2001 From: tastytea Date: Thu, 21 Jun 2018 18:11:47 +0200 Subject: [PATCH] updated ebuilds --- packages/gentoo/mastodon-cpp-0.0.0.ebuild | 17 ++++--- packages/gentoo/mastodon-cpp-9999.ebuild | 62 ++++++++++++----------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/packages/gentoo/mastodon-cpp-0.0.0.ebuild b/packages/gentoo/mastodon-cpp-0.0.0.ebuild index da533c9..2eb50c1 100644 --- a/packages/gentoo/mastodon-cpp-0.0.0.ebuild +++ b/packages/gentoo/mastodon-cpp-0.0.0.ebuild @@ -2,20 +2,21 @@ EAPI=6 inherit cmake-utils DESCRIPTION="mastodon-cpp is a C++ wrapper for the Mastodon API." -HOMEPAGE="https://git.schlomp.space/tastytea/mastodon-cpp" -SRC_URI="https://git.schlomp.space/tastytea/mastodon-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://schlomp.space/tastytea/mastodon-cpp" +SRC_URI="https://schlomp.space/tastytea/mastodon-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="doc debug examples" -RDEPEND=">=dev-cpp/curlpp-0.7.3 - >=dev-libs/jsoncpp-1.8.1" +RDEPEND=">=dev-cpp/curlpp-0.8.1 + >=dev-libs/jsoncpp-1.8.4" DEPEND=">=dev-util/cmake-3.9.6 - doc? ( >=app-doc/doxygen-1.8.13-r1 ) + doc? ( >=app-doc/doxygen-1.8.14-r1 ) ${RDEPEND}" src_unpack() { default_src_unpack + mv ${PN} ${P} } @@ -30,16 +31,18 @@ src_configure() { else mycmakeargs+=(-DCMAKE_BUILD_TYPE=Release) fi + cmake-utils_src_configure } # We won't let cmake handle the documentation, because it would install the # examples, no matter if we want them. src_compile() { + cmake-utils_src_compile + if use doc; then ./build_doc.sh fi - cmake-utils_src_compile } src_install() { @@ -53,6 +56,6 @@ src_install() { dodoc ${file} done fi - + cmake-utils_src_install } diff --git a/packages/gentoo/mastodon-cpp-9999.ebuild b/packages/gentoo/mastodon-cpp-9999.ebuild index 95f1e69..fa6364c 100644 --- a/packages/gentoo/mastodon-cpp-9999.ebuild +++ b/packages/gentoo/mastodon-cpp-9999.ebuild @@ -13,49 +13,51 @@ SLOT="0" KEYWORDS="" IUSE="doc debug examples" RDEPEND=">=dev-cpp/curlpp-0.8.1 - >=dev-libs/jsoncpp-1.8.1" + >=dev-libs/jsoncpp-1.8.4" DEPEND=">=dev-util/cmake-3.9.6 - doc? ( >=app-doc/doxygen-1.8.13-r1 ) - ${RDEPEND}" + doc? ( >=app-doc/doxygen-1.8.14-r1 ) + ${RDEPEND}" src_unpack() { - git-r3_src_unpack + git-r3_src_unpack } src_configure() { - local mycmakeargs=( - -DWITH_DOC=NO - -DWITH_EXAMPLES=NO - -DWITH_TESTS=NO - ) - if use debug; then - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Debug) - else - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Release) - fi - cmake-utils_src_configure + local mycmakeargs=( + -DWITH_DOC=NO + -DWITH_EXAMPLES=NO + -DWITH_TESTS=NO + ) + if use debug; then + mycmakeargs+=(-DCMAKE_BUILD_TYPE=Debug) + else + mycmakeargs+=(-DCMAKE_BUILD_TYPE=Release) + fi + + cmake-utils_src_configure } # We can not let cmake handle the documentation, because it would end up in # doc/mastodon-cpp-${PROJECT_VERSION} instead of -9999 src_compile() { - if use doc; then - ./build_doc.sh - fi - cmake-utils_src_compile + cmake-utils_src_compile + + if use doc; then + ./build_doc.sh + fi } src_install() { - if use doc; then - HTML_DOCS="doc/html/*" - fi + if use doc; then + HTML_DOCS="doc/html/*" + fi - if use examples; then - docinto examples - for file in examples/*.cpp; do - dodoc ${file} - done - fi - - cmake-utils_src_install + if use examples; then + docinto examples + for file in examples/*.cpp; do + dodoc ${file} + done + fi + + cmake-utils_src_install }