eclass: Rename flx.eclass to flx-init-scripts.eclass

Define DESCRIPTION, HOMEPAGE, EGIT_REPO_URI, SLOT, IUSE and DEPEND

33 files changed, 58 insertions, 155 deletions

diff --git a/eclass/flx.eclass b/eclass/flx-init-scripts.eclass
index 55aa9c10..04b6713d 100644
--- a/eclass/flx.eclass
+++ b/eclass/flx-init-scripts.eclass
@@ -1,24 +1,29 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-#
-# Original Author: root
-# Purpose: Formilux stuff
-#
+# @ECLASS: flx-init-scripts.eclass
+# @MAINTAINER:
+# Bertrand Jacquin <bertrand@jacquin.bzh>
+# @BLURB: Eclass for Formilux init scripts
+# @DESCRIPTION:
+# Formilux init scripts helper
 
-EXPORT_FUNCTIONS src_prepare src_install
+inherit git-r3
+
+SVCNAME="${PN//init-}"
 
-DESCRIPTION="Formilux Tools"
+DESCRIPTION="Formilux init script for ${SVCNAME}"
+HOMEPAGE="http://master.formilux.org/git/dist/pkg/${SVCNAME}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${SVCNAME}.git"
 
 LICENSE="public-domain"
 SLOT="0"
+IUSE=""
 
