summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-12-09 17:07:20 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-12-09 17:07:20 +0000
commit969e3645566bfa0348f713de7e766f49f84fc900 (patch)
tree3606c7aaaa372c48c4bb085da933b4fd005c60ec
parentecb92752772e22ff5dc06cd02f396daf71f34cf1 (diff)
app-portage/sisyphus : revision bump, do not die from now on when we switch interpretors
-rw-r--r--app-portage/sisyphus/files/sisyphus-1.1710-r3.patch (renamed from app-portage/sisyphus/files/sisyphus-1.1710-r2.patch)19
-rw-r--r--app-portage/sisyphus/sisyphus-1.1710-r3.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1710-r2.ebuild)16
2 files changed, 29 insertions, 6 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r2.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r3.patch
index 36fe5c44..5898f921 100644
--- a/app-portage/sisyphus/files/sisyphus-1.1710-r2.patch
+++ b/app-portage/sisyphus/files/sisyphus-1.1710-r3.patch
@@ -1,16 +1,29 @@
diff --git a/Makefile b/Makefile
-index 4d9785d..70579b0 100644
+index 4d9785d..af54dfd 100644
--- a/Makefile
+++ b/Makefile
-@@ -4,7 +4,7 @@ UBINDIR ?= /usr/bin
+@@ -4,7 +4,6 @@ UBINDIR ?= /usr/bin
DESKTOPDIR ?= /usr/share/applications
PIXMAPDIR ?= /usr/share/pixmaps
SISYPHUSDATADIR ?= /usr/share/sisyphus
-SISYPHUSPYLIBDIR ?= /usr/lib64/python3.4
-+SISYPHUSPYLIBDIR ?= /usr/lib64/python3.5
POLKITDIR ?= /usr/share/polkit-1/actions
all:
+@@ -19,8 +18,6 @@ install:
+ install -d $(DESTDIR)$(UBINDIR)
+ install -m 0755 sisyphus-gui $(DESTDIR)$(UBINDIR)/
+ install -m 0755 sisyphus-gui-pkexec $(DESTDIR)$(UBINDIR)/
+- install -d $(DESTDIR)$(SISYPHUSPYLIBDIR)
+- install -m 0644 src/backend/libsisyphus.py $(DESTDIR)$(SISYPHUSPYLIBDIR)/
+ install -d $(DESTDIR)$(SISYPHUSDATADIR)
+ install -d $(DESTDIR)$(SISYPHUSDATADIR)/helpers
+ install -d $(DESTDIR)$(SISYPHUSDATADIR)/icon
+@@ -44,4 +41,3 @@ uninstall:
+ rm -rf $(DESTDIR)$(PIXMAPDIR)/sisyphus-gui.png
+ rm -rf $(DESTDIR)$(POLKITDIR)/org.redcorelinux.sisyphus-gui.policy
+ rm -rf $(DESTDIR)$(SISYPHUSDATADIR)
+- rm -rf $(DESTDIR)$(SISYPHUSPYLIBDIR)/libsisyphus.py
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
index 5f62119..4f7fda5 100755
--- a/src/backend/libsisyphus.py
diff --git a/app-portage/sisyphus/sisyphus-1.1710-r2.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r3.ebuild
index 775f2422..ac58c753 100644
--- a/app-portage/sisyphus/sisyphus-1.1710-r2.ebuild
+++ b/app-portage/sisyphus/sisyphus-1.1710-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python3_{4,5,6} )
inherit eutils python-r1
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+gui"
-DEPEND="dev-lang/python:3.5[sqlite]"
+DEPEND="dev-lang/python[sqlite]"
RDEPEND="${DEPEND}
app-portage/gentoolkit[${PYTHON_USEDEP}]
dev-python/animation[${PYTHON_USEDEP}]
@@ -26,11 +26,21 @@ RDEPEND="${DEPEND}
src_prepare() {
default
- eapply ${FILESDIR}/${P}-r2.patch
+ eapply ${FILESDIR}/${P}-r3.patch
}
src_install() {
default
+
+ inject_libsisyphus() {
+ # FIXME, ugly hack
+ python_moduleinto "$(python_get_sitedir)/.."
+ python_domodule src/backend/libsisyphus.py
+ rm -rf ${D}$(python_get_sitedir)
+ }
+
+ python_foreach_impl inject_libsisyphus
+
dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN}
dodir /var/lib/${PN}/{csv,db}
if ! use gui; then