commit: 12686d113989e083ab8088374358311855c8603d Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Mon Jul 16 20:14:27 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Mon Jul 16 20:17:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12686d11
dev-libs/leatherman: 1.4.2 stable amd64 and x86 with cleanup Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/leatherman/Manifest | 1 - dev-libs/leatherman/leatherman-1.4.1.ebuild | 60 ----------------------------- dev-libs/leatherman/leatherman-1.4.2.ebuild | 2 +- 3 files changed, 1 insertion(+), 62 deletions(-) diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index fe3d72b5931..1c6f17ad1b4 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,3 +1,2 @@ DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b -DIST leatherman-1.4.1.tar.gz 814131 BLAKE2B 53851ce0e875a5953a445b594659d494b127956694b2488c343694b9d4adff9890dc0e462671950c9d920dd5828951ad7629cae20de57625aef02522789024f5 SHA512 71fa4723d231ffd6c582a332d6e57da8d1631d787ac7eeef55a505217b9d216ada11efc2636f2238c0272c30d943c61e1f391941f1c4531f911cce597062ffa6 DIST leatherman-1.4.2.tar.gz 814263 BLAKE2B 5ca8123f264ed0f7843c6fc1b0966c577fb9d12933e5baa375e0beef8ba17afe4388f1e05e1022e392c50e32e159b765531137cf069bd0f5b8baa3626c860949 SHA512 e0cb19605163b68ac5a8fc74e875d856af5e34345f19c38f0db45da7536ec27ba6cf4b4e8c5883ceb9a5978cdc8831181ec89ad4105252366b198af4f3f22bff diff --git a/dev-libs/leatherman/leatherman-1.4.1.ebuild b/dev-libs/leatherman/leatherman-1.4.1.ebuild deleted file mode 100644 index 41db96ea9c0..00000000000 --- a/dev-libs/leatherman/leatherman-1.4.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils multilib - -DESCRIPTION="A C++ toolkit" -HOMEPAGE="https://github.com/puppetlabs/leatherman"; -SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -IUSE="debug static-libs test" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" -SLOT="0/1.4" - -RDEPEND="net-misc/curl" -DEPEND=">=dev-libs/boost-1.54:=[nls] - net-misc/curl - >=sys-devel/gcc-4.8:*" - -PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) - -src_prepare() { - sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - ) - if ! use static-libs; then - mycmakeargs+=( - -DLEATHERMAN_SHARED=ON - ) - else - mycmakeargs+=( - -DLEATHERMAN_SHARED=OFF - ) - fi - if use debug; then - mycmakeargs+=( - -DCMAKE_BUILD_TYPE=Debug - ) - fi - cmake-utils_src_configure -} - -src_test() { - "${WORKDIR}/${P}"_build/bin/leatherman_test -} - -src_install() { - cmake-utils_src_install -} diff --git a/dev-libs/leatherman/leatherman-1.4.2.ebuild b/dev-libs/leatherman/leatherman-1.4.2.ebuild index 2df52d6356d..94a5c158e9d 100644 --- a/dev-libs/leatherman/leatherman-1.4.2.ebuild +++ b/dev-libs/leatherman/leatherman-1.4.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" IUSE="debug static-libs test" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" SLOT="0/1.4" RDEPEND="net-misc/curl"