-SVCNAME=${PN//init-}
-SDIR="dist"
+EXPORT_FUNCTIONS src_prepare src_install
 
-flx_src_prepare ()
-{
+flx-init-scripts_src_prepare() {
 	[ -d addons -a ! -e add-ons ] \
 	  && mv addons add-ons
 
@@ -38,8 +43,7 @@ flx_src_prepare ()
 	  && mv ${fINIT} add-ons/${SVCNAME}
 }
 
-flx_src_install ()
-{
+flx-init-scripts_src_install() {
 	cd ${S}
 
 	exeinto /sbin/init.d
diff --git a/flx/init-alix-leds/Manifest b/flx/init-alix-leds/Manifest
index f8de6fd6..6dabaa48 100644
--- a/flx/init-alix-leds/Manifest
+++ b/flx/init-alix-leds/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-alix-leds-3.0.ebuild 383 SHA256 9fe6f4ceb0bfc9acfd1132ccf50d55dbe8c9c81abaf5f899ce5e1f2a334ac214 WHIRLPOOL d4740a2bd0a2da0dbf4c22b09ee5c6029b65f23b9e57429164470af3939130a61211ec658781244275b47ed83cab19c9e4796af070f0b2a3f6e89471d9edc8b8
+EBUILD init-alix-leds-3.0.ebuild 358 SHA256 3d9c3edbb8369c8d0c8608ba9c29d6231cd3358be86aeaee9a829bb14dd555e3 WHIRLPOOL 4344fd090e2fd4feee626676c8cf86c50ba028815ca1b47d167239cd4d842acdea26542f09faef1d1cfd5a7c150f5296b9ffba67a5ab493620c2b8ebd8c995da
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-alix-leds/init-alix-leds-3.0.ebuild b/flx/init-alix-leds/init-alix-leds-3.0.ebuild
index 9b7dc775..04760650 100644
--- a/flx/init-alix-leds/init-alix-leds-3.0.ebuild
+++ b/flx/init-alix-leds/init-alix-leds-3.0.ebuild
@@ -3,15 +3,10 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/alix-leds.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+HOMEPAGE="http://master.formilux.org/git/people/beber/pkg/alix-leds.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/alix-leds.git"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=sys-apps/alix-leds-${PV}"
diff --git a/flx/init-apache/Manifest b/flx/init-apache/Manifest
index ddf6ac40..a14af459 100644
--- a/flx/init-apache/Manifest
+++ b/flx/init-apache/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-apache-1.3.ebuild 408 SHA256 dd3e1dd2af8b65faaa32d9903584fa8aadf1503ffffc5060b0c2dd124fa4d548 WHIRLPOOL 8d7ea5feee7d7bb64ba40b5d8bd6891cb9d64a939a89f9216f34638ba0603c8f1defca21676dc7b314abb427986916fca1c533a15ba63137d860ed8f081d0899
+EBUILD init-apache-1.3.ebuild 259 SHA256 fbbf6745eca0fa60efa53c30b394518ec7e08c36bf336913b5378cdd95013419 WHIRLPOOL ce89b7f59d9a2031a571d90d88b7fed42845888ec40bacad9b272aad7fa740f2884afece92fdc6d1a49481dd4f262a8afdea244292423d9fe57da161429930f4
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-apache/init-apache-1.3.ebuild b/flx/init-apache/init-apache-1.3.ebuild
index aba63d00..f07331e0 100644
--- a/flx/init-apache/init-apache-1.3.ebuild
+++ b/flx/init-apache/init-apache-1.3.ebuild
@@ -3,15 +3,10 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/apache.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="1.3-flx0"
 EGIT_COMMIT="v1.3.36-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=www-servers/apache-${PV}"
diff --git a/flx/init-clamav/Manifest b/flx/init-clamav/Manifest
index 6a4932be..e5bcc945 100644
--- a/flx/init-clamav/Manifest
+++ b/flx/init-clamav/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-clamav-0.92.1.ebuild 512 SHA256 746b8f665a9f218e86ca871ac16e476825dfc20008e91f943abe8149771227f2 WHIRLPOOL 5c2c4f02f9bc9aa796ef06e5600b27881d475ce6ef2c519db243ef878d836448631b88129133703b0de5896d777607ff7185634ca13ee1db5f287e19f3af2285
+EBUILD init-clamav-0.92.1.ebuild 352 SHA256 bd566dba01c79818d152bd3836b6e8135f3b53d633d1b2c7f337292f2bb1adb7 WHIRLPOOL 6b3e7bc9de5be318b077d8938e30c66dd38d4291283011222e30e4809c27ea4780c942d0c12961cc6f9a2ef134eb6cb2642cec35a9399b8b383eb1dc147e4b0e
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-clamav/init-clamav-0.92.1.ebuild b/flx/init-clamav/init-clamav-0.92.1.ebuild
index bf34df19..c36eed99 100644
--- a/flx/init-clamav/init-clamav-0.92.1.ebuild
+++ b/flx/init-clamav/init-clamav-0.92.1.ebuild
@@ -3,22 +3,13 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/clamav.git"
 EGIT_BRANCH="0-flx0"
 #EGIT_COMMIT="v0.92.1-flx0.1"
 
-LICENSE="public-domain"
-SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=app-antivirus/clamav-${PV}"
 
 SVCNAME="clamd"
diff --git a/flx/init-dnsmasq/Manifest b/flx/init-dnsmasq/Manifest
index 6c4606d9..e21128f4 100644
--- a/flx/init-dnsmasq/Manifest
+++ b/flx/init-dnsmasq/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-dnsmasq-2.32.ebuild 404 SHA256 17aee41c873ca22218c891c751d61952633b959550a1a21060a5af043eeedafa WHIRLPOOL 1d15b5803ada6563d2ae812de2045fce43eeb9588d89eca55d1789884ddf378d94b3ef04d672e74bb680d166dadf25bd404d33418dc156b53f2bc9e2b9273a71
+EBUILD init-dnsmasq-2.32.ebuild 255 SHA256 8f1cde3a6115a6d3c767830dfa419e0caf1954dca15738cc4139168f6612e3c0 WHIRLPOOL a3a9ad9b021c4ab41c3b15816f16a9875c4b7cdac8c3196e0e8239a658e8443a0042175f92e44e079e6d3fa024f4c0ff3c31b22754bdf6d5336a97be53e0ec73
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild b/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild
index 7c82c9f1..32d5fb7f 100644
--- a/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild
+++ b/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild
@@ -3,15 +3,10 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="2.32-flx0"
 EGIT_COMMIT="v2.32-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-dns/dnsmasq-${PV}"
diff --git a/flx/init-frox/Manifest b/flx/init-frox/Manifest
index 8885f096..289d64d4 100644
--- a/flx/init-frox/Manifest
+++ b/flx/init-frox/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-frox-0.7.ebuild 425 SHA256 f967f90f2408053cade4b445d13d02df65bc3816cf5c992cbc231bd5f19b56fb WHIRLPOOL bf2beb84b7f14f8b13d9c3ac058c76005cae46d6f8deb2ac58ac5c99e148fa6cf9b769475516f484ac6177d1770847814c607665992d5236fc75a8997fb11b9b
+EBUILD init-frox-0.7.ebuild 327 SHA256 ef65ac97205b82cc67999789ecb367416b36b3fb6383f17e69996bdb799f3c2c WHIRLPOOL 09d20b4994a11337b278765ecdf2b538dfc45a9c479c11edf43254370f2b2193419640f86f564d12fd30db9aa12afc02b74e678d7ddf2025b53744b5bc3830c7
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-frox/init-frox-0.7.ebuild b/flx/init-frox/init-frox-0.7.ebuild
index aee6aa67..fb5ccde1 100644
--- a/flx/init-frox/init-frox-0.7.ebuild
+++ b/flx/init-frox/init-frox-0.7.ebuild
@@ -3,17 +3,11 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/frox.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/frox.git"
 EGIT_BRANCH="0.7-flx0"
 #EGIT_COMMIT="v0.7.18-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-ftp/frox-${PV}"
diff --git a/flx/init-havp/Manifest b/flx/init-havp/Manifest
index 4be25199..cc4d68ae 100644
--- a/flx/init-havp/Manifest
+++ b/flx/init-havp/Manifest
@@ -1,3 +1,3 @@
 AUX init-havp-BJA-tail.diff 456 SHA256 7588b12094ad1c63c62dba1e987d5402ea128ca2cb36227d2296c26384d259c4 WHIRLPOOL 6527dbdb183f5bb1b8fd958e1c5ed21835b9032ae9e2e5d596d78781c3acb046e3ccb3e51d2e135c4659405b9f7f24e9aa46293e3fafa1705370ecc8782e15f5
-EBUILD init-havp-0.85.ebuild 494 SHA256 264968b84453b76e07370cfb2798fd84994d7e8d45ceb7123dd231798e1cbb3a WHIRLPOOL 300e563173a95f5f51f96641084fd587329c1803464383b487cc24cfc3c42a9b1f957918266535c969d39ade929f4f51dc587d69830b6a70ce5ce008402da0cc
+EBUILD init-havp-0.85.ebuild 322 SHA256 a7deeb45f2ed2568888360eecacb73e49814aac32e29d87f2d437cb74505a5d8 WHIRLPOOL ca37fc8a06e7455323a04139eff38e16f25cac2cac95751ca1236f60a7fd28f766f34a85a298bc703ff394432d4f97d2384866dc29396efbb4d742e5d682d723
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-havp/init-havp-0.85.ebuild b/flx/init-havp/init-havp-0.85.ebuild
index a5fc9c3a..114bce4c 100644
--- a/flx/init-havp/init-havp-0.85.ebuild
+++ b/flx/init-havp/init-havp-0.85.ebuild
@@ -3,23 +3,16 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/havp.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="0-flx0"
 EGIT_COMMIT="v0.85-flx0.2"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-proxy/havp-${PV}"
 
 src_prepare() {
 	default
 
 	epatch "${FILESDIR}/${PN}-BJA-tail.diff"
-
-	flx_src_prepare
 }
diff --git a/flx/init-nagios/Manifest b/flx/init-nagios/Manifest
index c08d5dde..0b40137d 100644
--- a/flx/init-nagios/Manifest
+++ b/flx/init-nagios/Manifest
@@ -1,3 +1,3 @@
 AUX init-nagios-BJA-path.diff 1389 SHA256 43ad4ae71b5c47102297d98a5ccb01f293803a72e7099997f86217597ea2b992 WHIRLPOOL c76150f0025c0593a1e4719b40f2deba8ea5eda1c2fab4d92a181cf5ba8d652f4fe415817b3dbbcd9fc73967d198886731b5737a6f08870ff0654242d4002650
-EBUILD init-nagios-2.5.ebuild 504 SHA256 c2f318c5046b99b48641182dde19e8c7667b49b58389283d417b0315695817a7 WHIRLPOOL 58ccdd8ccff3e8fb3e3bd352f226dd384340f716e6343e28977a26d4f4af78c1f61f5f88daa381b0d4cd609c77fbc1e7fc2b72fd4d320a0f7d154eae68ef906c
+EBUILD init-nagios-2.5.ebuild 330 SHA256 0382b6e1910af2135c46a7b387cfc8fb6f63ffc884655a0ce9a7b084cbcd0f9c WHIRLPOOL cffff2eeb096c8a0c2e709f6c8bdb7b0f9c3ef87d5f69825c417f03e77edf90bcfbcbb888ae22cb68f396bb0c099f20b2b9d17316ce23aa41bafd6d5ce71e6fd
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-nagios/init-nagios-2.5.ebuild b/flx/init-nagios/init-nagios-2.5.ebuild
index 3abf59a8..5ca81aee 100644
--- a/flx/init-nagios/init-nagios-2.5.ebuild
+++ b/flx/init-nagios/init-nagios-2.5.ebuild
@@ -3,23 +3,16 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/nagios.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="2.5-flx0"
 EGIT_COMMIT="v2.5-flx0.1"
 
 KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-analyzer/nagios-${PV}"
 
 src_prepare () {
 	default
 
 	epatch "${FILESDIR}/${PN}-BJA-path.diff"
-
-	flx_src_prepare
 }
diff --git a/flx/init-ntp/Manifest b/flx/init-ntp/Manifest
index 84892ad4..b8f0d8c2 100644
--- a/flx/init-ntp/Manifest
+++ b/flx/init-ntp/Manifest
@@ -2,5 +2,5 @@ AUX absolute-path-reuse-do-update.diff 927 SHA256 8a8e7f3f8a1bf677bb51bdb8a15da3
 AUX indent.diff 2048 SHA256 b351deca5737c5618b2149da2051bce284e43217d9812de62348927f600985fb WHIRLPOOL 9bd3bfbef98612ddc2f1d3b7f4614cb48bb9f1d72102d6fba2e84ff8bd992aed8d728276c72b2bf51070a8a747c9811eac668c98202d6eaa2e95b1b8217c8fdb
 AUX path.diff 1337 SHA256 7753a9eb741fab1116b19f7e1d0e3fd05007ed12c5e868ba45942ea74b8c9498 WHIRLPOOL 3038064ccf5f4c875ef913624aaf9898b307ccd9f3fdbf8fe1adabb1b0735324bfa04f3a36a6648876d5f31903a7400541c0ad413ef9c68a8013f7269d00c8b2
 AUX remove-ntptimeset.diff 2322 SHA256 30c723b919d7884c05c1fa9fc34bd0a0265d81f8d0f1075a9e823df39a108e90 WHIRLPOOL 3490668064a165f795c2ecc624ca80c65c8c48d693ab9078778aa9c05293951826f2356e3d05e4fb8a611d597b2ca8cbc8b4a587c50d99e1b4ae41161526acd6
-EBUILD init-ntp-4.2.ebuild 626 SHA256 25fda185679e1d278ab9fe0c08fa6c7d126154e1afc448664afd86fcf8b31392 WHIRLPOOL fc44d8554c7d2fae91ecc0cf7b2d40d7006cd6b66bbe7fa94cf0b63a6345edc35c4150bf5c8e1348b79690cf6fe410955ea2f5024140c23d0378908696e36421
+EBUILD init-ntp-4.2.ebuild 451 SHA256 3dadb02fe5568fdb1a00646a325a9dc44986cafa212a939c0d4b84a80a0a7352 WHIRLPOOL b8afe451a9d78071139fee2058690936c2c0dd60753d2a73ddac8e809e87c9d2b30d73eeecc5d2c833939da38a9fc7571a3bb4ea576c44e48f01613aff1e008e
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-ntp/init-ntp-4.2.ebuild b/flx/init-ntp/init-ntp-4.2.ebuild
index 29e8730f..e86af982 100644
--- a/flx/init-ntp/init-ntp-4.2.ebuild
+++ b/flx/init-ntp/init-ntp-4.2.ebuild
@@ -3,19 +3,12 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-#SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/ntp.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${SVCNAME}.git"
 EGIT_BRANCH="4.2-flx0"
 EGIT_COMMIT="v4.2.4p4-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-misc/ntp-${PV}"
 
 src_prepare() {
diff --git a/flx/init-openssh/Manifest b/flx/init-openssh/Manifest
index 4051d0f3..224f3ee1 100644
--- a/flx/init-openssh/Manifest
+++ b/flx/init-openssh/Manifest
@@ -1,3 +1,3 @@
 AUX init-openssh-BJA-ecdsa.diff 1147 SHA256 9c15bf627ee4e5c2eb117f5cd0e27ea5346514b31b58d16693e998acf6fa022d WHIRLPOOL bb7d42f58c8a6968317012a6e15cb4d56098936a0ca15f846ce9db80c4bb8845afb4446243d10eb886a2ab0d1157cb3a219c7feed5d63dfc50fd2b3615ab8c4b
-EBUILD init-openssh-4.5.ebuild 549 SHA256 f3fa4237d65d4d663c4be341ee9907c06b64764b71917b7f8b6fc3a716cb9a0d WHIRLPOOL 8949b38c8ecc3cf5cee1914f74a692949e3d6a8f5c1d183cfd8f21c488fa26f86e9cda25df95d2f95d49d925d6188de575aaea1e951510ae1546e81cd4f3f92b
+EBUILD init-openssh-4.5.ebuild 345 SHA256 06b3721fe225eceb86c429c0ed131bfeb5b9cab26ce736f28dbcd17eda9eb50c WHIRLPOOL 6418f93012380cae78cbc14a35632562bd64cbe2c2febcb18e9a991fce2caff0dc61785fe9b51f3c1e8514d1762d3eb4e90442e3930cfe2746f42a468895d394
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-openssh/init-openssh-4.5.ebuild b/flx/init-openssh/init-openssh-4.5.ebuild
index a73ffd70..293b66c4 100644
--- a/flx/init-openssh/init-openssh-4.5.ebuild
+++ b/flx/init-openssh/init-openssh-4.5.ebuild
@@ -3,18 +3,12 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/openssh.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="4.5-flx0"
 EGIT_COMMIT="v4.5p1-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-misc/openssh-${PV}"
 
 SVCNAME="sshd"
@@ -23,6 +17,4 @@ src_prepare () {
 	default
 
 	epatch "${FILESDIR}/${PN}-BJA-ecdsa.diff"
-
-	flx_src_prepare
 }
diff --git a/flx/init-openvpn/Manifest b/flx/init-openvpn/Manifest
index 223f2bdf..6715ed41 100644
--- a/flx/init-openvpn/Manifest
+++ b/flx/init-openvpn/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-openvpn-2.0.9.ebuild 431 SHA256 aafd6ce5edb7012b7266e250da845ebad3d8c360c689190bbac124791cebbcab WHIRLPOOL 438d5df61ab6d76fc9dbbb6ecebb10de9b36c70f917f9acd547db291a842ccd130d403616e29850c65828ac199277321d9454a1604f28d03642d063777452a13
+EBUILD init-openvpn-2.0.9.ebuild 333 SHA256 57aa8992c69b55971b03375cbacc150dc4481fa5a31163894a0ce7103b4f6255 WHIRLPOOL de37c1d1fdb863bf04cbda61b2514d1bd30be1c3d289a0d567c92a564ad710e4b0196f42f3a405d9786613699e3f7f862b118c06b978b8cd59b46feb91438c9d
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-openvpn/init-openvpn-2.0.9.ebuild b/flx/init-openvpn/init-openvpn-2.0.9.ebuild
index 9d724068..eb4bfaae 100644
--- a/flx/init-openvpn/init-openvpn-2.0.9.ebuild
+++ b/flx/init-openvpn/init-openvpn-2.0.9.ebuild
@@ -3,17 +3,11 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/openvpn.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/openvpn.git"
 EGIT_BRANCH="2.0-flx0"
 #EGIT_COMMIT="v${PV}-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-misc/openvpn-${PV}"
diff --git a/flx/init-scripts/Manifest b/flx/init-scripts/Manifest
index f5a6759b..71e82a1b 100644
--- a/flx/init-scripts/Manifest
+++ b/flx/init-scripts/Manifest
@@ -3,5 +3,5 @@ AUX init-scripts-BJA-path.diff 11094 SHA256 6c37265cab0b5db793de461db75af974988c
 AUX init-scripts-BJA-remove-mii-diag.diff 3687 SHA256 5dd370df3eb70a1a03ae0219b591cb537e59f39abffd1a000bbca2236822ae99 WHIRLPOOL e03d8cfd1ebc50ebcf91c6352315f85327cc4a92245bc98e04cd74f2a466cfc6c7932ed019c57fdb92a0b40f775d68c3fe109d91a5db5ebd7b119b4481f1d1ae
 AUX init-scripts-BJA-remove-unused-code.diff 4097 SHA256 87ed7d8450fe6d8f591c95ce01bb0dcd645a93a05d68c58b829b8b4dca6844ac WHIRLPOOL fd6a7fb3a477a8f94b35dfa413aac0aa74dc8bc14cd348d131f4e0df9603ba6c3f495b81d6165e022e9b5fc5ea20dfa2b0252765c9a32de07fef3fa5c3186354
 AUX init-scripts-BJA-tail.diff 983 SHA256 10f90f8273f960b45514389abf3cbc284c09bc59444a34ef89613c319387b5d7 WHIRLPOOL 36dfa8c379104d55796122c0f5c71d2203ed21d25fb30576de369766d05a5e695f79db6a5979bcd9dc6d61004ff171576b950c5d8aeec99c18bd6ed8695f045a
-EBUILD init-scripts-0.3.42.ebuild 939 SHA256 1d78f3db5d6966694cc98f4623639af976a33bde93a493b3de97239382cc2ce6 WHIRLPOOL 654b197fab67d6e4902e6548e749ebf2677783f8b5958c5a79166f30c48f007df897de1a2cd80b7d4cb4018c2aff9fd51527c423b9e3a8bf33e8854e9d39a3a2
+EBUILD init-scripts-0.3.42.ebuild 923 SHA256 dd2cd27a15cb84a3b126be2ad555dbc530fa97d4440c6de60f1e0da2f7d9d4f5 WHIRLPOOL 4330722aa7b4cc89c6041820d7336c191afebb0a219baeb54fd2206ca5a3e9368b7b4ddb33b298f68961fb89b1cf529de16edcd2c5804e219bdfd259e7c31885
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-scripts/init-scripts-0.3.42.ebuild b/flx/init-scripts/init-scripts-0.3.42.ebuild
index 31e5424a..92ed6bc6 100644
--- a/flx/init-scripts/init-scripts-0.3.42.ebuild
+++ b/flx/init-scripts/init-scripts-0.3.42.ebuild
@@ -5,11 +5,9 @@
 EAPI=6
 inherit git-r3 eutils
 
-SDIR="people/beber"
-
 DESCRIPTION="Formilux Tools"
 HOMEPAGE="http://master.formilux.org/git/dist/src/init-scripts.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/src/${PN}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/src/${PN}.git"
 #EGIT_COMMIT="v${PV}"
 
 LICENSE="public-domain"
diff --git a/flx/init-squid/Manifest b/flx/init-squid/Manifest
index 43a9e128..6a01ee71 100644
--- a/flx/init-squid/Manifest
+++ b/flx/init-squid/Manifest
@@ -1,4 +1,4 @@
 AUX init-squid-BJA-obsolete-opt.diff 1205 SHA256 383586abc3c993b3dc10a3214d02bf077dbc3eb57ab56346b34f34793e9deeeb WHIRLPOOL 64c38229f8b4611ba7d5777d03f92b47024a85147c0a13864ca2fb2899f0cc2019dc1365566798d922e3342ec016a01d6dfe9caa68f713d834f754dd988a4f17
 AUX init-squid-BJA-path.diff 621 SHA256 be4f7e173562665ae2140908c02fdbf9512ecd804a9b02f0112d0d9c5fea9710 WHIRLPOOL 121d2a5f4805def7adb612a600144ae50fedc955ffce90fce15ae5af71712d3cc71fccc7906404191e4d6f414eb3e48e28d08c1505ab6291c3c65a687776f2fc
-EBUILD init-squid-2.6.ebuild 556 SHA256 8639d18c0dc83619d115746fa96a03036375c4c6b5ac580549ea9f345641bc2e WHIRLPOOL dfea4a08591908ff6f97519bca8383c7eb2fdef514f7545834e3df046bdd6b03778b3b62c053d9c0222a7a47324b5c82c80916634755fe0eaec37ffad7dd4905
+EBUILD init-squid-2.6.ebuild 383 SHA256 c8cc68f65bdc69f5cfcb3fcfb746f9dd994ceefefd12041ca6df22a6805bed21 WHIRLPOOL 873f4b026b82f6f6a3f3cecc7ed35447b0c73111d4824fb114f548a09b304325fdb52e6e42b8aa2ba5d2a8cfcf37fff15a76ed1327ab6923bb5dbabaf7f49805
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-squid/init-squid-2.6.ebuild b/flx/init-squid/init-squid-2.6.ebuild
index 7a8be5e0..f949b2fa 100644
--- a/flx/init-squid/init-squid-2.6.ebuild
+++ b/flx/init-squid/init-squid-2.6.ebuild
@@ -3,17 +3,12 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/squid.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="2.6-flx0"
 EGIT_COMMIT="v2.6.STABLE13-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=net-proxy/squid-${PV}"
 
 src_prepare() {
@@ -21,6 +16,4 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-BJA-path.diff"
 	epatch "${FILESDIR}/${PN}-BJA-obsolete-opt.diff"
-
-	flx_src_prepare
 }
diff --git a/flx/init-syslog-ng/Manifest b/flx/init-syslog-ng/Manifest
index 9d30e797..e475ec70 100644
--- a/flx/init-syslog-ng/Manifest
+++ b/flx/init-syslog-ng/Manifest
@@ -1,3 +1,3 @@
 AUX init-syslog-ng-BJA-path.diff 789 SHA256 4fbee8523d312a29e8aefa089caadfed7ca7f2b6c04917de307f2967be8eabf1 WHIRLPOOL ffd53302ed30fa0ddef81c175b65b7b9f59e2b87bdd5f40daf31e8290124dffe37d380dd0b70710a1f3888481194bbe71d48a82f941c7c3f49b58f9d5b86093b
-EBUILD init-syslog-ng-1.6.ebuild 509 SHA256 06f94375944785307b5f67fc2c1a2df7ee6fd6137d9b493cc6bf5b693e6de6c2 WHIRLPOOL af4ebbf9856a82aa611035d3a455c0ddd520a61ec71ab3657db48628cc42d97f9a8b9c338ae5941f5631d5513e4254b73062feb876aad335ce504958b24df820
+EBUILD init-syslog-ng-1.6.ebuild 332 SHA256 e438fae7ae2f1a7639188e68dcc479a9cedf2b22567afd5100f24876548ff908 WHIRLPOOL 619947817296d0194a49d6e81e6aa87b2c652301aaf427aff6a4c5ecbb3f7c42c93b93c649a382c84b3cff5ddc3073d43ab1ceff855bd9b8ea5c869b0d692964
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild b/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild
index 168609d9..64101670 100644
--- a/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild
+++ b/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild
@@ -3,23 +3,16 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx eutils
+inherit flx-init-scripts
 
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/syslog-ng.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git"
 EGIT_BRANCH="1.6-flx0"
 EGIT_COMMIT="v1.6.11-flx0.1"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=app-admin/syslog-ng-${PV}"
 
 src_prepare () {
 	default
 
 	epatch "${FILESDIR}/${PN}-BJA-path.diff"
-
-	flx_src_prepare
 }
diff --git a/flx/init-thttpd/Manifest b/flx/init-thttpd/Manifest
index 2147edca..ef22298d 100644
--- a/flx/init-thttpd/Manifest
+++ b/flx/init-thttpd/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-thttpd-2.25b.ebuild 493 SHA256 4b2da4e0d9b83bf83b971e42aaed3d4e7543877c7cf6e03378e408113e6f9dcb WHIRLPOOL cc107d861e7cfb6a057e8b144c035187cd89808f9ee47726090b642396ba42864b024356ccb7b092610316f970d8e25f3da45cdc7f116aafcbd9de0efa1a2a38
+EBUILD init-thttpd-2.25b.ebuild 333 SHA256 84b675f870e54dab747e98349897ae648cf8af6fbc83cdc36029e93a99e5734e WHIRLPOOL 05eb778dbb74a4121d938be82636652fa7bfa0e17ff593abf90ac9aa543c3911afbd16f46a8f6662bd5c12a7ad4d52c2d12d17e5f9917853c2d0c15757f6e898
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-thttpd/init-thttpd-2.25b.ebuild b/flx/init-thttpd/init-thttpd-2.25b.ebuild
index f65b6b8b..a9d84bcf 100644
--- a/flx/init-thttpd/init-thttpd-2.25b.ebuild
+++ b/flx/init-thttpd/init-thttpd-2.25b.ebuild
@@ -3,20 +3,11 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/thttpd.git"
 EGIT_BRANCH="2-flx0"
 #EGIT_COMMIT="v2.25b-flx0.1	"
 
-LICENSE="public-domain"
-SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=www-servers/thttpd-${PV}"
diff --git a/flx/init-vixie-cron/Manifest b/flx/init-vixie-cron/Manifest
index fad66a65..307f87d6 100644
--- a/flx/init-vixie-cron/Manifest
+++ b/flx/init-vixie-cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-vixie-cron-3.0.1.ebuild 457 SHA256 3c776ba3842428bc8cf464a7a03012ac4dd78b0edfb508ec5e6be90941e333c0 WHIRLPOOL fce0ad62157fdca20993d4154a1a115f8aa193530fa764d9057de9cc667344b25e880b4e155887c2b70aaa2318676b1eb9a3a4861c7de55f4069d2c336092f8a
+EBUILD init-vixie-cron-3.0.1.ebuild 359 SHA256 a65dc647640239d7a965466ff4fa62e467c99544280b26a44cb941d6ac5f28a0 WHIRLPOOL 2e5e25b6f454bd9429ceb039f46a94f99293c851236ee499e45d4bd42a78c7844087f9f2a6ba9b963292162e2735a5d59fcc7b99d54fcac26c9964cc2e15a192
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
index f8544117..18ea1c63 100644
--- a/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
+++ b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild
@@ -3,19 +3,13 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/vixie-cron.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/vixie-cron.git"
 EGIT_BRANCH="3.0-flx0"
 #EGIT_COMMIT="v3.0.1-flx0.5"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=sys-process/vixie-cron-${PV}"
 
 SVCNAME="crond"
diff --git a/flx/init-wdd/Manifest b/flx/init-wdd/Manifest
index 0ed24595..e694a9a0 100644
--- a/flx/init-wdd/Manifest
+++ b/flx/init-wdd/Manifest
@@ -1,2 +1,2 @@
-EBUILD init-wdd-0.1.34.ebuild 366 SHA256 f408ef9811057535dade8b961db4004392f9735fecdc788e2a58ee4c179744fc WHIRLPOOL ffd52e1e601f5d87b12218d411543f5125c78a6d1bc6d8acd43c059d542feac067438b16b57db3896cc5007d936b275124f9d908c2e2dfed05dc6377ff96ae57
+EBUILD init-wdd-0.1.34.ebuild 335 SHA256 9d17fd7ccaa9253e7f49b47aa8c7ac69dce94c4523f2360e33571bf0de139a4b WHIRLPOOL 50cc2386453a36ffd86805ed47a0298d9ce35d9d6a40fe8e499f319bd33cb9f10a4b30860a1f04bcf9a94aa476cb640727004988229b3ac05e7c653eff23a854
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-wdd/init-wdd-0.1.34.ebuild b/flx/init-wdd/init-wdd-0.1.34.ebuild
index d9a6c4b6..eeef1bca 100644
--- a/flx/init-wdd/init-wdd-0.1.34.ebuild
+++ b/flx/init-wdd/init-wdd-0.1.34.ebuild
@@ -3,15 +3,10 @@
 # $Id$
 
 EAPI=6
-inherit git-r3 flx
+inherit flx-init-scripts
 
-SDIR="people/beber"
-
-HOMEPAGE="http://master.formilux.org/git/dist/pkg/wdd.git"
-EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git"
+HOMEPAGE="http://master.formilux.org/git/people/beber/pkg/wdd.git"
+EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/wdd.git"
 
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
 RDEPEND=">=flx/wdd-${PV}"