[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

[Tim Harder]

commit:     91247cd2fbe3257fbd2396ca0d8165d53c4b154d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 06:29:49 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 06:30:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91247cd2

x11-terms/kitty: update specifying proper libdir

 x11-terms/kitty/{kitty-0.8.2.ebuild => kitty-0.8.2-r1.ebuild} | 6 +-----
 x11-terms/kitty/kitty-9999.ebuild                             | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/x11-terms/kitty/kitty-0.8.2.ebuild 
b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
similarity index 90%
rename from x11-terms/kitty/kitty-0.8.2.ebuild
rename to x11-terms/kitty/kitty-0.8.2-r1.ebuild
index 826bd64f87d..b51c9110b0e 100644
--- a/x11-terms/kitty/kitty-0.8.2.ebuild
+++ b/x11-terms/kitty/kitty-0.8.2-r1.ebuild
@@ -55,10 +55,6 @@ PATCHES=(
 src_prepare() {
        default
 
-       # respect libdir
-       sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
-       sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || 
die
-
        # disable wayland as required
        if ! use wayland; then
                sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
@@ -73,7 +69,7 @@ doecho() {
 }
 
 src_compile() {
-       doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") 
linux-package
+       doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") 
--libdir-name $(get_libdir) linux-package
 }
 
 src_test() {

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index 826bd64f87d..b51c9110b0e 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -55,10 +55,6 @@ PATCHES=(
 src_prepare() {
        default
 
-       # respect libdir
-       sed -i "/libdir =/s/'lib'/'$(get_libdir)'/" setup.py || die
-       sed -i "s#/../lib/kitty#/../$(get_libdir)/kitty#" linux-launcher.c || 
die
-
        # disable wayland as required
        if ! use wayland; then
                sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
@@ -73,7 +69,7 @@ doecho() {
 }
 
 src_compile() {
-       doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") 
linux-package
+       doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") 
--libdir-name $(get_libdir) linux-package
 }
 
 src_test() {