more repoman fixes

app-misc/anki/metadata.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+    <maintainer type="person">
                 <email>tomka@gentoo.org</email>
                 <name>Thomas Kahle</name>
-	</maintainer>
-	<maintainer type="person">
+    </maintainer>
+    <maintainer type="person">
                 <email>patrick@gentoo.org</email>
                 <name>Patrick Lauer</name>
-	</maintainer>
-	<longdescription lang="en">
-		Anki is a program designed to help you remember facts
-		(such as words and phrases in a foreign language) as
-		quickly, easily and efficiently as possible.
-	</longdescription>
-	<use>
-		<flag name="recording">
-			Enable support for audio recording
-		</flag>
-		<flag name="sound">
-			Enable support for adding sound to cards
-		</flag>
-		<flag name="mpv">
-			Play audio via mpv instead of mplayer
-		</flag>
-	</use>
+    </maintainer>
+    <longdescription lang="en">
+        Anki is a program designed to help you remember facts
+        (such as words and phrases in a foreign language) as
+        quickly, easily and efficiently as possible.
+    </longdescription>
+    <use>
+        <flag name="recording">
+            Enable support for audio recording
+        </flag>
+        <flag name="sound">
+            Enable support for adding sound to cards
+        </flag>
+        <flag name="mpv">
+            Play audio via mpv instead of mplayer
+        </flag>
+    </use>
 </pkgmetadata>

app-misc/qmetro/qmetro-0.7.1.ebuild

@@ -8,7 +8,7 @@ case $PV in *9999*) VCS_ECLASS="git-r3" ;; *) VCS_ECLASS="" ;; esac
 inherit qmake-utils ${VCS_ECLASS}
 
 DESCRIPTION="Metro/subway map and route computation software."
-HOMEPAGE="http://sourceforge.net/projects/qmetro/"
+HOMEPAGE="https://sourceforge.net/projects/qmetro/"
 
 if [ -n "${VCS_ECLASS}" ]; then
 	KEYWORDS=""

app-text/makedict/makedict-0.4.1_beta1-r1.ebuild

@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="Dictionary converter"
-HOMEPAGE="http://sourceforge.net/projects/xdxf/"
+HOMEPAGE="https://sourceforge.net/projects/xdxf/"
 
 REV=a26b847fa785ccb87a0b67940c824e29da97c2fd
 SRC_URI="https://github.com/soshial/xdxf_makedict/archive/${REV}.zip -> ${P}-${PR}.zip"

app-text/makedict/makedict-9999.ebuild

@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils python-single-r1 git-r3
 
 DESCRIPTION="Dictionary converter"
-HOMEPAGE="http://sourceforge.net/projects/xdxf/"
+HOMEPAGE="https://sourceforge.net/projects/xdxf/"
 
 EGIT_REPO_URI="https://github.com/soshial/xdxf_makedict"
 

app-text/qstardict/metadata.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-	  <email>rion4ik@gmail.com</email>
-	  <name>rion</name>
-	  <description>one of developers</description>
-	</maintainer>
-	<longdescription>Cool stardict clone written with Qt</longdescription>
-<use>
-<flag name='plugin_stardict'>build stardict plugin</flag>
-<flag name='plugin_web'>build web plugin</flag>
-<flag name='plugin_swac'> </flag>
-</use>
+  <maintainer type="person">
+    <email>rion4ik@gmail.com</email>
+    <name>rion</name>
+    <description>one of developers</description>
+  </maintainer>
+  <longdescription>Cool stardict clone written with Qt</longdescription>
+  <use>
+    <flag name='plugin_stardict'>build stardict plugin</flag>
+    <flag name='plugin_web'>build web plugin</flag>
+    <flag name='plugin_swac'> </flag>
+  </use>
 </pkgmetadata>

dev-vcs/mercurial/metadata.xml

@@ -8,6 +8,6 @@
   <use>
     <flag name="bugzilla">Support bugzilla integration.</flag>
     <flag name="gpg">Support signing with GnuPG.</flag>
-	<flag name="tk">Install dev-lang/tk for hgk script.</flag>
+    <flag name="tk">Install dev-lang/tk for hgk script.</flag>
   </use>
 </pkgmetadata>

