From cf633aa0343766cead1b2e4031e7bb7a8c8d629d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Deckert?= Date: Thu, 4 Jun 2020 19:25:02 +0200 Subject: [PATCH] www-apps/lektor: fix install static --- www-apps/lektor/Manifest | 2 +- www-apps/lektor/lektor-3.1.3.ebuild | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/www-apps/lektor/Manifest b/www-apps/lektor/Manifest index d3e4057..dc1b997 100644 --- a/www-apps/lektor/Manifest +++ b/www-apps/lektor/Manifest @@ -5,4 +5,4 @@ DIST lektor-3.1.2.tar.gz 1575266 BLAKE2B 26074c359ad933288599bf98de3c33f38b663b2 DIST lektor-3.1.3.tar.gz 1575304 BLAKE2B 09eaaa8620d0f80b281eca6998fd206637d8017c875bcc44ad77ba20de2f2f4aaeb67b7a9ac1c192a685b4f21dd8e5d5d5a5bb40e2bb020044738b4ef3ac6fbc SHA512 cc1f008f47cc8e320b84b04df27589e470916d28234451d5d095cfba928c2d4dce8e20abded126645359cfae6977a82cb9d65c9cafb42aab7ba725032e726075 EBUILD lektor-3.0.1.ebuild 1000 BLAKE2B 9dfb13ce3016073a428fe93f8259ba3d06b69829244e811e46b24e6f589f372c219b242b53b801876554762d1f6edd4d180622a69bd8682649aca40718e64a7a SHA512 eba7f906f94e05be4aad92ce3966bc3b3cc65f601a32ae3015efe933881ab27ff867fea8156d89164dc6c4d029e78bcdcb288d7d21dc78c17e56a8c88585a2cf EBUILD lektor-3.1.2.ebuild 1045 BLAKE2B b8217e44dea2cacdb3286e34eb4e4db9d7e84943db7db483a41380e8c65f1f1800f7b0d4d3bf5ce6cae03ef552ef02c55eb5ffc61cd1146b35cd1d6f03342dd6 SHA512 e795b4979db026a183cf396581a138a9ca14653c4c6ee9408a064e355f82524fdf8e61a3b7d6c9167ea0c83b4442948dbfb07f36172315ec1572d9eb3a76464e -EBUILD lektor-3.1.3.ebuild 1481 BLAKE2B 0594d80b7148eebb58484a518838790d07be0463bdce4b9e3933b4d13f4a77fdba11e23804749ce791d19fcb33d03f2ec4f1c79d9e03f0cb34bd8620b87a7243 SHA512 41319e69e1b0a86b94954a19044740f04cf06af67b7cb1c9e5fc8e431e5161e50f73b46749cff2ac6c3de223e6ce1c700d7c9aa23ce2ad93d032acdc317aa7b8 +EBUILD lektor-3.1.3.ebuild 1456 BLAKE2B cfdf0c804242840e494409bb60b62f9016f4616d217706eb7da66bdd661d2c7c2ace237375516724f7a9b18088fd353f15a6245dcb91ce4b7b462bba92adda34 SHA512 4d28626b109cf2224e9e5e569817cb33ecee2bad3b4d642d0d5e77c7cd596e26958998934ac8a0caee36c748764629a6d3b3662e5aeaffefd8ddb3c65965a978 diff --git a/www-apps/lektor/lektor-3.1.3.ebuild b/www-apps/lektor/lektor-3.1.3.ebuild index 0254573..f7678bb 100644 --- a/www-apps/lektor/lektor-3.1.3.ebuild +++ b/www-apps/lektor/lektor-3.1.3.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +DISTUTILS_USE_SETUPTOOLS="rdepend" inherit distutils-r1 @@ -31,8 +32,8 @@ RDEPEND="" DOCS=( CHANGES LICENSE README.md ) -src_unpack() { - unpack ${A} +src_prepare() { + default # unpack static webcontent, pre-compiled with: # ebuild ${P}.ebuild unpack @@ -48,7 +49,5 @@ python_install_all() { docompress -x "/usr/share/doc/${PF}/example" doins -r example fi - rm -rf lektor/admin - cp -rf ../lektor/admin lektor/ distutils-r1_python_install_all }