Fix all repoman warnings and errors, bug 439448.

(Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

4 files changed, 180 insertions, 158 deletions

diff --git a/app-editors/sxemacs/ChangeLog b/app-editors/sxemacs/ChangeLog
index 2c59d9e..38ac430 100644
--- a/app-editors/sxemacs/ChangeLog
+++ b/app-editors/sxemacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Oct 2012; Hans de Graaff <graaff@gentoo.org> sxemacs-22.1.15.ebuild,
+  metadata.xml:
+  Fix all repoman warnings and errors, bug 439448.
+
 *sxemacs-22.1.15 (23 Jul 2012)
 
   23 Jul 2012; Hans de Graaff <graaff@gentoo.org> +sxemacs-22.1.15.ebuild:
diff --git a/app-editors/sxemacs/Manifest b/app-editors/sxemacs/Manifest
index 28a7293..44acc3c 100644
--- a/app-editors/sxemacs/Manifest
+++ b/app-editors/sxemacs/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
-DIST sxemacs-22.1.15.tar.xz 6964448 RMD160 df3d931766f482caff7243dabfa790a854417e51 SHA1 d7a4469be01e83b2468d03f45a1d81bbb212a7e6 SHA256 3303817fdf27518f11671c016420156f6702a9a9f895e1099b3e70127ad5eabe
-EBUILD sxemacs-22.1.15.ebuild 10636 RMD160 06342f01d319d41f2b0e3ae043acd9c9da1ec28f SHA1 c8d560c4b256b2a7c815e70d69f172bc45983eb5 SHA256 04cb00b58b26e287be96b0ed884f8f33f2714ea233c68b97fdf450a3c5d20102
-MISC ChangeLog 1022 RMD160 7978e2047a846e7475647a7235391606f1509568 SHA1 408474ceff2a04f15932e5005aebc79171ee9e31 SHA256 05a0b398d86c2aafbd30c7a8f0d91aef1b35d310d487c96f7005c5ba06e58a12
-MISC metadata.xml 365 RMD160 596ab334c06c2d7c1bc8b4ba6d24d29562c82d75 SHA1 f9bf09365f9739065d4b4f52b7af47638f16277d SHA256 da449e36c4d0339e88247a8fb361c3793188d2e6f817861f74d5d64b3a61353b
+DIST NeXT_XEmacs.tar.gz 39571 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 WHIRLPOOL d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
+DIST sxemacs-22.1.15.tar.xz 6964448 SHA256 3303817fdf27518f11671c016420156f6702a9a9f895e1099b3e70127ad5eabe
+EBUILD sxemacs-22.1.15.ebuild 10257 SHA256 494ec04b9c666e5bf3ef1742486333c9f7cb340957b44c1650279984919c088c SHA512 9f6be3d7947e9f7fbbe8c1a737989b3d36b043a36ad425cf26881021e46c4ec40acd951270f585ec1398404058dbb4eed89be2fed557a57412b9e44d6f44d75a WHIRLPOOL f46914d24e4c9c248cb77a8bee5ec47d6ba14d1d252867d275cff916edef279ebddca08d6d400abc3b6306b1e97759cd83797fc02bed3907bd71bce25664d25e
+MISC ChangeLog 1164 SHA256 e273755dec0903da8a4a7af94b0fffb3cb61f03ec4bd5d23f99d20f1da532762 SHA512 6d68dab2d80dfeacbdbbf3fc2d62c23441e49e4e591062e6df4f6b68881ec44b8e842ad3d59091e795a78e3121cc3dbaac9074222394043374c7760d4e46b62d WHIRLPOOL bd691b8ff1a7414c73654e5048182978836b72dad5a45cdbef25c732ddec57e552404f7e96fe13147bc95afbca7cce1a474aab75b416d3feebb1a4aac0c84269
+MISC metadata.xml 1008 SHA256 49e5f47d6a2c76151ffe3c86eea292a8309623d9750aeb63800158ea0ac78e23 SHA512 ee276fc7f01a9c55efd83bf0a1c506be075d43d693ba9ab93fa5ee3e4229011269418efd8b5af6c799911fd56bb56dc1385f4c7d2197b046977dbfadda781008 WHIRLPOOL a0439214e1c1e6a87b2816ba4fb59bb6a4e7f73f9dac54973e80325b060c53e855b6cc74784a8426a5986d9d8bbba53819cd78d62de4ec46fad4ca3ffae9160c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlANisYACgkQiIP6VqMIqNc3JwEAkJMBfpZW6XFpYe0NUI03U8xL
-tSdpPERk+O3mlPtwDuUA/iBzG57q4gg9DFz/ksuWhvU2mTha36c+9IfDbji/L9UX
-=Tlz4
+iF4EAREIAAYFAlCHryoACgkQiIP6VqMIqNeZ0AD8Cd7bX9Y8pHnw98GxKgp7Y/5c
+QDWJ+4bF42xvZwzz5UQA/1dCsSU+A6BDDgdLZxpv2l54lRoIiOB6Y4s90I89EUgj
+=i9qJ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/sxemacs/metadata.xml b/app-editors/sxemacs/metadata.xml
index b334fbe..e041910 100644
--- a/app-editors/sxemacs/metadata.xml
+++ b/app-editors/sxemacs/metadata.xml
@@ -7,4 +7,20 @@
         </maintainer>
         <herd>xemacs</herd>
         <longdescription></longdescription>
+        <use>
+          <flag name='bdwgc'>?</flag>
+          <flag name='tls'>?</flag>
+          <flag name='pop'>?</flag>
+          <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
+          <flag name='postgresql'>?</flag>
+          <flag name='mpfr'>?</flag>
+          <flag name='magic'>?</flag>
+          <flag name='athena'>Enable the MIT Athena widget set
+          (<pkg>x11-libs/libXaw</pkg>)</flag>
+          <flag name='xim'>?</flag>
+          <flag name='tty'>?</flag>
+          <flag name='socks'>?</flag>
+          <flag name='omgoptimize'>?</flag>
+          <flag name='warnfull'>?</flag>
+        </use>
 </pkgmetadata>
diff --git a/app-editors/sxemacs/sxemacs-22.1.15.ebuild b/app-editors/sxemacs/sxemacs-22.1.15.ebuild
index 10d486a..b1597cb 100644
--- a/app-editors/sxemacs/sxemacs-22.1.15.ebuild
+++ b/app-editors/sxemacs/sxemacs-22.1.15.ebuild
@@ -1,4 +1,6 @@
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header:  $
 
 # Note: Although this ebuild has the approval of the SXEmacs Project,
 # it is not an official subset of the project and thus only limited
@@ -8,7 +10,7 @@ EAPI="4"
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="A text editing and development environment based on XEmacs that aims to be second to none in stability, features, and innovation."
+DESCRIPTION="Text editing and development environment based on XEmacs aimed at stability, features, innovation"
 HOMEPAGE="http://www.sxemacs.org/"
 SRC_URI="http://downloads.sxemacs.org/releases/${P}.tar.xz
 	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
@@ -18,9 +20,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="X alsa jack pulseaudio oss nas ao gif png jpeg xface tiff ffmpeg mad bdwgc \
-      sndfile sox ssl tls ipv6 pop kerberos hesiod postgresql libffi gmp mpfr magic xpm \
-      athena neXt motif xim canna freewnn gdbm berkdb tty gpm ncurses mule socks \
-      omgoptimize warnfull"
+	  sndfile sox ssl tls ipv6 pop kerberos hesiod postgresql libffi gmp mpfr magic xpm \
+	  athena neXt motif xim canna freewnn gdbm berkdb tty gpm ncurses mule socks \
+	  omgoptimize warnfull"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -116,9 +118,9 @@ src_configure() {
 	# the optimisation level.
 	# Also work around hardened compiler bugs.
 	if use omgoptimize ; then
-	    echo ""
+		echo ""
 	else
-	    replace-flags -O* -O2
+		replace-flags -O* -O2
 	fi
 	filter-flags -fomit-frame-pointer -fPIE
 	is-flag -nopie && append-flags -nopie
@@ -128,40 +130,40 @@ src_configure() {
 	#################
 	local myconf=""
 
-	    #######################
-	    # Configuration for X #
-	    #######################
-	    if use X ; then
+		#######################
+		# Configuration for X #
+		#######################
+		if use X ; then
 		myconf="${myconf} --with-widgets=athena"
 		myconf="${myconf} --with-dialogs=athena"
 		myconf="${myconf} --with-menubars=lucid"
 		myconf="${myconf} --with-scrollbars=lucid"
-	    if use motif ; then
+		if use motif ; then
 		myconf="--with-widgets=motif"
 		myconf="${myconf} --with-dialogs=motif"
 		myconf="${myconf} --with-scrollbars=motif"
 		myconf="${myconf} --with-menubars=lucid"
-	    fi
-	    if use athena ; then
+		fi
+		if use athena ; then
 		myconf="--with-scrollbars=athena"
-	    fi
-	    if use neXt ; then
+		fi
+		if use neXt ; then
 		myconf="${myconf} --with-athena=next"
-	    else
+		else
 		myconf="${myconf} --with-athena=xaw"
-	    fi
+		fi
 
-	    else
+		else
 		myconf="${myconf} --without-x"
-	    fi
-
-	    #########################
-	    # Configuration for TTY #
-	    #########################
-	    local ttyconf=""
-	    if use tty ; then
-	    ttyconf="${ttyconf} --with-tty"
-	    if use tty ; then
+		fi
+
+		#########################
+		# Configuration for TTY #
+		#########################
+		local ttyconf=""
+		if use tty ; then
+		ttyconf="${ttyconf} --with-tty"
+		if use tty ; then
 		if use ncurses ; then
 			ttyconf="${ttyconf} --with-ncurses"
 		else
@@ -172,138 +174,138 @@ src_configure() {
 		else
 			ttyconf="${ttyconf} --without-gpm"
 		fi
-	    fi
-	    else
+		fi
+		else
 		ttyconf="${ttyconf} --without-tty"
-	    fi
-	    myconf="${myconf} ${ttyconf}"
-
-	    ######################
-	    # MULE Configuration #
-	    ######################
-	    if use mule ; then
-	    myconf="${myconf} --with-mule"
-	    if use xim ; then
+		fi
+		myconf="${myconf} ${ttyconf}"
+
+		######################
+		# MULE Configuration #
+		######################
+		if use mule ; then
+		myconf="${myconf} --with-mule"
+		if use xim ; then
 		if use motif ; then
 			myconf="${myconf} --with-xim=motif"
 		else
 			myconf="${myconf} --with-xim=xlib"
 		fi
-	    else
+		else
 		myconf="${myconf} --with-xim=no"
-	    fi
+		fi
 		use canna && myconf="${myconf} --with-canna"
 		use freewnn && myconf="${myconf} --with-wnn"
-	    else
+		else
 		myconf="${myconf} --without-mule"
-	    fi
-
-	    #######################
-	    # Sound Configuration #
-	    #######################
-	    local soundconf="none"
-	    # Define what sound outputs we use
-	    use alsa && soundconf="${soundconf},alsa"
-	    use jack && soundconf="${soundconf},jack"
-	    use oss && soundconf="${soundconf},oss"
-	    use nas && soundconf="${soundconf},nas"
-	    use arts && soundconf="${soundconf},arts"
-	    use ao && soundconf="${soundconf},ao"
-	    use esd && soundconf="${soundconf},esd"
-	    # And make them work
-	    myconf="${myconf} --with-sound=${soundconf}"
-	    use pulseaudio && myconf="${myconf} --with-pulseaudio"
-
-	    ########################
-	    # Images Configuration #
-	    ########################
-	    local imageconf="none"
-	    # Define Image Types to support
-	    use gif && imageconf="${imageconf},gif"
-	    use png && imageconf="${imageconf},png"
-	    use jpeg && imageconf="${imageconf},jpeg"
-	    use xface && imageconf="${imageconf},xface"
-	    use tiff && imageconf="${imageconf},tiff"
-	    use xpm && imageconf="${imageconf},xpm"
-	    # And make them work
-	    myconf="${myconf} --with-image=${imageconf}"
-	    # Note - If FFI useflag is set, and ImageMagick is installed, SXEmacs
-	    # will make use of libWand and can thus display many more types of
-	    # image.
-
-	    ##########################
-	    # Database Configuration #
-	    ##########################
-	    local mydb="none"
-	    use gdbm && mydb="${mydb},gdbm"
-	    use berkdb && mydb="${mydb},berkdb"
-	    myconf="${myconf} --with-database=${mydb}"
-	    # and add support for postgre here
-	    use postgresql && myconf="${myconf} --with-postgresql" || myconf="${myconf} --without-postgresql"
-
-	    #######################
-	    # Media Configuration #
-	    #######################
-	    local mediaconf="none,internal"
-	    # Define Media Types to support
-	    use ffmpeg && mediaconf="${mediaconf},ffmpeg"
-	    use mad && mediaconf="${mediaconf},mad"
-	    use sndfile && mediaconf="${mediaconf},sndfile"
-	    use magic && mediaconf="${mediaconf},magic"
-	    use sox && mediaconf="${mediaconf},sox"
-	    # And make them work
-	    myconf="${myconf} --with-media=${mediaconf}"
-
-	    ########################
-	    # Cryptography Options #
-	    ########################
-	    local crypto=""
-	    use ssl && crypto="${crypto} --with-openssl"
-	    use tls && crypto="${crypto} --with-gnutls"
-	    myconf="${myconf} ${crypto}"
-
-	    ############################
-	    # Networking Configuration #
-	    ############################
-	    local netconf=""
-	    use pop && netconf="${netconf} --with-pop" || netconf="${netconf} --without-pop"
-	    use kerberos && netconf="${netconf} --with-kerberos" || netconf="${netconf} --without-kerberos"
-	    use hesiod && netconf="${netconf} --with-hesiod"
-	    use socks && netconf="${netconf} --with-socks"
-	    myconf="${myconf} ${netconf}"
-
-	    #######
-	    # FFI #
-	    #######
-	    use libffi && myconf="${myconf} --with-ffi"
-
-	    #########################################
-	    # Boehm-Demers-Weiser Garbage Collector #
-	    #########################################
-	    use bdwgc && myconf="${myconf} --with-experimental-features=all"
-
-	    ############################
-	    # Aggressive Optimisations #
-	    ############################
-	    use omgoptimize && myconf="${myconf} --with-ridiculously-aggressive-optimisations"
-
-	    ##########################
-	    # Maximum Warning Output #
-	    ##########################
-	    use warnfull && myconf="${myconf} --with-maximum-warning-output"
-
-	    ####################
-	    # Neat Math Tricks #
-	    ####################
-	    # I'm going to let SXEmacs do the deciding here.
-	    # The useflags will simply be for dependencies.
-	    myconf="${myconf} --with-ent=all --with-ase=all"
-
-	    ##################
-	    # Module Support #
-	    ##################
-	    myconf="${myconf} --with-module-support"
-	    myconf="${myconf} --with-modules=all"
+		fi
+
+		#######################
+		# Sound Configuration #
+		#######################
+		local soundconf="none"
+		# Define what sound outputs we use
+		use alsa && soundconf="${soundconf},alsa"
+		use jack && soundconf="${soundconf},jack"
+		use oss && soundconf="${soundconf},oss"
+		use nas && soundconf="${soundconf},nas"
+		use arts && soundconf="${soundconf},arts"
+		use ao && soundconf="${soundconf},ao"
+		use esd && soundconf="${soundconf},esd"
+		# And make them work
+		myconf="${myconf} --with-sound=${soundconf}"
+		use pulseaudio && myconf="${myconf} --with-pulseaudio"
+
+		########################
+		# Images Configuration #
+		########################
+		local imageconf="none"
+		# Define Image Types to support
+		use gif && imageconf="${imageconf},gif"
+		use png && imageconf="${imageconf},png"
+		use jpeg && imageconf="${imageconf},jpeg"
+		use xface && imageconf="${imageconf},xface"
+		use tiff && imageconf="${imageconf},tiff"
+		use xpm && imageconf="${imageconf},xpm"
+		# And make them work
+		myconf="${myconf} --with-image=${imageconf}"
+		# Note - If FFI useflag is set, and ImageMagick is installed, SXEmacs
+		# will make use of libWand and can thus display many more types of
+		# image.
+
+		##########################
+		# Database Configuration #
+		##########################
+		local mydb="none"
+		use gdbm && mydb="${mydb},gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+		myconf="${myconf} --with-database=${mydb}"
+		# and add support for postgre here
+		use postgresql && myconf="${myconf} --with-postgresql" || myconf="${myconf} --without-postgresql"
+
+		#######################
+		# Media Configuration #
+		#######################
+		local mediaconf="none,internal"
+		# Define Media Types to support
+		use ffmpeg && mediaconf="${mediaconf},ffmpeg"
+		use mad && mediaconf="${mediaconf},mad"
+		use sndfile && mediaconf="${mediaconf},sndfile"
+		use magic && mediaconf="${mediaconf},magic"
+		use sox && mediaconf="${mediaconf},sox"
+		# And make them work
+		myconf="${myconf} --with-media=${mediaconf}"
+
+		########################
+		# Cryptography Options #
+		########################
+		local crypto=""
+		use ssl && crypto="${crypto} --with-openssl"
+		use tls && crypto="${crypto} --with-gnutls"
+		myconf="${myconf} ${crypto}"
+
+		############################
+		# Networking Configuration #
+		############################
+		local netconf=""
+		use pop && netconf="${netconf} --with-pop" || netconf="${netconf} --without-pop"
+		use kerberos && netconf="${netconf} --with-kerberos" || netconf="${netconf} --without-kerberos"
+		use hesiod && netconf="${netconf} --with-hesiod"
+		use socks && netconf="${netconf} --with-socks"
+		myconf="${myconf} ${netconf}"
+
+		#######
+		# FFI #
+		#######
+		use libffi && myconf="${myconf} --with-ffi"
+
+		#########################################
+		# Boehm-Demers-Weiser Garbage Collector #
+		#########################################
+		use bdwgc && myconf="${myconf} --with-experimental-features=all"
+
+		############################
+		# Aggressive Optimisations #
+		############################
+		use omgoptimize && myconf="${myconf} --with-ridiculously-aggressive-optimisations"
+
+		##########################
+		# Maximum Warning Output #
+		##########################
+		use warnfull && myconf="${myconf} --with-maximum-warning-output"
+
+		####################
+		# Neat Math Tricks #
+		####################
+		# I'm going to let SXEmacs do the deciding here.
+		# The useflags will simply be for dependencies.
+		myconf="${myconf} --with-ent=all --with-ase=all"
+
+		##################
+		# Module Support #
+		##################
+		myconf="${myconf} --with-module-support"
+		myconf="${myconf} --with-modules=all"
 
 	########################
 	# End of Configuration #
@@ -356,4 +358,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	eselect emacs update --if-unset
-}
\ No newline at end of file
+}