games-action/oolite/oolite-1.84.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="http://oolite.org/"
 FF_JS_URI="http://jens.ayton.se/oolite/deps/firefox-4.0.source.js-only.tbz"
 BINRES_REV=f5aed27fefc32c24775b39fce25402b970b09b84
 SRC_URI="https://github.com/OoliteProject/oolite/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://github.com/OoliteProject/oolite-binary-resources/archive/${BINRES_REV}.zip -> oolite-binary-resources-${PV}.zip
+	https://github.com/OoliteProject/oolite-binary-resources/archive/${BINRES_REV}.zip -> oolite-binary-resources-${PV}.zip
 	${FF_JS_URI}"
 
 LICENSE="GPL-2"

mail-filter/milter-greylist/metadata.xml

@@ -2,20 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-  <email>andreis.vinogradovs@gmail.com</email>
-  <name>Андрей Виноградов</name>
+ <email>andreis.vinogradovs@gmail.com</email>
+ <name>Андрей Виноградов</name>
  <description>Description of the maintainership</description> 
 </maintainer>
  <use>
-	 <flag name='spf'>Add Sender Policy Framework support </flag>
-	 <!-- flag name='dnsrbl'>Add dnsrbl blacklist support </flag -->
-	 <flag name='bind'>Use <pkg>net-dns/bind-tools</pkg> resolver instead glibc
-	 resolver</flag>
-	 <flag name='p0f'>Add support for OS type detection's.
-	 Use<pkg>net-analyzer/p0f</pkg></flag>
-	 <flag name='spamassassin'>Add spamassasin plugin</flag>
-	 <flag name='postfix'>Add support for <pkg>mail-mta/postfix</pkg> MTA</flag>
-	 <flag name='sendmail'>Add support for <pkg>mail-mta/sendmail</pkg> MTA </flag>
-	 <flag name='ldap'>Build witch openldap support</flag>
-</use>
+  <flag name='spf'>Add Sender Policy Framework support </flag>
+  <!-- flag name='dnsrbl'>Add dnsrbl blacklist support </flag -->
+  <flag name='bind'>Use <pkg>net-dns/bind-tools</pkg> resolver instead glibc resolver</flag>
+  <flag name='p0f'>Add support for OS type detection's. Use<pkg>net-analyzer/p0f</pkg></flag>
+  <flag name='spamassassin'>Add spamassasin plugin</flag>
+  <flag name='postfix'>Add support for <pkg>mail-mta/postfix</pkg> MTA</flag>
+  <flag name='sendmail'>Add support for <pkg>mail-mta/sendmail</pkg> MTA </flag>
+  <flag name='ldap'>Build witch openldap support</flag>
+ </use>
 </pkgmetadata>

media-sound/qomp/qomp-9999.ebuild

@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Quick(Qt) Online Music Player - one player for different online music hostings"
-HOMEPAGE="http://sourceforge.net/projects/qomp/"
+HOMEPAGE="https://sourceforge.net/projects/qomp/"
 SLOT="0"
 LICENSE="GPL-3"
 

sys-apps/hasp/metadata.xml

@@ -5,15 +5,15 @@
 HASP - Hardware Against Software Piracy
 The package contains
 
-	* The required software for accessing HASP and Hardlock keys from Aladdin
+* The required software for accessing HASP and Hardlock keys from Aladdin
 
-	  Supports parallel HASP keys, Hardlock keys, USB HASP keys.
-      It contains kernel module which required when using parallel port keys
-	  and USB daemon which is general required to access the HASP/Hardlock key.
+  Supports parallel HASP keys, Hardlock keys, USB HASP keys.
+  It contains kernel module which required when using parallel port keys
+  and USB daemon which is general required to access the HASP/Hardlock key.
 
-	 * The Smartkey key server for Linux (Smartkey 3 USB/LPT keys) from Eutron
+* The Smartkey key server for Linux (Smartkey 3 USB/LPT keys) from Eutron
 
-	 * The SafeNet USB key server and license server for keys from SafeNet Sentinel
+* The SafeNet USB key server and license server for keys from SafeNet Sentinel
 
 The RPM package prepared in Etersoft for WINE@Etersoft project.
 Please send any comments to hasp@etersoft.ru
