app-portage/sisyphus{,-qt} : version bump

10 files changed, 33 insertions, 11 deletions

diff --git a/app-portage/sisyphus-qt/sisyphus-qt-4.2012.0.ebuild b/app-portage/sisyphus-qt/sisyphus-qt-4.2101.0.ebuild
index 7580617a..a315f314 100644
--- a/app-portage/sisyphus-qt/sisyphus-qt-4.2012.0.ebuild
+++ b/app-portage/sisyphus-qt/sisyphus-qt-4.2101.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://redcorelinux.org"
 
 EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
 EGIT_BRANCH="master"
-EGIT_COMMIT="9163df2c61b1b79cb14a4358e304b31756384077"
+EGIT_COMMIT="44184ce97d0dbbdafe16d0db32325ba0b2b318bd"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,9 +30,9 @@ RDEPEND="${DEPEND}
 	')"
 
 src_install() {
-	emake DESTDIR=${D} install-gui
+	emake DESTDIR="${D}" install-gui
 
 	# enforce the best available python implementation (CLI)
 	python_setup
-	python_fix_shebang "${ED}usr/share/${MY_PN}/${MY_PN}-gui.py"
+	python_fix_shebang "${ED}"usr/share/"${MY_PN}"/"${MY_PN}"-gui.py
 }
diff --git a/app-portage/sisyphus/files/sisyphus-custom.env b/app-portage/sisyphus/files/sisyphus-custom.env
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.env
diff --git a/app-portage/sisyphus/files/sisyphus-custom.make.conf b/app-portage/sisyphus/files/sisyphus-custom.make.conf
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.make.conf
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.accept_keywords b/app-portage/sisyphus/files/sisyphus-custom.package.accept_keywords
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.accept_keywords
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.env b/app-portage/sisyphus/files/sisyphus-custom.package.env
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.env
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.license b/app-portage/sisyphus/files/sisyphus-custom.package.license
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.license
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.mask b/app-portage/sisyphus/files/sisyphus-custom.package.mask
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.mask
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.unmask b/app-portage/sisyphus/files/sisyphus-custom.package.unmask
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.unmask
diff --git a/app-portage/sisyphus/files/sisyphus-custom.package.use b/app-portage/sisyphus/files/sisyphus-custom.package.use
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/app-portage/sisyphus/files/sisyphus-custom.package.use
diff --git a/app-portage/sisyphus/sisyphus-4.2012.0.ebuild b/app-portage/sisyphus/sisyphus-4.2101.0.ebuild
index ff7c507f..1ff9b035 100644
--- a/app-portage/sisyphus/sisyphus-4.2012.0.ebuild
+++ b/app-portage/sisyphus/sisyphus-4.2101.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://redcorelinux.org"
 
 EGIT_REPO_URI="https://gitlab.com/redcore/sisyphus.git"
 EGIT_BRANCH="master"
-EGIT_COMMIT="9163df2c61b1b79cb14a4358e304b31756384077"
+EGIT_COMMIT="44184ce97d0dbbdafe16d0db32325ba0b2b318bd"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,19 +35,41 @@ RDEPEND="${DEPEND}
 PDEPEND="qt5? ( ~app-portage/sisyphus-qt-${PV} )"
 
 src_install() {
-	emake DESTDIR=${D} install-cli
+	emake DESTDIR="${D}" install-cli
 
 	python_moduleinto "$(python_get_sitedir)"/"${PN}"
 	python_domodule src/backend/*.py
 
-	dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN}
-	keepdir var/lib/${PN}/{csv,db}
+	dosym /usr/share/"${PN}"/"${PN}"-cli.py /usr/bin/"${PN}"
+	keepdir var/lib/"${PN}"/{csv,db}
 
-	dodir etc/${PN}
-	insinto etc/${PN}
-	doins ${FILESDIR}/mirrors.conf
+	dodir etc/"${PN}"
+	insinto etc/"${PN}"
+	doins "${FILESDIR}"/mirrors.conf
+
+	doins "${FILESDIR}"/sisyphus-custom.env
+	doins "${FILESDIR}"/sisyphus-custom.make.conf
+	doins "${FILESDIR}"/sisyphus-custom.package.accept_keywords
+	doins "${FILESDIR}"/sisyphus-custom.package.env
+	doins "${FILESDIR}"/sisyphus-custom.package.license
+	doins "${FILESDIR}"/sisyphus-custom.package.mask
+	doins "${FILESDIR}"/sisyphus-custom.package.unmask
+	doins "${FILESDIR}"/sisyphus-custom.package.use
 
 	# enforce the best available python implementation (CLI)
 	python_setup
-	python_fix_shebang "${ED}usr/share/${PN}/${PN}-cli.py"
+	python_fix_shebang "${ED}"usr/share/"${PN}"/"${PN}"-cli.py
+}
+
+pkg_postinst() {
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/"${PN}"/._cfg0000_mirrors.conf ] ; then
+		rm -rf "${EROOT}"etc/._cfg0000_mirros.conf
+	fi
+
+	for i in sisyphus-custom.{env,make.conf,package.{accept_keywords,env,license,mask,unmask,use}}; do
+		if [ -e "${EROOT}"etc/"${PN}"/._cfg000_"$i" ] ; then
+			rm -rf "${EROOT}"etc/"${PN}"/._cfg000_"$i"
+		fi
+	done
 }