From ff7ecce1641b6c7a57ce7d46b159681a789e8c27 Mon Sep 17 00:00:00 2001
From: Thomas Oettli <spacefreak@noop.ch>
Date: Thu, 30 Sep 2021 19:44:24 +0200
Subject: [PATCH] fix distribution

---
 .../pyquarantine-milter-9999.ebuild}            | 17 +++++++++--------
 .../misc/openrc/pyquarantine-milter.confd       |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename distribution/gentoo/mail-filter/{pyquarantine/pyquarantine-9999.ebuild => pyquarantine-milter/pyquarantine-milter-9999.ebuild} (74%)

diff --git a/distribution/gentoo/mail-filter/pyquarantine/pyquarantine-9999.ebuild b/distribution/gentoo/mail-filter/pyquarantine-milter/pyquarantine-milter-9999.ebuild
similarity index 74%
rename from distribution/gentoo/mail-filter/pyquarantine/pyquarantine-9999.ebuild
rename to distribution/gentoo/mail-filter/pyquarantine-milter/pyquarantine-milter-9999.ebuild
index 02d6005..2348ffb 100644
--- a/distribution/gentoo/mail-filter/pyquarantine/pyquarantine-9999.ebuild
+++ b/distribution/gentoo/mail-filter/pyquarantine-milter/pyquarantine-milter-9999.ebuild
@@ -9,6 +9,7 @@ SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/spacefreak86/${PN}"
+	EGIT_BRANCH="master"
 fi
 
 inherit ${SCM} distutils-r1 systemd
@@ -28,7 +29,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="lxml systemd"
+IUSE="+lxml systemd"
 
 RDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
@@ -41,12 +42,12 @@ RDEPEND="
 python_install_all() {
 	distutils-r1_python_install_all
 
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins pyquarantine/docs/pyquarantine.conf.example
-	doins -r pyquarantine/docs/templates
+	dodir /etc/pyquarantine
+	insinto /etc/pyquarantine
+	doins pyquarantine/misc/pyquarantine.conf.example
+	doins -r pyquarantine/misc/templates
 
-	use systemd && systemd_dounit ${PN}/misc/${PN}-milter.service
-	newinitd ${PN}/misc/openrc/${PN}-milter.initd ${PN}-milter
-	newconfd ${PN}/misc/openrc/${PN}-milter.confd ${PN}-milter
+	use systemd && systemd_dounit pyquarantine/misc/${PN}.service
+	newinitd pyquarantine/misc/openrc/${PN}.initd ${PN}
+	newconfd pyquarantine/misc/openrc/${PN}.confd ${PN}
 }
diff --git a/pyquarantine/misc/openrc/pyquarantine-milter.confd b/pyquarantine/misc/openrc/pyquarantine-milter.confd
index 277e442..c56dcc1 100644
--- a/pyquarantine/misc/openrc/pyquarantine-milter.confd
+++ b/pyquarantine/misc/openrc/pyquarantine-milter.confd
@@ -1,8 +1,8 @@
-# /etc/conf.d/pyquarantine: config file for /etc/init.d/pyquarantine
+# /etc/conf.d/pyquarantine-milter: config file for /etc/init.d/pyquarantine-milter
 
 # Start the daemon as the user. You can optionally append a group name here also.
 # USER="daemon"
 # USER="daemon:nobody"
 
-# Optional parameters for pyquarantine
+# Optional parameters for pyquarantine-milter
 # MILTER_OPTS=""