@@ -22,13 +22,13 @@ Copyright 1985-2008 Aladdin Knowledge Systems http://www.aladdin.com
 Copyright 2006-2007 Eutron SPA http://www.smartkey.eutron.com
 Copyright 2006-2006 SafeNet Sentinel http://www.safenet-inc.com
 </longdescription>
-	<maintainer type="person">
-		<email>egor.y.egorov@gmail.com</email>
-	</maintainer>
-	<use>
-		<flag name='lpt'>Install kernel module for LPT-keys</flag>
-		<flag name='net_hasp'>Install binaries for use HASP-keys on network</flag>
-		<flag name='wine'>Install winehasp binary and init-script</flag>
-		<flag name='demo'>Install demo binaries</flag>
-	</use>
+  <maintainer type="person">
+    <email>egor.y.egorov@gmail.com</email>
+  </maintainer>
+  <use>
+    <flag name='lpt'>Install kernel module for LPT-keys</flag>
+    <flag name='net_hasp'>Install binaries for use HASP-keys on network</flag>
+    <flag name='wine'>Install winehasp binary and init-script</flag>
+    <flag name='demo'>Install demo binaries</flag>
+  </use>
 </pkgmetadata>

sys-apps/sblim-gather/Manifest

@@ -1,2 +1 @@
-DIST sblim-gather-2.2.7.tar.bz2 447200 SHA256 b7e4c02561ac2e12b747a690db230b92576c375eded2ae8d52c286b30edc6c5d SHA512 e56fe74fd2a8ea149471c9011e6e91b00581bb934bb412baf4b2c707d65da3d1a7ce70e776e7e460278d0e36d53efc5a9cb0ed9f9aa3ed3150cdf6e5e4062793 WHIRLPOOL 97b50dbbdfe5fb87d04e108834372653e6307634577fa23399832b5b2dd454d5ea616fd1d9ea9bf9e6091ccf18fa720414c9b8421999a6ab0e6ec044d535e12a
 DIST sblim-gather-2.2.8.tar.bz2 439640 SHA256 3dfebbf4610604fe454eed79c35e7019205cff688c6b5ed25af4d82eb92cb6a3 SHA512 a882f7a0633f42a487cae9fc78656bb0f64581908460e514bd3fdfc0436b8f25f4acc358c395975d16021365f9031b31be79940797739e7780a99ddb3da74a49 WHIRLPOOL adf1ec5c8da43a7d79dd8ad67a075f12861f409c132d81207a4400bbbf422c76b34291fc0dfbf61b724a55b8866b164079a72dc7867fa7765c3c016d901916a2

sys-apps/sblim-gather/sblim-gather-2.2.7.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="SBLIM Performance Data Gatherer"
-HOMEPAGE="http://www.sblim.org"
-SRC_URI="mirror://sourceforge/project/sblim/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+base libvirt +provider"
-
-CDEPEND="
-	dev-libs/sblim-cmpi-devel
-	sys-apps/sblim-cmpi-base
-	libvirt? ( app-emulation/libvirt )
-	"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-text/xmlto"
-
-src_configure() {
-
-	local myeconfargs=(
-		$(use_enable libvirt virt)
-		$(use_enable base)
-		$(use_enable provider)
-		)
-	autotools-utils_src_configure
-}

sys-apps/wsmancli/wsmancli-2.3.0.ebuild

@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Opensource Implementation of WS-Management - Command line utility"
 HOMEPAGE="http://sourceforge.net/projects/openwsman/"
@@ -23,11 +23,17 @@ RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 	test? ( dev-util/cunit )
 	"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with test)
 		$(use_with examples)
 		)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 # TODO patch vconfigure option to work exmaples=yes

x11-misc/kbdd/kbdd-9999.ebuild

@@ -1,12 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit git-2 autotools
+inherit git-r3 autotools
 
 DESCRIPTION="Very simple layout switcher"
-HOMEPAGE="http://github.com/qnikst/kbdd"
+HOMEPAGE="https://github.com/qnikst/kbdd"
 SRC_URI=""
 
 EGIT_REPO_URI="git://github.com/qnikst/kbdd.git