Sync with portage [Sun Jun 8 16:29:28 MSK 2014].

app-accessibility/brltty/brltty-5.0-r3.ebuild

@@ -0,0 +1,184 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r3.ebuild,v 1.1 2014/06/06 10:42:40 teiresias Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="http://mielke.cc/brltty/"
+SRC_URI="http://mielke.cc/brltty/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+		java +midi ncurses nls ocaml +pcm python usb +speech
+		tcl X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api )
+	tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	python? ( ${PYTHON_DEPS} )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	tcl? ( >=dev-lang/tcl-8.4.15 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/libXaw )"
+DEPEND="virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+	${COMMON_DEP}"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-ldflags.patch \
+		"${FILESDIR}"/${P}-udev.patch \
+		"${FILESDIR}"/${P}-respect-AR.patch
+
+	java-pkg-opt-2_src_prepare
+
+	# The code runs `pkg-config` directly instead of locating a suitable
+	# pkg-config wrapper (or respecting $PKG_CONFIG).
+	sed -i \
+		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+		aclocal.m4 configure.ac || die
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+	# override prefix in order to install into /
+	# braille terminal needs to be available as soon in the boot process as
+	# possible
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--prefix=/
+		--localedir=/usr/share/locale
+		--includedir=/usr/include
+		--localstatedir=/var
+		--disable-stripping
+		--with-install-root="${D}"
+		--with-writable-directory="/run/brltty"
+		$(use_enable api)
+		$(use_with beeper beep-package)
+		$(use_enable contracted-braille)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable speech speech-support)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package) )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		myconf+=( $(use_enable python python-bindings ) )
+
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	local JAVAC_CONF=""
+	local OUR_JNI_FLAGS=""
+	if use java; then
+		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+				emake
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+				emake install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		# make install puts the _java.so there, and no it's not $(get_libdir)
+		rm -rf "${D}/usr/lib/java"
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	udev_newrules Autostart/Udev/udev.rules 70-brltty.rules
+	newinitd "${FILESDIR}"/brltty.rc brltty
+	systemd_dounit Autostart/Systemd/brltty.service
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	libdir="$(get_libdir)"
+	mkdir -p "${D}"/usr/${libdir}/
+	mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/
+	gen_usr_ldscript libbrlapi.so
+
+	cd Documents
+	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt
+	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt
+	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt
+	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
+	dohtml -r Manual-BRLTTY
+	if use doc; then
+		dohtml -r Manual-BrlAPI
+		dodoc BrlAPI-*.txt
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog please be sure "${ROOT}"etc/brltty.conf is correct for your system.
+	elog
+	elog To make brltty start on boot, type this command as root:
+	elog
+	elog rc-update add brltty boot
+}

app-accessibility/speechd-el/speechd-el-2.5.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.5.ebuild,v 1.4 2013/09/25 17:29:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.5.ebuild,v 1.5 2014/06/07 11:57:06 ulm Exp $
 
 EAPI="4"
-NEED_EMACS=23
+
 inherit elisp
 
 DESCRIPTION="Emacs speech support"

app-admin/eselect-emacs/eselect-emacs-1.16.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/eselect-emacs-1.16.ebuild,v 1.4 2014/05/16 06:40:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/eselect-emacs-1.16.ebuild,v 1.9 2014/06/08 10:51:05 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-admin/eselect-ctags-${PV}"

app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild,v 1.11 2012/04/26 16:43:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild,v 1.12 2014/06/06 06:03:22 vapier Exp $
 
 EAPI="3"
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/vi.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"

app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild,v 1.1 2014/04/10 12:27:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild,v 1.2 2014/06/07 16:39:02 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="caja nfs policykit samba"
 

app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch

@@ -1,20 +1,7 @@
- ngxtop/config_parser.py | 4 ++--
- ngxtop/ngxtop.py        | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
 diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py
-index b8e4804..40b23c9 100644
+index f6999cf..7c0d79a 100644
 --- a/ngxtop/config_parser.py
 +++ b/ngxtop/config_parser.py
-@@ -8,7 +8,7 @@ import subprocess
- from pyparsing import Literal, Word, ZeroOrMore, OneOrMore, Group, \
-     printables, quotedString, pythonStyleComment, removeQuotes
- 
--from utils import choose_one, error_exit
-+from .utils import choose_one, error_exit
- 
- 
- REGEX_SPECIAL_CHARS = r'([\.\*\+\?\|\(\)\{\}\[\]])'
 @@ -106,7 +106,7 @@ def detect_log_config(arguments):
  
      log_formats = dict(get_log_formats(config_str))
@@ -24,18 +11,35 @@ index b8e4804..40b23c9 100644
          if format_name == 'combined':
              return log_path, LOG_FORMAT_COMBINED
          if format_name not in log_formats:
-diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
-index afb5bc3..8667b8b 100755
---- a/ngxtop/ngxtop.py
-+++ b/ngxtop/ngxtop.py
-@@ -74,8 +74,8 @@ except ImportError:
- from docopt import docopt
- import tabulate
- 
--from config_parser import detect_log_config, detect_config_path, extract_variables, build_pattern
--from utils import error_exit
-+from .config_parser import detect_log_config, detect_config_path, extract_variables, build_pattern
-+from .utils import error_exit
+@@ -115,7 +115,7 @@ def detect_log_config(arguments):
  
+     # multiple access logs configured, offer to select one
+     print('Multiple access logs detected in configuration:')
+-    log_path = choose_one(access_logs.keys(), 'Select access log file to process: ')
++    log_path = choose_one(list(access_logs.keys()), 'Select access log file to process: ')
+     format_name = access_logs[log_path]
+     if format_name not in log_formats:
+         error_exit('Incorrect format name set in config for access log file "%s"' % log_path)
+diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
+old mode 100755
+new mode 100644
+diff --git a/ngxtop/utils.py b/ngxtop/utils.py
+index ef61072..7bd9a2a 100644
+--- a/ngxtop/utils.py
++++ b/ngxtop/utils.py
+@@ -5,6 +5,8 @@ def choose_one(choices, prompt):
+     for idx, choice in enumerate(choices):
+         print('%d. %s' % (idx + 1, choice))
+     selected = None
++    if sys.version[0] == '3':
++        raw_input = input
+     while not selected or selected <= 0 or selected > len(choices):
+         selected = raw_input(prompt)
+         try:
+@@ -16,4 +18,4 @@ def choose_one(choices, prompt):
  
- DEFAULT_QUERIES = [
+ def error_exit(msg, status=1):
+     sys.stderr.write('Error: %s\n' % msg)
+-    sys.exit(status)
+\ No newline at end of file
++    sys.exit(status)

app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild,v 1.3 2014/06/05 06:40:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild,v 1.4 2014/06/07 20:33:40 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1

app-admin/perl-cleaner/Manifest

@@ -1,4 +1,3 @@
-DIST perl-cleaner-2.10.tar.bz2 6019 SHA256 9ec6285274498a8b085f84828511fe4ad51fd7cb9843c66819fcd5d993cfeaaf SHA512 89b617e9544ad925d8da6d2f17936e4752a2bdd872f76915d9936191aa9321d2e04e539eebbf5c0262a19c97731e06270992fa10852b47a8e2cd5256db2178b3 WHIRLPOOL 8bbe6ff67392a2735b2fdffaadd9402e2393392560437274915369bbf28d6c790bd66659e89de31a2226749a4062fe3f8baf9793993111da35d6ee3327ccd8e7
 DIST perl-cleaner-2.12.tar.bz2 6019 SHA256 e2a65d0223c91d82cb199340f8e955d57c5c6c8715a66d58a284b2ab755b981f SHA512 2d41f8f39be674b563e5e1d0ec43b62b58e77a7ae1fa8765b8bc0a4b36f9cdb1afa5e286f880a621457b6743c953a4eac35dfd4d89526dd738292a6b2c091f5b WHIRLPOOL 31b8e77cbabe796dbd809638b1fbe8422fda7ddce538eb564430d82937bf4f13fb94dfcd376ccdab482860c7cad4d83e110e78af4d76135fd3fed6d9c1f79fa5
+DIST perl-cleaner-2.13.tar.bz2 6038 SHA256 6b76a7e81fe1f1f6bf29b6205dd1d013727e3659b93b7c48b3d218d26292dde6 SHA512 f08bfeacf21cf04efc351b2bf6ff21cc010f5d22e4625e9e6cb658acc1e7711a2c0ad653ccfbcdc0a471027ca0d78bec7f118417691fc29961ce1c9437b452fd WHIRLPOOL 5a32753e7ab88dda5f13ccbb65a3429f37e3080a3a20844c279bfbf307a13210dbcd5fac245453efc9e259f041435232ac49c8b9d6088d5f832ad52979d62161
 DIST perl-cleaner-2.7.tar.bz2 5926 SHA256 94fbda18fa9549d4fc7bb2a523d2e2b3f2c0604377a1bd4767f9aaaf58853a5a SHA512 0020c5a2a7ccb78708b82b00a7de208b2f8cb2538b9945a87a65f6de154bfd7c7074eab6fc6f7b240ea689b84d943e34c56c06fed6cf0dd5f88007fb8f3737e5 WHIRLPOOL 33ff145fc1a7f4bbe32ac9846590aed88b672f5d0aba82365b0b9c2d89ec309b9fdef0a88e57f97cb19747c31e71314578f700e94217743664209b6afb6b0de7
-DIST perl-cleaner-2.8.tar.bz2 5950 SHA256 89f4a6ac6cff71d1545399a9a281a1cabc45ea9adc8553941b2951f4e9c360e5 SHA512 2135b0b354af652228c2e67141600a347d0a58ff7c163f035bceadbaf7048020dbe8dfd03380fd0dc8e2bd0167e15555c78e951546ebbfed791b8a3730a38ee3 WHIRLPOOL de2e0b001843e41238e8dd96cd8b541c2e201f9493a90fdf69129f89b05ef4b89dd9a8f8ca858e31496b9e2a6235a0716125c6cc1e052a2478e61d22fd3a6535

app-admin/perl-cleaner/perl-cleaner-2.13.ebuild

@@ -1,23 +1,23 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild,v 1.5 2014/01/19 02:09:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.13.ebuild,v 1.1 2014/06/06 19:59:32 dilfridge Exp $
+
+EAPI=5
 
 DESCRIPTION="User land tool for cleaning up old perl installs"
 HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~tove/files/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
+RDEPEND="app-shells/bash
 	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
 	dev-lang/perl"
 
 src_install() {
-	dosbin perl-cleaner || die
-	doman perl-cleaner.1 || die
+	dosbin perl-cleaner
+	doman perl-cleaner.1
 }

app-admin/perl-cleaner/perl-cleaner-2.8.ebuild

@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.8.ebuild,v 1.2 2014/01/19 02:09:59 vapier Exp $
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~tove/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_install() {
-	dosbin perl-cleaner || die
-	doman perl-cleaner.1 || die
-}

app-admin/perl-cleaner/perl-cleaner-9999.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-9999.ebuild,v 1.1 2014/06/06 20:56:03 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="http://github.com/gentoo-perl/perl-cleaner.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+	dev-lang/perl"
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}

app-admin/syslog-ng/Manifest

@@ -1,2 +1,3 @@
 DIST syslog-ng_3.4.7.tar.gz 3203894 SHA256 7b1114ff0bd9d2c52a8ce407f0f59102ea4123ff7efb3f84253961e0de6ac1b0 SHA512 66c1dafaa9441fd909b450e79ec3d1011bd423301602b0eea372e141ff267ddb60aa0280ef49b1f62d24b3f17fc1909a6ce8cc5bea0e3c6708df64815a534279 WHIRLPOOL b3b9aef566cc4577b4ec6ad96f696e29abd84d663205cadca766a50c933d29e3b195b6679cbb8e0edca96cc6995ab10fe409531eb15c90bfeb82a598ad7cf3fe
+DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
 DIST syslog-ng_3.5.4.1.tar.gz 3034040 SHA256 92c6969e4172b4fd32390f80043b4de7b116f29989d8c2e5a8a687ee6dcd6f66 SHA512 4068b1e1fc6ef52075002c9306885cb3b70d5e681077dd2bff7c5dfd83885f4967c9246692c0e886343269cdd5f02b2416999e5e381a076354da96bc7dc13766 WHIRLPOOL c8f6d3ff7dbd92c17c3f3a76d0acbe23fcfff0d5bb6dc9f2cd5c0bcec402276d5e1d50bb21939dcc89114b6f94aea143b3cf3fc0a7ab2cd3683740c6a3665e07

app-admin/syslog-ng/syslog-ng-3.4.8.ebuild

@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild,v 1.1 2014/06/06 15:20:29 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	smtp? ( net-libs/libesmtp )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-c-0.9 )
+	caps? ( sys-libs/libcap )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+	cd "${TMPDIR}" || die
+
+	for f in *logrotate*.in ; do
+		if use systemd ; then
+			sed \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				$f > ${f/.in/} || die
+		else
+			sed \
+				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+				$f > ${f/.in/} || die
+		fi
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pcre) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${TMPDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}

app-admin/webmin/Manifest

@@ -1,2 +1,2 @@
-DIST webmin-1.680-minimal.tar.gz 2593231 SHA256 8152e56f9f880b1f719134a877b2bb2b022fccdd59a875aefbf6f24b0cb37230 SHA512 742238771bcff5342b2c651a015ba234d66035fdbab900963a9cf0832aa13ea299d565a6467a737e59b6b69b8a6a50fa8a5545f6cb615b0fcdcf0b2942eb5213 WHIRLPOOL 40d86669721e274cba6b80b70b1382c5c977abef23cfabb1005140910c8d982c6f00425cf9e9309452286ec74da40f16cefede8694930f24096449e4fea1e344
-DIST webmin-1.680.tar.gz 22418010 SHA256 c6205b6a9dfa1aa7179591bb9a82a9f321e775ed08710da8877d01c5bf9b8078 SHA512 591ac89192c020a443af318a30664310d36d0b9880cd91ff5179bdb17fc01773abf3ae67a016e922fd4d319d311d16f9c9f79a9d07bd94018a38b0127549bc69 WHIRLPOOL 21729591197f971244f99a281da4a3f8af7c17673c1fd124cb9de2de28fd3e0e6688e38f782e735038f5735cbeac551ebab5eb7a417d7adc899794944490a54b
+DIST webmin-1.690-minimal.tar.gz 2594677 SHA256 e5644dc06947e201eba8570dbed72feb10442876dc1d3d1297d9698b0e042950 SHA512 8f223f20fc6b171f32c9c2def92eaad2d10f68e18328e9dbbca0b6c84560550b9f353aff0968ea77407cde5172249859d82d406e6c2acdf3e8df1e9347bcc409 WHIRLPOOL 2184c301a487130744265a95e55c29b9d97c2ae6906277c644917b9e7e50c414a7fc7e7040645f9041813cf2c223eacdd5f064e1cfc7f5431d9aa53ced198902
+DIST webmin-1.690.tar.gz 22486046 SHA256 f22642b4c8a4467a2ef1011ec674bf45b5f6a8e2bd8be42e3e24338a98e00757 SHA512 f46a286389a133abbf2adbd730e42b38f50c4de54caad8678e13bd396d34ca4064186e5033a2a840d31c764adefacc0735c81454fc00404b0fda3963ed609934 WHIRLPOOL b6e1607bd4de277c7327a7e4b8eeb8084e4cc7261c76e1d03a24dbbcac951f40020e0472957fb5359faf1652b8f355dc5cfccddf7842b8017ac6e7dc68a0a469

app-admin/webmin/files/gentoo-setup

@@ -1,7 +1,7 @@
 #!/bin/sh
 # gentoo-setup.sh
 #
-# Version 1.1
+# Version 1.2
 #
 # A modified original Webmin setup.sh script to comply with Gentoo specifics
 #
@@ -193,6 +193,7 @@ fi
 
 # Create start, stop, restart and reload Gentoo compliant Webmin scripts
 # We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
+# or systemctl if we run under systemd
 echo "Creating start and stop scripts.."
 rm -f $config_dir/{start,stop,restart,reload}
 
@@ -201,7 +202,11 @@ cat <<END >>"$config_dir/start"
 #!/bin/sh
 
 if [ ! -f "${pidfile}" ]; then
-	rc-service --ifexists -- webmin start
+	if [[ -d /run/systemd/system ]] ; then
+		systemctl start webmin.service
+	else
+		rc-service --ifexists -- webmin start
+	fi	
 fi
 END
 
@@ -209,21 +214,33 @@ END
 cat <<END >>"$config_dir/stop"
 #!/bin/sh
 
-rc-service --ifexists -- webmin --ifstarted stop
+if [[ -d /run/systemd/system ]] ; then
+	systemctl stop webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted stop
+fi
 END
 
 # The restart script in /etc/webmin (Gentoo compliant)
 cat <<END >>"$config_dir/restart"
 #!/bin/sh
 
-rc-service --ifexists -- webmin --ifstarted restart
+if [[ -d /run/systemd/system ]] ; then
+	systemctl try-restart webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted restart
+fi
 END
 
 # The reload script in /etc/webmin (Gentoo compliant)
 cat <<END >>"$config_dir/reload"
 #!/bin/sh
 
-rc-service --ifexists -- webmin --ifstarted reload
+if [[ -d /run/systemd/system ]] ; then
+	systemctl reload-or-try-restart webmin.service
+else
+	rc-service --ifexists -- webmin --ifstarted reload
+fi
 END
 
 chmod 755 $config_dir/{start,stop,restart,reload}

app-admin/webmin/files/init.d.webmin

@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.11 2012/07/09 18:12:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.12 2014/06/07 11:29:32 hwoarang Exp $
 
 
 # We do not give a choice to user for configuring these 'cause it will mess up
@@ -9,6 +9,7 @@
 WEBMIN_EXE="%exe%"
 WEBMIN_PID="%pid%"
 WEBMIN_CONF="%conf%"
+WEBMIN_CONFIG="%config%"
 
 extra_started_commands="reload"
 
@@ -18,8 +19,8 @@ depend() {
 
 checkconfig() {
 	# Check if Webmin setup has been done
-	if [ ! -f /etc/webmin/config ]; then
-		eerror "Error in Webmin's configuration. The '/etc/webmin/config' is not present."
+	if [ ! -f ${WEBMIN_CONFIG} ]; then
+		eerror "Error in Webmin's configuration. The ${WEBMIN_CONFIG} is not present."
 		eerror "Please run 'emerge --config app-admin/webmin' to fix this."
 		return 1
 	fi

app-admin/webmin/files/webmin.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Webmin Administration Tool
+After=network.target remote-fs.target nss-lookup.target
+ConditionFileNotEmpty=%config%
+ConditionFileNotEmpty=%conf%
+
+[Service]
+RemainAfterExit=yes
+KillMode=mixed
+# Webmin is exiting with 1 on SIGTERM
+SuccessExitStatus=1
+ExecStart=%exe% %conf%
+PIDFile=%pid%
+Environment="PERLLIB=%perllib%" LANG= 
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target

app-admin/webmin/webmin-1.690.ebuild

@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.680.ebuild,v 1.1 2014/05/01 16:30:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.690.ebuild,v 1.1 2014/06/07 11:29:32 hwoarang Exp $
 
-EAPI="3"
+EAPI="5"
 
-inherit eutils pam ssl-cert
+inherit eutils pam ssl-cert systemd
 
 DESCRIPTION="A web-based Unix systems administration interface"
 HOMEPAGE="http://www.webmin.com/"
@@ -114,10 +114,22 @@ src_install() {
 		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
 		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
 		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
 		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
 		"${ED}etc/init.d/webmin" \
 		|| die "Failed to patch the webmin init file"
 
+	# Create the systemd service file and put the neccessary variables there
+	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}$(_systemd_get_unitdir)/webmin.service" \
+		|| die "Failed to patch the webmin systemd service file"
+
 	# Setup pam
 	pamd_mimic system-auth webmin auth account session
 
@@ -130,7 +142,11 @@ src_install() {
 pkg_preinst() {
 	# First stop service if running so Webmin to not messup our config
 	ebegin "Stopping any running Webmin instance prior merging"
-	rc-service --ifexists -- webmin --ifstarted stop
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
 	eend $?
 }
 
@@ -147,7 +163,11 @@ pkg_postinst() {
 	ewarn "To avoid problems, please before using any module, look at its configuration options first."
 	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
 	ewarn
-	elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	if systemd_is_booted ; then
+		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+	else
+		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	fi
 	elog "- The default URL to connect to Webmin is: https://localhost:10000"
 	elog "- The default user that can login is: root"
 	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
@@ -156,23 +176,34 @@ pkg_postinst() {
 pkg_prerm() {
 	# First stop service if running - we do not want Webmin to mess up config
 	ebegin "Stopping any running Webmin instance prior unmerging"
-	rc-service --ifexists -- webmin --ifstarted stop
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
 	eend $?
 }
 
 pkg_postrm() {
-	ewarn
-	ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-	ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-	ewarn "To fix this just disable them if you intend to use Webmin again,"
-	ewarn "OR delete them if not."
-	ewarn
+	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		ewarn
+		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+		ewarn "To fix this just disable them if you intend to use Webmin again,"
+		ewarn "OR delete them if not."
+		ewarn
+	fi
 }
 
 pkg_config(){
 	# First stop service if running
 	ebegin "Stopping any running Webmin instance"
-	rc-service --ifexists -- webmin --ifstarted stop
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
 	eend $?
 
 	# Next set the default reset variable to 'none'

app-arch/dpkg/Manifest

@@ -1 +1 @@
-DIST dpkg_1.17.9.tar.xz 4051292 SHA256 da58389a80a3515ea12aaf10c9e48f84ee6c08d2fe2c9e1450f4df49ffeeb6aa SHA512 6d0f463f8102bf77ea93b34fc80c073e1dfef980ba1afbecdfa0d1098945afdda2f59c11e87be7ea1410eee909ee3ebd0df47066eb54de27e3c49725fddc2bc3 WHIRLPOOL 041ee2738acf498c604d9d2f02d4aacbbdc83f61ce09dfc1df63c4566c0f14c93280fe01ed47ab1236c4cf97e17b49c1ffebc10324370cdd970f8aec6230161a
+DIST dpkg_1.17.10.tar.xz 4198340 SHA256 a3a6d4da2b99484c04b2aa8af83d59d87a988baea627d276308467b22310b4d9 SHA512 db4fdd08cf00eeb611759c02eb70285f36d8fadb7d9d5b35123c02181889319ae46e8ec0d051b64f0d5e7ea3c20da63ba7b9015a9aecdba9b2cb3e20f2e87ecd WHIRLPOOL 15be369b0e10bd8f18ad212d03f614feccf612a125227644d39611beac78b0e42971399b1def825ce9c336aa32c07a8740e7180954879bef7940b641ff02169f

app-arch/dpkg/dpkg-1.17.10.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.9.ebuild,v 1.10 2014/05/25 18:49:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.10.ebuild,v 1.10 2014/06/08 10:55:25 ago Exp $
 
 EAPI=5
 inherit eutils multilib autotools toolchain-funcs
@@ -52,12 +52,6 @@ src_prepare() {
 	# installed, so no need to worry about hardcoding a temporary bash)
 	sed -i -e '1c\#!'"${BASH}" get-version || die
 
-	# this test depends on a Debian only gzip extension that adds --rsyncable
-	# which will therefore always fail on Gentoo. (bug #310847).
-	sed -i scripts/Makefile.am \
-		-e '/850_Dpkg_Compression.t/d' \
-		|| die "sed failed"
-
 	# test fails (bug #414095)
 	sed -i utils/Makefile.am \
 		-e '/^test_cases/d;/100_update_alternatives/d' || die

app-arch/engrampa/engrampa-1.8.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.1 2014/04/27 15:49:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.0.ebuild,v 1.2 2014/06/07 16:39:05 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="caja"
 

app-arch/lz4/lz4-0_p106-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.11 2014/05/28 12:58:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.12 2014/06/08 10:41:15 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then
 	ESVN_PROJECT="lz4-read-only"
 else
 	SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm hppa ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"

app-arch/tardy/tardy-1.28.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.28.ebuild,v 1.4 2014/03/14 23:29:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.28.ebuild,v 1.5 2014/06/08 11:03:30 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tardy/${P}.D001.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="app-arch/bzip2
 	app-arch/xz-utils

app-crypt/tc-play/Manifest

@@ -1 +1,2 @@
 DIST tc-play-1.1.tar.gz 1011669 SHA256 62346e852c6f781fffebf5c43e5967ceb0e36304626aa27e77c77378f8215d84 SHA512 9401e094d207cdc81fca6451c82de6bf8e1d8a4fc9bc330183cace2000bb82e81f04ca33a6bfdbe4b8ac3f09489e408b37255f2ed7701c21f62a59f4ee92b6c9 WHIRLPOOL 06c5eb3551e1dcc100d55043bec4952d06783799e7ed916487032a7e32a74f3eea317dadc3cc60e1ae9eb0654779058503f288ee791776a997669a91d0da7653
+DIST tc-play-2.0.tar.gz 1015525 SHA256 0e17890f37e862746364b10bad62bbd9f3e2b2811a24b07df12eff266534e42d SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7 WHIRLPOOL 0fc8273debd60f421eecced41ba43bd5fc36c6fd09f48f365755bfe844bf3a425be79ca36ffe3011a01d70b9911da0cfcb0e21571b3af97ec9f8d84af3440806

app-crypt/tc-play/tc-play-2.0.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tc-play/tc-play-2.0.ebuild,v 1.1 2014/06/07 17:07:32 alonbl Exp $
+
+EAPI=5
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="a free, pretty much fully featured and stable TrueCrypt implementation"
+HOMEPAGE="https://github.com/bwalex/tc-play"
+SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openssl"
+
+DEPEND="dev-libs/libgpg-error
+	sys-fs/lvm2
+	sys-apps/util-linux
+	dev-libs/libgcrypt:0
+	openssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local backend="gcrypt"
+	use openssl && backend="openssl"
+
+	EXTRA_MAKE_FLAGS=(
+		PBKDF_BACKEND="${backend}"
+		WARNFLAGS=""
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		PREFIX=/usr \
+		LIBDIR=/usr/$(get_libdir)
+	)
+}
+
+src_compile() {
+	emake -f Makefile.classic \
+		tcplay \
+		"${EXTRA_MAKE_FLAGS[@]}"
+}
+
+src_install() {
+	emake -f Makefile.classic \
+		"${EXTRA_MAKE_FLAGS[@]}" \
+		install_program \
+		DESTDIR="${ED}"
+	dodoc README.md
+}

app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.4 2014/05/28 19:40:37 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.6 2014/06/08 11:06:57 ago Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-ol
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 src_prepare() {
 	# Nicely rename; http://www.iana.org/assignments/language-subtag-registry

app-dicts/verbiste/verbiste-0.1.38-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild,v 1.2 2014/05/31 19:14:07 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild,v 1.4 2014/06/08 11:09:58 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="gtk"
 

app-doc/doxygen/doxygen-1.8.5.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.6 2014/06/03 18:19:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.7 2014/06/08 11:10:50 ago Exp $
 
 EAPI=4
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU"
 
 #missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional

app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild,v 1.4 2014/06/03 11:28:30 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild,v 1.5 2014/06/08 11:09:42 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="app-text/asciidoc"
 

app-editors/emacs/Manifest

@@ -1,10 +1,6 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
 DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-21.4-patches-13.tar.bz2 13287 SHA256 892764ff98f0640ca65b57099a24c76a43ebf1deb9122fbb3b324d3e72043650 SHA512 d44181946c271cb54db7e0e14f3e15b217dceb2cc52594ed6a77adc1347180da58287a647fb5e0ddc3f2e9ec336018c0044d54587cc3c99f8149518bc47a7ecd WHIRLPOOL 55f22b61fdbe137d75bdc5eaf6e5e4cfca8adc913472b2cb4c6deb37d700cef68fd49dac2a7f7a65b8907cc9a08d1249568e3ab075888605346f595df49f15bc
-DIST emacs-21.4a.tar.gz 20403483 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 SHA512 6932db498e7b6b904d90f817e335690c5c681510812332c514af1d84d91b9841ea3eff0357429c7bf866a55ab94d03193fc9cdbf403a9fe4b71d2673c23b863e WHIRLPOOL e711032d23b0e0b33bf95e006d6fc518ddfde4780d23d589fde47ccd94e60687cc9b65b85e04e7af4e8c9161fd8faebf13d28f4f43eb94e7bb7520d537f28751
-DIST emacs-22.3-patches-8.tar.bz2 5974 SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 SHA512 b3489e57db9b7c4d9202238acd6f956b6adeaf09ec161b639ad59e0eea8e2152d5fad24e777a486310eaed68be1c7bf77e474a9aced0041820e74582f7e2e73d WHIRLPOOL 85d127fb9b367d73d8f2674e21096a23b474faf54fa21f178ea0e0dadbb285d1d7c627b7609b7c92ba27590340cf76afc4df4a5c991c252a7ce80b2f6569cf06
-DIST emacs-22.3.tar.gz 39587396 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 SHA512 6cba24921ba9bd27458334b92c6f8fcacc4d5af0f70a067d57ab068eb8d0925143f109847515548584f80c9439d96a9d05158d10a73dda917187bd16a6758584 WHIRLPOOL 74c612213b8f6fc1fc6e243adc27b5a5ff5528100f3c319925519e23477fe2c642d2cf7b382d7b70c8b2b9d7be508773193c95bbf14cb7c55046f76bf4b81225
 DIST emacs-23.4-patches-10.tar.xz 4920 SHA256 0b8e8cf31b013995d4e4cab12636aeaf6f49d2c879eb929fa7fd8774d86a5a00 SHA512 552568fe9264c6e1fe57ec0b48adade34d15b1c768534d0f3e036849c938b18720121dad5ce2c83a4f4c61911d9f386a96f49cab10b641feb265e7eff8d2553e WHIRLPOOL 17dac888cf9120f66f1940eac6e99d34fa447702cb64e391a433829c61b4bc24017125d44bad2108f1bace14c9ae7b40d6aa39245feb9ea2fe215c287da6b100
 DIST emacs-23.4-patches-12.tar.xz 8140 SHA256 17188d0cfaba417cc047fb9a9ba3f4d19a66792a3c123539036bf48a39a6e066 SHA512 d069849be69a14ab8dab11412914e31ba8faeb10d23731c6e476809cf3edeba57a13bbfecb42437636357df1165fce9c83f8a16c421f238e88caee8f32431d3d WHIRLPOOL 23c2aba6e0f91b42cd4d6daf3d4bfec5902c680c2ec0c5a2d0b5841d689b447b65426396fb006347c8d1da487c2ce1ca03f6d17cffd9a6d74820f6f0fc2d1fa7
 DIST emacs-23.4-patches-14.tar.xz 12088 SHA256 c46406a32b53d6c8b68c007f8d990ceb18343056814c5025e8a6ad53587050a9 SHA512 37467b57174b8e7a56864fa7d68c18d5ffe4690a93bd90af04184c88688eea5c0f6b3b3b2662a512099b7b0bcce36a20256f04789072b61f5c9dc353ac2c04cb WHIRLPOOL 06045478595ad805826ae487ed99d663e7cd45944f5c6c8b1aedc1451fab7e442294de828052c2308f6aab57398038f06ffafc75680d477c536d4f23e028e73e
@@ -12,4 +8,3 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884
 DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 ed9928b23a8b73b3ad265ba6866f609cdf61524602dea3b9f57d397d13a6fcb6 SHA512 c5989a9920c5b8cf1935f2d1bea228262c7953516cf93f75dbf6b305fc7c66f0d22c4038931972c441b8c0508acc04a83c7a160e20bf18b2c2e25c10d20f6a5a WHIRLPOOL facb1dd20830a87c8ed0480168127822cfb961cc6592d5c51c9057dfba944adfd4d3211ac7af07873b46fd78580704325f56ab4a5dfb6f78790005b718f19364
 DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138
 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
-DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1

app-editors/emacs/emacs-21.4-r25.ebuild

@@ -1,195 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r25.ebuild,v 1.1 2014/04/04 18:08:44 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit elisp-common flag-o-matic eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-13.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2+ FDL-1.1+ BSD HPND MIT"
-SLOT="21"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif sendmail"
-
-DEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-misc/xbitmaps
-		>=media-libs/giflib-4.1.0.1b
-		virtual/jpeg:0=
-		>=media-libs/tiff-3.5.5-r3
-		>=media-libs/libpng-1.4:0=
-		Xaw3d? ( x11-libs/libXaw3d )
-		!Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) )
-	)"
-
-RDEPEND="${DEPEND}
-	>=app-emacs/emacs-common-gentoo-1.3[X?]
-	sendmail? ( virtual/mta )"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	sed -i \
-		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		"${S}/src/s/gnu-linux.h" || die
-
-	sed -i -e "/^\\.so/s/etags/&-emacs-${SLOT}/" etc/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	# custom aclocal.m4 was only needed for autoconf 2.13 and earlier
-	rm aclocal.m4
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector -fstack-protector-all
-
-	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-	unset LDFLAGS
-
-	# ever since GCC 3.2
-	replace-flags "-O[3-9]" -O2
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	local myconf
-	if use X ; then
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-
-		if use Xaw3d ; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			use motif \
-				&& ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")"
-		elif use motif ; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	econf ${myconf}
-
-	# leave this in src_configure
-	emake \
-		locallisppath="/etc/emacs:${SITELISP}:/usr/share/emacs/${PV}/leim" \
-		epaths-force
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	emake CC="$(tc-getCC)"
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile)
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	local i m
-
-	einstall infodir="${D}/usr/share/info/emacs-${SLOT}"
-
-	for i in "${D}"/usr/bin/* ; do
-		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
-	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
-
-	# move man pages to the correct place
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
-	done
-	mv "${D}"/usr/share/man/man1/emacs{-emacs,}-${SLOT}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-	docompress -x /usr/share/info/emacs-${SLOT}/dir.orig
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${D}"/usr/share/emacs/${PV}/site-lisp
-
-	# fix permissions
-	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-	keepdir /usr/share/emacs/${PV}/leim
-
-	dodoc BUGS ChangeLog README
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/emacs-${SLOT} f
-	if [ -f "${D}"${infodir}/dir.orig ]; then
-		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${D}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${D}"${infodir}/dir{,.*}
-		for f in "${D}"${infodir}/*; do
-			if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then
-				install-info --info-dir="${D}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-
-	if ! use sendmail && ! has_version "virtual/mta"; then
-		elog "You disabled sendmail support for Emacs. If you later install"
-		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
-	fi
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}

app-editors/emacs/emacs-22.3-r12.ebuild

@@ -1,253 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r12.ebuild,v 1.1 2014/05/05 07:06:01 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	mirror://gentoo/${P}-patches-8.tar.bz2"
-
-LICENSE="GPL-3+ FDL-1.2+ BSD HPND MIT"
-SLOT="22"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa games gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	X? ( gtk? ( virtual/pkgconfig ) )
-	gzip-el? ( app-arch/gzip )"
-
-# FULL_VERSION keeps the full version number, which is needed in order to
-# determine some path information correctly for copy/move operations later on
-FULL_VERSION="${PV}"
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	sed -i \
-		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" etc/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstack-protector -fstack-protector-all	#285778
-	replace-flags "-O[3-9]" -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-		myconf="${myconf} $(use_with png) $(use_with tiff)"
-		myconf="${myconf} $(use_with xpm)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-
-		local f tk=
-		for f in gtk Xaw3d motif; do
-			use ${f} || continue
-			[ "${tk}" ] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir=/var \
-		--enable-locallisppath="/etc/emacs:${SITELISP}" \
-		--without-carbon \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${D}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in ctags emacsclient etags; do
-		mv "${D}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${D}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${D}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc AUTHORS BUGS CONTRIBUTE README
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [ -f "${D}"${infodir}/dir.orig ]; then
-		mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${D}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${D}"${infodir}/dir{,.*}
-		for f in "${D}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${D}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	eselect emacs update ifunset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-		elog
-	fi
-
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}

app-editors/emacs/emacs-23.4-r11.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.2 2014/06/04 17:16:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.9 2014/06/08 10:59:33 ago Exp $
 
 EAPI=5
 WANT_AUTOMAKE="none"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 

app-editors/emacs/emacs-24.3-r6.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.4 2014/05/16 20:09:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.11 2014/06/08 10:59:33 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 

app-editors/emacs/metadata.xml

@@ -30,12 +30,10 @@
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
   <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='leim'>Add support for Emacs input methods</flag>
   <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
   <flag name='pax_kernel'>Enable building under a PaX enabled kernel
     (<pkg>sys-apps/paxctl</pkg>)</flag>
-  <flag name='sendmail'>Build Emacs with MTA support</flag>
   <flag name='source'>Install C source files and make them available for
     find-function</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in

app-editors/pluma/pluma-1.8.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/pluma/pluma-1.8.1.ebuild,v 1.1 2014/05/09 11:47:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pluma/pluma-1.8.1.ebuild,v 1.2 2014/06/07 16:39:07 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="python spell"
 

app-editors/vim-core/vim-core-7.3.1214.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.1214.ebuild,v 1.1 2013/06/17 00:55:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.1214.ebuild,v 1.2 2014/06/06 06:04:05 vapier Exp $
 
 EAPI=5
 VIM_VERSION="7.3"
@@ -15,6 +15,6 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 	http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
 
 DESCRIPTION="vim and gvim shared files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}/vim${VIM_VERSION/.}

app-editors/vim-core/vim-core-7.3.762.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.762.ebuild,v 1.12 2013/06/09 16:09:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.762.ebuild,v 1.13 2014/06/06 06:04:05 vapier Exp $
 
 EAPI=3
 VIM_VERSION="7.3"
@@ -16,5 +16,5 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="vim and gvim shared files"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

app-editors/vim/vim-7.3.1214.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.2 2013/09/05 18:18:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.3 2014/06/06 06:05:47 vapier Exp $
 
 EAPI=5
 VIM_VERSION="7.3"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 	http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
 
 DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}/vim${VIM_VERSION/.}
 

app-editors/vim/vim-7.3.762.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.762.ebuild,v 1.12 2013/06/09 16:09:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.762.ebuild,v 1.13 2014/06/06 06:05:47 vapier Exp $
 
 EAPI=3
 VIM_VERSION="7.3"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {

app-emacs/bongo/bongo-20110621.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20110621.ebuild,v 1.2 2014/03/07 07:32:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20110621.ebuild,v 1.3 2014/06/07 10:36:05 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp eutils
 

app-emacs/calfw/Manifest

@@ -1,3 +1 @@
-DIST calfw-1.1.tar.gz 53163 SHA256 32fdc286f48774bd0882978d0d008ec27bc337afebb91530370d12b42ef01cfd SHA512 68c70d02903d0b5c8032b8976cb2da5a62206b7c46621dac95244ee2258297b7f34747bbaa118cf03d466261e31be032c9fb38e15005dae8a5435a0d7c15b17d WHIRLPOOL 564d386c1073b6a2f06d58ba97b8bd14cfc32f39250d684bf8736974944054ece07fa2b26b661c452e9ad8dfea0d56f47f0c7132067149c17cb7fabedcb19e06
-DIST calfw-1.2.tar.gz 54094 SHA256 80f8c337d918ecbf31601f7eeeda74b24e948685ece27c835989287bf6ed81db SHA512 4055c9094535f9d0808d69290c09fb5ef611ec8e7892347f2e62d759f0be209dbe3ecf91fe8945270657370ded7349d8eb9bdd0acbf84ff61812da1ec2711bef WHIRLPOOL e07e0bdb8e2ed67888c15e137e48c26f4aeaaae806959fd3a8c1ac5ff26608e0829571acf7302a2ae91d8550efccc69ded01b7ff2730057cbac578f3df774e03
 DIST calfw-1.3.tar.gz 67187 SHA256 b18b1955e34bfeb65f4dd238a1fe240bfb90c2139300ecf613a992d25e36a401 SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc WHIRLPOOL d68ccf2d696cec6e8fa584ea741a12d85c06fef3c1d7cfd93e151bbda976128c947456f5597bfe7ee7d586026ef58b603fff9612a229432cb786759a288b2159

app-emacs/calfw/calfw-1.1.ebuild

@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.1.ebuild,v 1.2 2011/07/10 06:27:12 naota Exp $
-
-EAPI=3
-NEED_EMACS=22
-
-inherit elisp eutils
-
-DESCRIPTION="A calendar framework for Emacs"
-HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
-SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="howm"
-
-DEPEND="howm? ( app-emacs/howm )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv kiwanami-emacs-calfw-* ${P} || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-calfwel.patch
-	use howm || rm -f calfw-howm.el
-}

app-emacs/calfw/calfw-1.2.ebuild

@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.2.ebuild,v 1.1 2011/08/14 10:12:17 naota Exp $
-
-EAPI=3
-NEED_EMACS=22
-
-inherit elisp eutils
-
-DESCRIPTION="A calendar framework for Emacs"
-HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
-SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="howm"
-
-DEPEND="howm? ( app-emacs/howm )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv kiwanami-emacs-calfw-* ${P} || die
-}
-
-src_prepare() {
-	use howm || rm -f calfw-howm.el
-}

app-emacs/calfw/calfw-1.3.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.3.ebuild,v 1.1 2011/10/10 08:31:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.3.ebuild,v 1.2 2014/06/07 10:53:15 ulm Exp $
 
-EAPI=3
-NEED_EMACS=22
+EAPI=5
 
 inherit elisp eutils
 
@@ -11,7 +10,7 @@ DESCRIPTION="A calendar framework for Emacs"
 HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
 SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="howm"

app-emacs/calfw/files/calfw-1.1-calfwel.patch

@@ -1,58 +0,0 @@
-diff --git a/calfw.el b/calfw.el
-index 5a72627..2fa2f9e 100644
---- a/calfw.el
-+++ b/calfw.el
-@@ -984,13 +984,16 @@ calling functions `cfw:annotations-functions'."
-    (t
-     (loop for s in sources
-           for f = (cfw:source-data s)
--          for cnt = (funcall f begin end)
-+          for cnts = (funcall f begin end)
-           with annotations = nil
--          for prv = (cfw:contents-get-internal d annotations)
--          if prv
--          do (set-cdr prv (concat (cdr prv) "/" (cdr cnt)))
--          else
--          do (push (copy-sequence cnt) annotations)
-+          do
-+          (loop for c in cnts
-+                for (d . line) = c
-+                for prv = (cfw:contents-get-internal d annotations)
-+                if prv
-+                do (setcdr prv (concat (cdr prv) "/" line))
-+                else
-+                do (push (cons d line) annotations))
-           finally return annotations))))
- 
- 
-@@ -2380,7 +2383,7 @@ DATE is initial focus date. If it is nil, today is selected initially."
-                 ((1 14 2011) (1 15 2011) "Stack")
-                 ((1 29 2011) (1 31 2011) "PERIOD W"))
-                ))))
--         (asource
-+         (asource1
-           (make-cfw:source
-            :name "Moon"
-            :data
-@@ -2390,10 +2393,20 @@ DATE is initial focus date. If it is nil, today is selected initially."
-                ((1 20 2011) . "Full Moon")
-                ((1 26 2011) . "Waning Moon")
-                ))))
-+         (asource2
-+          (make-cfw:source
-+           :name "Moon"
-+           :data
-+           (lambda (b e)
-+             '(((1  5 2011) . "AN1")
-+               ((1 13 2011) . "AN2")
-+               ((1 20 2011) . "AN3")
-+               ((1 28 2011) . "AN4")
-+               ))))
-          (cp (cfw:create-calendar-component-buffer
-               :view 'month
-               :contents-sources (list source1 source2)
--              :annotation-sources (list asource))))
-+              :annotation-sources (list asource1 asource2))))
-     (cfw:cp-add-update-hook cp (lambda () (message "CFW: UPDATE HOOK")))
-     (cfw:cp-add-click-hook cp (lambda () (message "CFW: CLICK HOOK %S" (cfw:cursor-to-nearest-date))))
-     (cfw:cp-add-selection-change-hook cp (lambda () (message "CFW: SELECT %S" (cfw:cursor-to-nearest-date))))

app-emacs/cedet/cedet-1.0.1.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.5 2012/02/01 17:17:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.6 2014/06/07 11:03:10 ulm Exp $
 
 EAPI=4
-NEED_EMACS=22
 
 inherit elisp
 
@@ -12,10 +11,9 @@ DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
 HOMEPAGE="http://cedet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
 
-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
@@ -75,5 +73,5 @@ src_install() {
 		doins "${target}"
 	done <"${T}/elc-list.txt"
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }

app-emacs/cedet/cedet-1.1.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.1.ebuild,v 1.5 2012/08/15 20:20:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.1.ebuild,v 1.6 2014/06/07 11:03:10 ulm Exp $
 
 EAPI=4
-NEED_EMACS=22
 
 inherit elisp
 
@@ -12,10 +11,9 @@ DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
 HOMEPAGE="http://cedet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2"
+LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
@@ -76,5 +74,5 @@ src_install() {
 		doins "${target}"
 	done <"${T}/elc-list.txt"
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }

app-emacs/company-mode/company-mode-0.6.14.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.14.ebuild,v 1.3 2014/03/17 00:02:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.14.ebuild,v 1.4 2014/06/07 11:05:17 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 

app-emacs/company-mode/company-mode-0.7.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.7.ebuild,v 1.1 2014/03/17 18:01:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.7.ebuild,v 1.2 2014/06/07 11:05:17 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 

app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.3 2014/02/16 16:50:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.4 2014/06/07 11:07:02 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp
 

app-emacs/d-mode/d-mode-2.0.6.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/d-mode/d-mode-2.0.6.ebuild,v 1.1 2013/07/29 21:19:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/d-mode/d-mode-2.0.6.ebuild,v 1.2 2014/06/07 11:07:52 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 

app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild,v 1.4 2014/02/18 00:07:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild,v 1.5 2014/06/07 11:08:58 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp flag-o-matic
 

app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild,v 1.3 2014/05/15 20:00:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild,v 1.10 2014/06/08 10:59:36 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"

app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild,v 1.5 2014/05/14 14:21:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild,v 1.6 2014/06/07 11:09:56 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp
 

app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild

@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild,v 1.4 2012/12/01 19:46:12 armin76 Exp $
-
-NEED_EMACS=22
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wiki/emacs-wiki-2.72-r1.ebuild,v 1.5 2014/06/07 11:14:30 ulm Exp $
 
 inherit elisp
 
@@ -11,10 +9,9 @@ HOMEPAGE="http://www.mwolson.org/projects/EmacsWiki.html
 	http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsWikiMode"
 SRC_URI="http://www.mwolson.org/static/dist/emacs-wiki/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="app-emacs/htmlize
 	app-emacs/httpd"
@@ -31,14 +28,13 @@ src_unpack() {
 }
 
 src_compile() {
-	elisp-compile *.el || die "elisp-compile failed"
+	elisp-compile *.el
 	makeinfo emacs-wiki.texi || die "makeinfo failed"
 }
 
 src_install() {
-	elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-		|| die "elisp-site-file-install failed"
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	doinfo *.info*
 	dodoc README ChangeLog*
 	docinto examples

app-emacs/emacs-wiki/files/50emacs-wiki-gentoo.el

@@ -1,6 +1,3 @@
-
-;;; emacs-wiki site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'emacs-wiki-mode "emacs-wiki"
   "An Emacs mode for maintaining a local Wiki database." t)

app-emacs/emms/emms-3.0-r1.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0-r1.ebuild,v 1.2 2013/04/03 20:54:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emms/emms-3.0-r1.ebuild,v 1.3 2014/06/07 11:16:03 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp toolchain-funcs
 

app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.8 2014/05/24 10:10:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild,v 1.9 2014/06/08 11:08:42 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? ( virtual/latex-base )"

app-emacs/identica-mode/identica-mode-1.1-r1.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/identica-mode/identica-mode-1.1-r1.ebuild,v 1.3 2011/08/15 11:22:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/identica-mode/identica-mode-1.1-r1.ebuild,v 1.4 2014/06/07 11:18:04 ulm Exp $
 
 EAPI=4
-NEED_EMACS=23
 
 inherit elisp
 
@@ -12,10 +11,9 @@ HOMEPAGE="http://blog.nethazard.net/identica-mode-for-emacs/"
 # taken from: http://git.savannah.gnu.org/cgit/identica-mode.git/snapshot/${P}.tar.gz
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 ELISP_TEXINFO="doc/${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"

app-emacs/jde/jde-2.4.1.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1.ebuild,v 1.5 2014/03/17 00:17:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1.ebuild,v 1.6 2014/06/07 11:19:27 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 elisp eutils

app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild,v 1.4 2014/03/24 14:57:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild,v 1.5 2014/06/07 11:21:09 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 

app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild

@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild,v 1.5 2012/12/06 04:27:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild,v 1.6 2014/06/07 11:23:42 ulm Exp $
 
 EAPI=4
 
-NEED_EMACS=23
 inherit elisp
 
 DESCRIPTION="Add support for DocBook 5 schemas to NXML"
@@ -14,7 +13,6 @@ SRC_URI="http://www.docbook.org/xml/5.0/rng/docbookxi.rnc"
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 S="${WORKDIR}"
 SITEFILE="60${PN}-gentoo.el"
@@ -26,5 +24,5 @@ src_compile() { :; }
 src_install() {
 	insinto ${SITEETC}/${PN}
 	doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }

app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild

@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild,v 1.3 2014/05/12 16:13:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild,v 1.4 2014/06/07 11:25:01 ulm Exp $
 
 EAPI=4
 
-NEED_EMACS=23
 inherit elisp
 
 DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"

app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild

@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.2 2014/02/13 19:50:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.3 2014/06/07 11:26:49 ulm Exp $
 
 EAPI=4
 
 #BACKPORTS=
-NEED_EMACS=23
 
 inherit elisp eutils
 
@@ -52,5 +51,5 @@ src_test() {
 src_install() {
 	insinto ${SITEETC}/${PN}
 	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }

app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild

@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild,v 1.1 2014/02/13 19:50:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild,v 1.2 2014/06/07 11:26:49 ulm Exp $
 
 EAPI=5
 
 #BACKPORTS=
-NEED_EMACS=23
 
 inherit elisp eutils
 

app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild

@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.4 2012/09/26 06:56:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.5 2014/06/07 11:27:51 ulm Exp $
 
 EAPI=4
 
-NEED_EMACS=23
 inherit elisp
 
 DESCRIPTION="Extension for nxml-mode with SVG 1.1 schemas"
@@ -40,5 +39,5 @@ src_compile() {
 src_install() {
 	insinto "${SITEETC}/${PN}"
 	doins "${FILESDIR}/schemas.xml" *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }

app-emacs/org-mode/Manifest

@@ -1,5 +1,3 @@
-DIST org-7.9.2.tar.gz 4141885 SHA256 14c91bf456c271ac17f2f083f86227d4e5f09483fdb69adbf314de4392e25469 SHA512 9b0f90ec47660dcc9faf7ad742b62c816a031119a2a89864f6fd183e343bd08027f5cf8439314b1593b9f5d76ff08f57b0b30aa188e1a94a426b3573c33c434c WHIRLPOOL 3ac9a49157375cd3628c4fb1248af071d8ed725307effbcce81961bd1d35117ae7f5a371baffa6159e0c57fd4f896cdf4a7b0d3ac67942ea177d8717a19ce47f
-DIST org-8.0.2.tar.gz 4171893 SHA256 e129bdb654c7e1cf7404cc55e65ff479712b1d9549ecdbb4f3904b4bff8c7034 SHA512 d1de4ac6a86449446e438a0f2edc98672144ab25721d4eb482ff1bc60122fded9775274d0ca7085d7ed6e98d972734bbd041970f65d8ed73db99f388dc41b2db WHIRLPOOL c51da4cd3b5697585d1f0ee08f8d782240d63395316ccc0570deefaec6944c384bb16963e3bfd3e495bbb8d5c003bfc7d388aa29d487d16da6a6eadb83858033
 DIST org-8.2.1.tar.gz 4215666 SHA256 625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823 SHA512 366504c8bc4637c96d6255603e949951fed1d89b9b58aa938072c982cca14d5eedfa2a45aabbae55d4862aa9dcc984b379f969cf5b6da50f73d2e0044cd687fb WHIRLPOOL 024166ee4eb6bb994f44249ea819ac3b4aad9c133bfcbc438d57a4dce54b3c8a108519eabf9318e769768be36d1733066bbec58cfaf03fc600de72fd55e3c29d
 DIST org-8.2.5h.tar.gz 4220242 SHA256 f0f4924c9d57557b12f535c032f5f8584cc27ab6af2afc9939f9acf1af2c5d80 SHA512 e486a6f831de935fbe9cbcff18042a5a5ff9ecb60ffd755455c70488f95c6c103f7870d7d69f9808043b2b87fe64441adfd5c9ddb417b33fd8f9469d1943db49 WHIRLPOOL 72290244aaabd09660fd290a100d8ae2ed05b64d3b842464f247c20c634a75e2738c07e85d414b852685f2fade0b2aea92a1a2835d178d90b7eab5650710066b
 DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b493d44b856d46441362938 SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3 WHIRLPOOL b834203c48948a84d6458b7f455451cfd3f40fccd0ae55f150cf105ef937f46fb52492642990cf33c90a2464b93d184d85d922680adf4e66a2af5308d3ac631c

app-emacs/org-mode/files/50org-mode-gentoo-8.el

@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))

app-emacs/org-mode/files/50org-mode-gentoo.el

@@ -1,3 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
 (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-(require 'org-install)

app-emacs/org-mode/org-mode-7.9.2.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.9.2.ebuild,v 1.9 2013/05/06 05:07:34 ulm Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-# Remove autoload file to make sure that it is regenerated with
-# the right Emacs version.
-ELISP_REMOVE="lisp/org-install.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/babel contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	dodoc README doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}

app-emacs/org-mode/org-mode-8.0.2.ebuild

@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.0.2.ebuild,v 1.3 2013/05/06 05:07:34 ulm Exp $
-
-EAPI=5
-NEED_EMACS=23
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}

app-emacs/org-mode/org-mode-8.2.1.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.1.ebuild,v 1.4 2014/02/24 01:25:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.1.ebuild,v 1.5 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"
@@ -36,7 +35,7 @@ src_install() {
 		infodir="${EPREFIX}/usr/share/info" \
 		install
 
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
 
 	if use contrib; then
 		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el

app-emacs/org-mode/org-mode-8.2.5h.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.5h.ebuild,v 1.3 2014/03/26 11:37:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.5h.ebuild,v 1.4 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"

app-emacs/org-mode/org-mode-8.2.6.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.1 2014/04/26 13:51:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.2 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"

app-emacs/popwin/Manifest

@@ -1,2 +1 @@
-DIST popwin-0.5.1.tar.gz 15700 SHA256 2f3033052d15538049b21c19b7a7114986599ab94a5234038b704e930956b474 SHA512 401dbcf1ee84014f24972facef4ccd9f2b80eb318e6bbdb3c51278d4fc86711b60a2d29a1c8d481ec01172b225981bccd7bcbd136c9c5a49e63bf03f617cbf16 WHIRLPOOL 81c6fe7aa01d3950abbb368a0a160bc00f6a5a8e455f462ffbfc42174ffcc5300b192ead80ed1be471426c4ea144845e4f7a8607ebe982c1d1e424818fea9bc8
 DIST popwin-0.6.2.tar.gz 16821 SHA256 77069e5c642ccee21788f462dc2bdc30ac4789d658585da950cf7097fa41d6e9 SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108 WHIRLPOOL 2739efa75f9e88296f28ab2df93990dac5630a4e6b3a7d094fed1b0ee23066c51f2ff42301cbefec9dff132ec2ddbdab2c532bd49b6f7e20903f382d9f4aa208

app-emacs/popwin/popwin-0.5.1.ebuild

@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.5.1.ebuild,v 1.2 2014/02/27 18:00:00 ulm Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp eutils
-
-DESCRIPTION="Popup window manager for Emacs"
-HOMEPAGE="https://github.com/m2ym/popwin-el/"
-SRC_URI="https://github.com/m2ym/popwin-el/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md NEWS.md"
-
-src_unpack() {
-	unpack ${A}
-	mv m2ym-popwin-el-* ${P} || die
-}

app-emacs/popwin/popwin-0.6.2.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.6.2.ebuild,v 1.1 2014/02/27 18:00:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.6.2.ebuild,v 1.2 2014/06/07 11:34:58 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp eutils
 

app-emacs/proofgeneral/Manifest

@@ -1,2 +1 @@
-DIST ProofGeneral-4.1.tgz 1428499 SHA256 2a264d46b48185cf1a6ebcca958e59171ea670fb0fc82ba46b8e1d6918ea7dc7 SHA512 f9bb7ef270b5c793f58441db9287b5018176d8d9d91cc9a2a975c1f0d7a450f1c150d21df16f982738f3562c74d5ae05d61fed5b1c1d6a3eb26cab0131d64696 WHIRLPOOL 02a4f2adc4dc39a19b6a4a46e0e2fb8a80e4340f38470c842425b63ee4c946e8f9b91d51eaafbcce01dc39e81009ebf6e327c1faf294249bf7b32a387444d4e8
 DIST ProofGeneral-4.2.tgz 1613190 SHA256 3567b68077798396ccd55c501b7ea7bd2c4d6300e4c74ff609dc19837d050b27 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab WHIRLPOOL 9c4e54cf3b1528ee6cbdfac19b0c589f0c2640defbac15d5aaf0a1bfd64680bff45d2faa17f669210f47f30debb768d593590d350acac9c2669d24dc109bb4d8

app-emacs/proofgeneral/files/proofgeneral-4.1-emacs-24.patch

@@ -1,73 +0,0 @@
-https://bugs.gentoo.org/386465
-
---- a/generic/proof-menu.el
-+++ b/generic/proof-menu.el
-@@ -49,7 +49,7 @@ without adjusting window layout."
-   ;; trace buffer, etc.  (Makes less sense from the menu, though,
-   ;; where it seems more natural just to rotate from last position)
-   (cond
--   ((and (interactive-p)
-+   ((and (called-interactively-p 'any)
- 	 (eq last-command 'proof-display-some-buffers))
-     (incf proof-display-some-buffers-count))
-    (t
---- a/generic/proof-script.el
-+++ b/generic/proof-script.el
-@@ -431,13 +431,13 @@ Point must be after the locked region or this will signal an error."
- If called interactively or SWITCH is non-nil, switch to script buffer.
- If called interactively, a mark is set at the current location with `push-mark'"
-   (interactive)
--  (if (and proof-script-buffer (interactive-p))
-+  (if (and proof-script-buffer (called-interactively-p 'any))
-       (push-mark))
-   (proof-with-script-buffer
-    (if ;; there is an active scripting buffer and it's not displayed
-        (and proof-script-buffer
- 	    (not (get-buffer-window proof-script-buffer))
--	    (or switch (interactive-p)))
-+	    (or switch (called-interactively-p 'any)))
-        ;; display it
-        (switch-to-buffer proof-script-buffer))
-    (goto-char (proof-unprocessed-begin))))
-@@ -1260,7 +1260,7 @@ activation is considered to have failed and an error is given."
-       ;; immediately because scripting has been turned on now.
-       (if proof-activate-scripting-hook
- 	  (let
--	      ((activated-interactively	(interactive-p)))
-+	      ((activated-interactively	(called-interactively-p 'any)))
- 	    (setq proof-shell-last-output-kind nil)
- 	    (run-hooks 'proof-activate-scripting-hook)
- 	    ;; If activate scripting functions caused an error,
---- a/generic/proof-splash.el
-+++ b/generic/proof-splash.el
-@@ -287,7 +287,7 @@ binding to remove this buffer."
- 	(progn
- 	  ;; disable ordinary emacs splash
- 	  (setq inhibit-startup-message t)
--	  (proof-splash-display-screen (not (interactive-p))))
-+	  (proof-splash-display-screen (not (called-interactively-p 'any))))
-       ;; Otherwise, a message
-       (message "Welcome to %s Proof General!" proof-assistant))
-     (setq proof-splash-seen t)))
---- a/isar/isabelle-system.el
-+++ b/isar/isabelle-system.el
-@@ -292,7 +292,7 @@ for you, you should disable this behaviour."
-   "Refresh isabelle-logics-menu-entries, returning new entries."
-   (interactive)
-   (if (and isabelle-refresh-logics
--	   (or isabelle-time-to-refresh-logics (interactive-p)))
-+	   (or isabelle-time-to-refresh-logics (called-interactively-p 'any)))
-       (progn
- 	(setq isabelle-logics-available (isa-tool-list-logics))
- 	(isabelle-logics-menu-calculate)
---- a/lib/scomint.el
-+++ b/lib/scomint.el
-@@ -251,7 +251,7 @@ NO-NEWLINE is non-nil."
-     (save-excursion
-       (condition-case nil
- 	  (goto-char
--	   (if (interactive-p) scomint-last-input-end scomint-last-output-start))
-+	   (if (called-interactively-p 'any) scomint-last-input-end scomint-last-output-start))
- 	(error nil))
-       (while (re-search-forward "\r+$" pmark t)
- 	(replace-match "" t t)))))

app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch

@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/426646
-
---- ProofGeneral-orig/generic/proof-toolbar.el
-+++ ProofGeneral/generic/proof-toolbar.el
-@@ -103,7 +103,8 @@
-   (when (proof-toolbar-available-p)
-     (unless proof-toolbar-map
-       (setq proof-toolbar-map (make-sparse-keymap))
--      (add-to-list 'image-load-path proof-images-directory) ; rude?
-+      (if (boundp 'image-load-path)
-+	  (add-to-list 'image-load-path proof-images-directory)) ; rude?
-       (mapc 'proof-toolbar-make-icon (proof-ass toolbar-entries))
-       (proof-toolbar-make-toolbar-items proof-toolbar-map
- 					(proof-ass toolbar-entries)))

app-emacs/proofgeneral/proofgeneral-4.1.ebuild

@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.1.ebuild,v 1.5 2012/07/14 21:14:04 ulm Exp $
-
-EAPI=4
-NEED_EMACS=23
-
-inherit elisp
-
-MY_PN="ProofGeneral"
-DESCRIPTION="A generic interface for proof assistants"
-HOMEPAGE="http://proofgeneral.inf.ed.ac.uk/"
-SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-ELISP_PATCHES="${P}-emacs-24.patch
-	${P}-image-load-path.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
-}
-
-src_compile() {
-	# remove precompiled lisp files
-	emake clean
-	emake -j1 compile EMACS=emacs
-}
-
-src_install() {
-	emake -j1 install EMACS=emacs PREFIX="${D}"/usr
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die
-
-	doinfo doc/*.info*
-	doman doc/proofgeneral.1
-	dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html
-	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER
-
-	# clean up
-	rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d"
-	rm -rf "${D}/usr/share/application-registry"
-	rm -rf "${D}/usr/share/mime-info"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please register your use of Proof General on the web at:"
-	elog "  http://proofgeneral.inf.ed.ac.uk/register "
-	elog "(see the REGISTER file for more information)"
-}

app-emacs/proofgeneral/proofgeneral-4.2.ebuild

@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.2.ebuild,v 1.4 2013/12/24 12:45:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.2.ebuild,v 1.5 2014/06/07 11:40:21 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -15,7 +14,6 @@ SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
 RDEPEND="${DEPEND}"
@@ -37,7 +35,7 @@ src_compile() {
 
 src_install() {
 	emake -j1 install EMACS=emacs PREFIX="${D}"/usr
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN}
 
 	doinfo doc/*.info*
 	doman doc/proofgeneral.1

app-emacs/rudel/rudel-0.3_pre20110721.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/rudel/rudel-0.3_pre20110721.ebuild,v 1.4 2014/03/17 00:14:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/rudel/rudel-0.3_pre20110721.ebuild,v 1.5 2014/06/07 11:41:23 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit readme.gentoo elisp
 

app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild

@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild,v 1.2 2014/02/14 16:50:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild,v 1.3 2014/06/07 11:42:30 ulm Exp $
 
 EAPI=5
-NEED_EMACS=22
 
 inherit elisp
 

app-emacs/undo-tree/undo-tree-0.5.2.ebuild

@@ -1,20 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/undo-tree-0.5.2.ebuild,v 1.1 2012/07/15 18:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/undo-tree-0.5.2.ebuild,v 1.2 2014/06/07 11:44:56 ulm Exp $
 
 EAPI=4
-NEED_EMACS=22
 
 inherit elisp
 
 DESCRIPTION="Undo trees and visualization"
 HOMEPAGE="http://www.dr-qubit.org/emacs.php#undo-tree"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
 

app-emacs/vhdl-mode/Manifest

@@ -1,3 +1,2 @@
-DIST vhdl-mode-3.33.28.tar.gz 323627 SHA256 47420c4c89e2297684f43cc1d6dd8b209d143bfd2676078df396a538122d388a SHA512 106db906459b609d6733d219a32b2e0277452d0bae3c4943b615d4caf68392ac9e63ca7d95b55889947107fd87209c166b206b2d5f4b7f656da6411680254d93 WHIRLPOOL 419b1569a93d14623b088faa5d67ad9e39798b0ad8eee85513c38266cf8049fe59990641fa461be6a60e649e0939de4928d80115fe2bd65a20294d349161ed19
 DIST vhdl-mode-3.34.2.tar.gz 313856 SHA256 83f5fdb56652bc328698584cf2cbd80f09f9b901e7085dc0a181bcaf6984431c SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f WHIRLPOOL 23df41f11a0fb2df36333b39f83d3f54bd9e5066a83fdeef6b5416af0ac91e23c32759a3779a42c70f1e3e31b4d7479fadd44af9d3eaf4bc05d3110925c51f7b
 DIST vhdl-mode-3.35.1.tar.gz 316090 SHA256 2947e298c50629cb668cd65ce6b60d5a4c09ddc0d55114a166561ccf9c6b5655 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c WHIRLPOOL 58de56ccb64bcc521194e372d995636b837a4d4f54b861501c5379afb7a8df711f3744a872acdce509b4a08aab7560d56893ae07b2370da29a79968f86f5ce69

app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild

@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild,v 1.5 2014/02/27 18:11:39 ulm Exp $
-
-EAPI=3
-
-inherit elisp
-
-DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
-SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog README"
-
-src_prepare() {
-	elisp_src_prepare
-	rm site-start.* || die
-}
-
-src_install() {
-	elisp_src_install
-	doinfo vhdl-mode.info || die
-}

app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild,v 1.2 2014/05/30 20:18:03 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild,v 1.4 2014/06/08 11:07:28 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
 ELISP_REMOVE="site-start.*"

app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild

@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r3.ebuild,v 1.1 2014/06/07 15:28:31 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32 +pulseaudio"
+
+DEPEND=""
+# required libs
+RDEPEND="
+	!abi_x86_32? (
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		~app-emulation/emul-linux-x86-xlibs-${PV}
+		~app-emulation/emul-linux-x86-db-${PV}
+	)
+	abi_x86_32? (
+		app-arch/bzip2[abi_x86_32(-)]
+		dev-libs/glib[abi_x86_32(-)]
+		dev-libs/libxml2[abi_x86_32(-)]
+		media-libs/alsa-lib[abi_x86_32(-)]
+		media-libs/freetype[abi_x86_32(-)]
+		media-libs/libpng[abi_x86_32(-)]
+		media-libs/libvorbis[abi_x86_32(-)]
+		media-sound/jack-audio-connection-kit[abi_x86_32(-)]
+		sci-libs/fftw[abi_x86_32(-)]
+		virtual/jpeg:62[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+		x11-libs/libXfixes[abi_x86_32(-)]
+		pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+	)
+	!<=app-emulation/emul-linux-x86-sdl-20081109
+	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
+
+# supplied libs
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
+		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
+		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
+		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
+		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
+		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
+		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
+		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
+		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
+		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
+		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
+		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
+		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
+		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
+		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
+		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
+		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
+		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
+		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
+		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
+		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
+		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
+		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
+		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
+		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
+		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
+		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
+		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
+		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
+		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
+		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
+		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
+		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
+		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
+		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
+		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
+	)
+	"
+PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
+
+pkg_pretend() {
+	if use abi_x86_32 && ! use pulseaudio; then
+		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
+		ewarn "libavfilter. If you need it, please turn USE=pulseaudio back on."
+	fi
+}
+
+src_prepare() {
+	# Include all libv4l libs, bug #348277
+	ALLOWED="${S}/usr/lib32/libv4l/"
+	emul-linux-x86_src_prepare
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}

app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild

@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r4.ebuild,v 1.1 2014/06/07 21:32:20 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1 !abi_x86_32? ( MPEG-4 )"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32"
+
+DEPEND=""
+# required libs
+RDEPEND="
+	!abi_x86_32? (
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		~app-emulation/emul-linux-x86-xlibs-${PV}
+		~app-emulation/emul-linux-x86-db-${PV}
+	)
+	abi_x86_32? (
+		dev-libs/glib[abi_x86_32(-)]
+		dev-libs/libxml2[abi_x86_32(-)]
+		media-libs/freetype[abi_x86_32(-)]
+		media-libs/libpng[abi_x86_32(-)]
+		virtual/jpeg:62[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+	)
+	!<=app-emulation/emul-linux-x86-sdl-20081109
+	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
+
+# supplied libs
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		>=media-libs/libvpx-1.2.0_pre[abi_x86_32(-)]
+		>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)]
+		>=media-sound/lame-3.99.5-r1[abi_x86_32(-)]
+		>=media-libs/faac-1.28-r4[abi_x86_32(-)]
+		>=media-libs/faad2-2.7-r3[abi_x86_32(-)]
+		>=media-libs/libtheora-1.1.1-r1[abi_x86_32(-)]
+		>=media-libs/libcuefile-477-r1[abi_x86_32(-)]
+		>=media-libs/libreplaygain-477-r1[abi_x86_32(-)]
+		>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
+		>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)]
+		>=media-libs/speex-1.2_rc1-r2[abi_x86_32(-)]
+		>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)]
+		>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)]
+		>=media-libs/libv4l-0.9.5-r1[abi_x86_32(-)]
+		>=media-libs/libid3tag-0.15.1b-r4[abi_x86_32(-)]
+		>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)]
+		>=media-libs/libsidplay-2.1.1-r3:2[abi_x86_32(-)]
+		>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
+		>=media-libs/x264-0.0.20130731[abi_x86_32(-)]
+		>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
+		>=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
+		>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
+		>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
+		>=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
+		>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
+		>=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
+		>=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
+		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
+		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
+		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
+		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
+		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
+		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
+		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
+		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
+		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
+		>=virtual/ffmpeg-9-r1[abi_x86_32(-)]
+		>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
+	)
+	"
+PDEPEND="!abi_x86_32? ( ~app-emulation/emul-linux-x86-soundlibs-${PV} )"
+
+src_prepare() {
+	# Include all libv4l libs, bug #348277
+	ALLOWED="${S}/usr/lib32/libv4l/"
+	emul-linux-x86_src_prepare
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}

app-emulation/emul-linux-x86-medialibs/files/remove-native-20140508-r3

@@ -0,0 +1,465 @@
+usr/lib32/libxvidcore.so
+usr/lib32/libxvidcore.so.4
+usr/lib32/libxvidcore.so.4.3
+usr/lib32/libmp3lame.so
+usr/lib32/libmp3lame.so.0
+usr/lib32/libmp3lame.so.0.0.0
+usr/lib32/libvpx.so
+usr/lib32/libvpx.so.1*
+usr/lib32/pkgconfig/vpx.pc
+usr/lib32/libfaac.so
+usr/lib32/libfaac.so.0
+usr/lib32/libfaac.so.0.0.0
+usr/lib32/libfaad.so
+usr/lib32/libfaad.so.2
+usr/lib32/libfaad.so.2.0.0
+usr/lib32/libmp4ff.so
+usr/lib32/libmp4ff.so.0
+usr/lib32/libmp4ff.so.0.0.0
+usr/lib32/libtheora.so
+usr/lib32/libtheora.so.0
+usr/lib32/libtheora.so.0.3.10
+usr/lib32/libtheoradec.so
+usr/lib32/libtheoradec.so.1
+usr/lib32/libtheoradec.so.1.1.4
+usr/lib32/libtheoraenc.so
+usr/lib32/libtheoraenc.so.1
+usr/lib32/libtheoraenc.so.1.1.2
+usr/lib32/pkgconfig/theora.pc
+usr/lib32/pkgconfig/theoradec.pc
+usr/lib32/pkgconfig/theoraenc.pc
+usr/lib32/libcuefile.so
+usr/lib32/libcuefile.so.0
+usr/lib32/libcuefile.so.0.0.0
+usr/lib32/libreplaygain.so
+usr/lib32/libreplaygain.so.1
+usr/lib32/libreplaygain.so.1.0.0
+usr/lib32/libmad.so
+usr/lib32/libmad.so.0
+usr/lib32/libmad.so.0.2.1
+usr/lib32/pkgconfig/mad.pc
+usr/lib32/libdca.so
+usr/lib32/libdca.so.0
+usr/lib32/libdca.so.0.0.0
+usr/lib32/pkgconfig/libdca.pc
+usr/lib32/pkgconfig/libdts.pc
+usr/lib32/libspeex.so
+usr/lib32/libspeex.so.1
+usr/lib32/libspeex.so.1.5.0
+usr/lib32/libspeexdsp.so
+usr/lib32/libspeexdsp.so.1
+usr/lib32/libspeexdsp.so.1.5.0
+usr/lib32/pkgconfig/speex.pc
+usr/lib32/pkgconfig/speexdsp.pc
+usr/lib32/libdvdread.so
+usr/lib32/libdvdread.so.4
+usr/lib32/libdvdread.so.4.1.2
+usr/lib32/pkgconfig/dvdread.pc
+usr/lib32/libdvdnav.so
+usr/lib32/libdvdnav.so.4
+usr/lib32/libdvdnav.so.4.1.2
+usr/lib32/libdvdnavmini.so
+usr/lib32/libdvdnavmini.so.4
+usr/lib32/libdvdnavmini.so.4.1.2
+usr/lib32/pkgconfig/dvdnav.pc
+usr/lib32/pkgconfig/dvdnavmini.pc
+usr/lib32/libv4l/ov511-decomp
+usr/lib32/libv4l/ov518-decomp
+usr/lib32/libv4l/v4l1compat.so
+usr/lib32/libv4l/v4l2convert.so
+usr/lib32/libv4l1.so
+usr/lib32/libv4l1.so.0
+usr/lib32/libv4l2.so
+usr/lib32/libv4l2.so.0
+usr/lib32/libv4lconvert.so
+usr/lib32/libv4lconvert.so.0
+usr/lib32/pkgconfig/libv4l1.pc
+usr/lib32/pkgconfig/libv4l2.pc
+usr/lib32/pkgconfig/libv4lconvert.pc
+usr/lib32/libid3tag.so
+usr/lib32/libid3tag.so.0
+usr/lib32/libid3tag.so.0.3.0
+usr/lib32/pkgconfig/id3tag.pc
+usr/lib32/libshout.so
+usr/lib32/libshout.so.3
+usr/lib32/libshout.so.3.2.0
+usr/lib32/pkgconfig/shout.pc
+usr/lib32/sidplay/builders/libhardsid-builder.so
+usr/lib32/sidplay/builders/libhardsid-builder.so.0
+usr/lib32/sidplay/builders/libhardsid-builder.so.0.0.1
+usr/lib32/sidplay/builders/libresid-builder.so
+usr/lib32/sidplay/builders/libresid-builder.so.0
+usr/lib32/sidplay/builders/libresid-builder.so.0.0.1
+usr/lib32/libsidplay2.so
+usr/lib32/libsidplay2.so.1
+usr/lib32/libsidplay2.so.1.0.1
+usr/lib32/pkgconfig/libsidplay2.pc
+usr/lib32/libsidutils.so
+usr/lib32/libsidutils.so.0
+usr/lib32/libsidutils.so.0.0.4
+usr/lib32/pkgconfig/libsidutils.pc
+usr/lib32/libsidplay.so
+usr/lib32/libsidplay.so.1
+usr/lib32/libsidplay.so.1.0.3
+usr/lib32/libx264.so
+usr/lib32/pkgconfig/x264.pc
+usr/lib32/libiec61883.so
+usr/lib32/libiec61883.so.0*
+usr/lib32/pkgconfig/libiec61883.pc
+usr/lib32/liba52.so
+usr/lib32/liba52.so.0
+usr/lib32/liba52.so.0.0.0
+usr/lib32/libmimic.so
+usr/lib32/libmimic.so.0
+usr/lib32/libmimic.so.0.0.1
+usr/lib32/pkgconfig/libmimic.pc
+usr/lib32/libmms.so
+usr/lib32/libmms.so.0
+usr/lib32/libmms.so.0.0.2
+usr/lib32/pkgconfig/libmms.pc
+usr/lib32/libvisual-0.4.so
+usr/lib32/libvisual-0.4.so.0
+usr/lib32/libvisual-0.4.so.0.0.0
+usr/lib32/pkgconfig/libvisual-0.4.pc
+usr/lib32/libmpeg2.so
+usr/lib32/libmpeg2.so.0
+usr/lib32/libmpeg2.so.0.1.0
+usr/lib32/pkgconfig/libmpeg2.pc
+usr/lib32/libmpeg2convert.so
+usr/lib32/libmpeg2convert.so.0
+usr/lib32/libmpeg2convert.so.0.0.0
+usr/lib32/pkgconfig/libmpeg2convert.pc
+usr/lib32/liboil-0.3.so
+usr/lib32/liboil-0.3.so.0
+usr/lib32/liboil-0.3.so.0.3.0
+usr/lib32/pkgconfig/liboil-0.3.pc
+usr/lib32/libieee1284.so
+usr/lib32/libieee1284.so.3
+usr/lib32/libieee1284.so.3.2.2
+usr/lib32/libfribidi.so
+usr/lib32/libfribidi.so.0
+usr/lib32/libfribidi.so.0.3.4
+usr/lib32/pkgconfig/fribidi.pc
+usr/lib32/libiso9660++.so
+usr/lib32/libiso9660++.so.0
+usr/lib32/libiso9660++.so.0.0.0
+usr/lib32/libiso9660.so
+usr/lib32/libiso9660.so.9
+usr/lib32/libiso9660.so.9.0.0
+usr/lib32/pkgconfig/libiso9660++.pc
+usr/lib32/pkgconfig/libiso9660.pc
+usr/lib32/libcdio.so
+usr/lib32/libcdio.so.15.0.0
+usr/lib32/libcdio.so.15
+usr/lib32/pkgconfig/libcdio.pc
+usr/lib32/libcdio++.so
+usr/lib32/libcdio++.so.0
+usr/lib32/libcdio++.so.0.0.2
+usr/lib32/pkgconfig/libcdio++.pc
+usr/lib32/libudf.so
+usr/lib32/libudf.so.0
+usr/lib32/libudf.so.0.0.0
+usr/lib32/pkgconfig/libudf.pc
+usr/lib32/libcdio_cdda.so
+usr/lib32/libcdio_cdda.so.1
+usr/lib32/libcdio_cdda.so.1.0.0
+usr/lib32/libcdio_paranoia.so
+usr/lib32/libcdio_paranoia.so.1
+usr/lib32/libcdio_paranoia.so.1.0.0
+usr/lib32/pkgconfig/libcdio_cdda.pc
+usr/lib32/pkgconfig/libcdio_paranoia.pc
+usr/lib32/libavcodec.so
+usr/lib32/libavcodec.so.53
+usr/lib32/libavcodec.so.53.61.100
+usr/lib32/pkgconfig/libavcodec.pc
+usr/lib32/libavfilter.so
+usr/lib32/libavfilter.so.2
+usr/lib32/libavfilter.so.2.61.100
+usr/lib32/pkgconfig/libavfilter.pc
+usr/lib32/libavformat.so
+usr/lib32/libavformat.so.53
+usr/lib32/libavformat.so.53.32.100
+usr/lib32/pkgconfig/libavformat.pc
+usr/lib32/libavutil.so
+usr/lib32/libavutil.so.51*
+usr/lib32/pkgconfig/libavutil.pc
+usr/lib32/libdv.so
+usr/lib32/libdv.so.4
+usr/lib32/libdv.so.4.0.3
+usr/lib32/pkgconfig/libdv.pc
+usr/lib32/libgphoto2.so
+usr/lib32/libgphoto2.so.6
+usr/lib32/libgphoto2.so.6.0.0
+usr/lib32/libgphoto2/2.5.3.1/ptp2.so
+usr/lib32/libgphoto2_port.so
+usr/lib32/libgphoto2_port.so.10
+usr/lib32/libgphoto2_port.so.10.1.1
+usr/lib32/libgphoto2_port/0.10.0/disk.so
+usr/lib32/libgphoto2_port/0.10.0/ptpip.so
+usr/lib32/libgphoto2_port/0.10.0/usb1.so
+usr/lib32/libgphoto2_port/0.10.0/usbdiskdirect.so
+usr/lib32/libgphoto2_port/0.10.0/usbscsi.so
+usr/lib32/pkgconfig/libgphoto2.pc
+usr/lib32/pkgconfig/libgphoto2_port.pc
+usr/lib32/libsane.so
+usr/lib32/libsane.so.1
+usr/lib32/libsane.so.1.0.24
+usr/lib32/pkgconfig/sane-backends.pc
+usr/lib32/sane/libsane-abaton.so
+usr/lib32/sane/libsane-abaton.so.1
+usr/lib32/sane/libsane-abaton.so.1.0.24
+usr/lib32/sane/libsane-agfafocus.so
+usr/lib32/sane/libsane-agfafocus.so.1
+usr/lib32/sane/libsane-agfafocus.so.1.0.24
+usr/lib32/sane/libsane-apple.so
+usr/lib32/sane/libsane-apple.so.1
+usr/lib32/sane/libsane-apple.so.1.0.24
+usr/lib32/sane/libsane-artec.so
+usr/lib32/sane/libsane-artec.so.1
+usr/lib32/sane/libsane-artec.so.1.0.24
+usr/lib32/sane/libsane-artec_eplus48u.so
+usr/lib32/sane/libsane-artec_eplus48u.so.1
+usr/lib32/sane/libsane-artec_eplus48u.so.1.0.24
+usr/lib32/sane/libsane-as6e.so
+usr/lib32/sane/libsane-as6e.so.1
+usr/lib32/sane/libsane-as6e.so.1.0.24
+usr/lib32/sane/libsane-avision.so
+usr/lib32/sane/libsane-avision.so.1
+usr/lib32/sane/libsane-avision.so.1.0.24
+usr/lib32/sane/libsane-bh.so
+usr/lib32/sane/libsane-bh.so.1
+usr/lib32/sane/libsane-bh.so.1.0.24
+usr/lib32/sane/libsane-canon.so
+usr/lib32/sane/libsane-canon.so.1
+usr/lib32/sane/libsane-canon.so.1.0.24
+usr/lib32/sane/libsane-canon630u.so
+usr/lib32/sane/libsane-canon630u.so.1
+usr/lib32/sane/libsane-canon630u.so.1.0.24
+usr/lib32/sane/libsane-canon_dr.so
+usr/lib32/sane/libsane-canon_dr.so.1
+usr/lib32/sane/libsane-canon_dr.so.1.0.24
+usr/lib32/sane/libsane-canon_pp.so
+usr/lib32/sane/libsane-canon_pp.so.1
+usr/lib32/sane/libsane-canon_pp.so.1.0.24
+usr/lib32/sane/libsane-cardscan.so
+usr/lib32/sane/libsane-cardscan.so.1
+usr/lib32/sane/libsane-cardscan.so.1.0.24
+usr/lib32/sane/libsane-coolscan.so
+usr/lib32/sane/libsane-coolscan.so.1
+usr/lib32/sane/libsane-coolscan.so.1.0.24
+usr/lib32/sane/libsane-coolscan2.so
+usr/lib32/sane/libsane-coolscan2.so.1
+usr/lib32/sane/libsane-coolscan2.so.1.0.24
+usr/lib32/sane/libsane-coolscan3.so
+usr/lib32/sane/libsane-coolscan3.so.1
+usr/lib32/sane/libsane-coolscan3.so.1.0.24
+usr/lib32/sane/libsane-dc210.so
+usr/lib32/sane/libsane-dc210.so.1
+usr/lib32/sane/libsane-dc210.so.1.0.24
+usr/lib32/sane/libsane-dc240.so
+usr/lib32/sane/libsane-dc240.so.1
+usr/lib32/sane/libsane-dc240.so.1.0.24
+usr/lib32/sane/libsane-dc25.so
+usr/lib32/sane/libsane-dc25.so.1
+usr/lib32/sane/libsane-dc25.so.1.0.24
+usr/lib32/sane/libsane-dell1600n_net.so
+usr/lib32/sane/libsane-dell1600n_net.so.1
+usr/lib32/sane/libsane-dell1600n_net.so.1.0.24
+usr/lib32/sane/libsane-dll.so
+usr/lib32/sane/libsane-dll.so.1
+usr/lib32/sane/libsane-dll.so.1.0.24
+usr/lib32/sane/libsane-dmc.so
+usr/lib32/sane/libsane-dmc.so.1
+usr/lib32/sane/libsane-dmc.so.1.0.24
+usr/lib32/sane/libsane-epjitsu.so
+usr/lib32/sane/libsane-epjitsu.so.1
+usr/lib32/sane/libsane-epjitsu.so.1.0.24
+usr/lib32/sane/libsane-epson.so
+usr/lib32/sane/libsane-epson.so.1
+usr/lib32/sane/libsane-epson.so.1.0.24
+usr/lib32/sane/libsane-epson2.so
+usr/lib32/sane/libsane-epson2.so.1
+usr/lib32/sane/libsane-epson2.so.1.0.24
+usr/lib32/sane/libsane-fujitsu.so
+usr/lib32/sane/libsane-fujitsu.so.1
+usr/lib32/sane/libsane-fujitsu.so.1.0.24
+usr/lib32/sane/libsane-genesys.so
+usr/lib32/sane/libsane-genesys.so.1
+usr/lib32/sane/libsane-genesys.so.1.0.24
+usr/lib32/sane/libsane-gt68xx.so
+usr/lib32/sane/libsane-gt68xx.so.1
+usr/lib32/sane/libsane-gt68xx.so.1.0.24
+usr/lib32/sane/libsane-hp.so
+usr/lib32/sane/libsane-hp.so.1
+usr/lib32/sane/libsane-hp.so.1.0.24
+usr/lib32/sane/libsane-hp3500.so
+usr/lib32/sane/libsane-hp3500.so.1
+usr/lib32/sane/libsane-hp3500.so.1.0.24
+usr/lib32/sane/libsane-hp3900.so
+usr/lib32/sane/libsane-hp3900.so.1
+usr/lib32/sane/libsane-hp3900.so.1.0.24
+usr/lib32/sane/libsane-hp4200.so
+usr/lib32/sane/libsane-hp4200.so.1
+usr/lib32/sane/libsane-hp4200.so.1.0.24
+usr/lib32/sane/libsane-hp5400.so
+usr/lib32/sane/libsane-hp5400.so.1
+usr/lib32/sane/libsane-hp5400.so.1.0.24
+usr/lib32/sane/libsane-hp5590.so
+usr/lib32/sane/libsane-hp5590.so.1
+usr/lib32/sane/libsane-hp5590.so.1.0.24
+usr/lib32/sane/libsane-hpljm1005.so
+usr/lib32/sane/libsane-hpljm1005.so.1
+usr/lib32/sane/libsane-hpljm1005.so.1.0.24
+usr/lib32/sane/libsane-hpsj5s.so
+usr/lib32/sane/libsane-hpsj5s.so.1
+usr/lib32/sane/libsane-hpsj5s.so.1.0.24
+usr/lib32/sane/libsane-hs2p.so
+usr/lib32/sane/libsane-hs2p.so.1
+usr/lib32/sane/libsane-hs2p.so.1.0.24
+usr/lib32/sane/libsane-ibm.so
+usr/lib32/sane/libsane-ibm.so.1
+usr/lib32/sane/libsane-ibm.so.1.0.24
+usr/lib32/sane/libsane-kodak.so
+usr/lib32/sane/libsane-kodak.so.1
+usr/lib32/sane/libsane-kodak.so.1.0.24
+usr/lib32/sane/libsane-kodakaio.so
+usr/lib32/sane/libsane-kodakaio.so.1
+usr/lib32/sane/libsane-kodakaio.so.1.0.24
+usr/lib32/sane/libsane-kvs1025.so
+usr/lib32/sane/libsane-kvs1025.so.1
+usr/lib32/sane/libsane-kvs1025.so.1.0.24
+usr/lib32/sane/libsane-kvs20xx.so
+usr/lib32/sane/libsane-kvs20xx.so.1
+usr/lib32/sane/libsane-kvs20xx.so.1.0.24
+usr/lib32/sane/libsane-leo.so
+usr/lib32/sane/libsane-leo.so.1
+usr/lib32/sane/libsane-leo.so.1.0.24
+usr/lib32/sane/libsane-lexmark.so
+usr/lib32/sane/libsane-lexmark.so.1
+usr/lib32/sane/libsane-lexmark.so.1.0.24
+usr/lib32/sane/libsane-ma1509.so
+usr/lib32/sane/libsane-ma1509.so.1
+usr/lib32/sane/libsane-ma1509.so.1.0.24
+usr/lib32/sane/libsane-magicolor.so
+usr/lib32/sane/libsane-magicolor.so.1
+usr/lib32/sane/libsane-magicolor.so.1.0.24
+usr/lib32/sane/libsane-matsushita.so
+usr/lib32/sane/libsane-matsushita.so.1
+usr/lib32/sane/libsane-matsushita.so.1.0.24
+usr/lib32/sane/libsane-microtek.so
+usr/lib32/sane/libsane-microtek.so.1
+usr/lib32/sane/libsane-microtek.so.1.0.24
+usr/lib32/sane/libsane-microtek2.so
+usr/lib32/sane/libsane-microtek2.so.1
+usr/lib32/sane/libsane-microtek2.so.1.0.24
+usr/lib32/sane/libsane-mustek.so
+usr/lib32/sane/libsane-mustek.so.1
+usr/lib32/sane/libsane-mustek.so.1.0.24
+usr/lib32/sane/libsane-mustek_pp.so
+usr/lib32/sane/libsane-mustek_pp.so.1
+usr/lib32/sane/libsane-mustek_pp.so.1.0.24
+usr/lib32/sane/libsane-mustek_usb.so
+usr/lib32/sane/libsane-mustek_usb.so.1
+usr/lib32/sane/libsane-mustek_usb.so.1.0.24
+usr/lib32/sane/libsane-nec.so
+usr/lib32/sane/libsane-nec.so.1
+usr/lib32/sane/libsane-nec.so.1.0.24
+usr/lib32/sane/libsane-net.so
+usr/lib32/sane/libsane-net.so.1
+usr/lib32/sane/libsane-net.so.1.0.24
+usr/lib32/sane/libsane-niash.so
+usr/lib32/sane/libsane-niash.so.1
+usr/lib32/sane/libsane-niash.so.1.0.24
+usr/lib32/sane/libsane-p5.so
+usr/lib32/sane/libsane-p5.so.1
+usr/lib32/sane/libsane-p5.so.1.0.24
+usr/lib32/sane/libsane-pie.so
+usr/lib32/sane/libsane-pie.so.1
+usr/lib32/sane/libsane-pie.so.1.0.24
+usr/lib32/sane/libsane-pixma.so
+usr/lib32/sane/libsane-pixma.so.1
+usr/lib32/sane/libsane-pixma.so.1.0.24
+usr/lib32/sane/libsane-plustek.so
+usr/lib32/sane/libsane-plustek.so.1
+usr/lib32/sane/libsane-plustek.so.1.0.24
+usr/lib32/sane/libsane-plustek_pp.so
+usr/lib32/sane/libsane-plustek_pp.so.1
+usr/lib32/sane/libsane-plustek_pp.so.1.0.24
+usr/lib32/sane/libsane-qcam.so
+usr/lib32/sane/libsane-qcam.so.1
+usr/lib32/sane/libsane-qcam.so.1.0.24
+usr/lib32/sane/libsane-ricoh.so
+usr/lib32/sane/libsane-ricoh.so.1
+usr/lib32/sane/libsane-ricoh.so.1.0.24
+usr/lib32/sane/libsane-rts8891.so
+usr/lib32/sane/libsane-rts8891.so.1
+usr/lib32/sane/libsane-rts8891.so.1.0.24
+usr/lib32/sane/libsane-s9036.so
+usr/lib32/sane/libsane-s9036.so.1
+usr/lib32/sane/libsane-s9036.so.1.0.24
+usr/lib32/sane/libsane-sceptre.so
+usr/lib32/sane/libsane-sceptre.so.1
+usr/lib32/sane/libsane-sceptre.so.1.0.24
+usr/lib32/sane/libsane-sharp.so
+usr/lib32/sane/libsane-sharp.so.1
+usr/lib32/sane/libsane-sharp.so.1.0.24
+usr/lib32/sane/libsane-sm3600.so
+usr/lib32/sane/libsane-sm3600.so.1
+usr/lib32/sane/libsane-sm3600.so.1.0.24
+usr/lib32/sane/libsane-sm3840.so
+usr/lib32/sane/libsane-sm3840.so.1
+usr/lib32/sane/libsane-sm3840.so.1.0.24
+usr/lib32/sane/libsane-snapscan.so
+usr/lib32/sane/libsane-snapscan.so.1
+usr/lib32/sane/libsane-snapscan.so.1.0.24
+usr/lib32/sane/libsane-sp15c.so
+usr/lib32/sane/libsane-sp15c.so.1
+usr/lib32/sane/libsane-sp15c.so.1.0.24
+usr/lib32/sane/libsane-st400.so
+usr/lib32/sane/libsane-st400.so.1
+usr/lib32/sane/libsane-st400.so.1.0.24
+usr/lib32/sane/libsane-stv680.so
+usr/lib32/sane/libsane-stv680.so.1
+usr/lib32/sane/libsane-stv680.so.1.0.24
+usr/lib32/sane/libsane-tamarack.so
+usr/lib32/sane/libsane-tamarack.so.1
+usr/lib32/sane/libsane-tamarack.so.1.0.24
+usr/lib32/sane/libsane-teco1.so
+usr/lib32/sane/libsane-teco1.so.1
+usr/lib32/sane/libsane-teco1.so.1.0.24
+usr/lib32/sane/libsane-teco2.so
+usr/lib32/sane/libsane-teco2.so.1
+usr/lib32/sane/libsane-teco2.so.1.0.24
+usr/lib32/sane/libsane-teco3.so
+usr/lib32/sane/libsane-teco3.so.1
+usr/lib32/sane/libsane-teco3.so.1.0.24
+usr/lib32/sane/libsane-test.so
+usr/lib32/sane/libsane-test.so.1
+usr/lib32/sane/libsane-test.so.1.0.24
+usr/lib32/sane/libsane-u12.so
+usr/lib32/sane/libsane-u12.so.1
+usr/lib32/sane/libsane-u12.so.1.0.24
+usr/lib32/sane/libsane-umax.so
+usr/lib32/sane/libsane-umax.so.1
+usr/lib32/sane/libsane-umax.so.1.0.24
+usr/lib32/sane/libsane-umax1220u.so
+usr/lib32/sane/libsane-umax1220u.so.1
+usr/lib32/sane/libsane-umax1220u.so.1.0.24
+usr/lib32/sane/libsane-umax_pp.so
+usr/lib32/sane/libsane-umax_pp.so.1
+usr/lib32/sane/libsane-umax_pp.so.1.0.24
+usr/lib32/sane/libsane-xerox_mfp.so
+usr/lib32/sane/libsane-xerox_mfp.so.1
+usr/lib32/sane/libsane-xerox_mfp.so.1.0.24
+usr/lib32/libtag.so
+usr/lib32/libtag.so.1
+usr/lib32/libtag.so.1.12.0
+usr/lib32/libtag_c.so
+usr/lib32/libtag_c.so.0
+usr/lib32/libtag_c.so.0.0.0
+usr/lib32/pkgconfig/taglib.pc
+usr/lib32/pkgconfig/taglib_c.pc
+usr/lib32/libofa.so
+usr/lib32/libofa.so.0
+usr/lib32/libofa.so.0.0.0
+usr/lib32/pkgconfig/libofa.pc

app-emulation/emul-linux-x86-medialibs/files/remove-native-20140508-r4

@@ -0,0 +1,491 @@
+usr/lib32/libxvidcore.so
+usr/lib32/libxvidcore.so.4
+usr/lib32/libxvidcore.so.4.3
+usr/lib32/libmp3lame.so
+usr/lib32/libmp3lame.so.0
+usr/lib32/libmp3lame.so.0.0.0
+usr/lib32/libvpx.so
+usr/lib32/libvpx.so.1*
+usr/lib32/pkgconfig/vpx.pc
+usr/lib32/libfaac.so
+usr/lib32/libfaac.so.0
+usr/lib32/libfaac.so.0.0.0
+usr/lib32/libfaad.so
+usr/lib32/libfaad.so.2
+usr/lib32/libfaad.so.2.0.0
+usr/lib32/libmp4ff.so
+usr/lib32/libmp4ff.so.0
+usr/lib32/libmp4ff.so.0.0.0
+usr/lib32/libtheora.so
+usr/lib32/libtheora.so.0
+usr/lib32/libtheora.so.0.3.10
+usr/lib32/libtheoradec.so
+usr/lib32/libtheoradec.so.1
+usr/lib32/libtheoradec.so.1.1.4
+usr/lib32/libtheoraenc.so
+usr/lib32/libtheoraenc.so.1
+usr/lib32/libtheoraenc.so.1.1.2
+usr/lib32/pkgconfig/theora.pc
+usr/lib32/pkgconfig/theoradec.pc
+usr/lib32/pkgconfig/theoraenc.pc
+usr/lib32/libcuefile.so
+usr/lib32/libcuefile.so.0
+usr/lib32/libcuefile.so.0.0.0
+usr/lib32/libreplaygain.so
+usr/lib32/libreplaygain.so.1
+usr/lib32/libreplaygain.so.1.0.0
+usr/lib32/libmad.so
+usr/lib32/libmad.so.0
+usr/lib32/libmad.so.0.2.1
+usr/lib32/pkgconfig/mad.pc
+usr/lib32/libdca.so
+usr/lib32/libdca.so.0
+usr/lib32/libdca.so.0.0.0
+usr/lib32/pkgconfig/libdca.pc
+usr/lib32/pkgconfig/libdts.pc
+usr/lib32/libspeex.so
+usr/lib32/libspeex.so.1
+usr/lib32/libspeex.so.1.5.0
+usr/lib32/libspeexdsp.so
+usr/lib32/libspeexdsp.so.1
+usr/lib32/libspeexdsp.so.1.5.0
+usr/lib32/pkgconfig/speex.pc
+usr/lib32/pkgconfig/speexdsp.pc
+usr/lib32/libdvdread.so
+usr/lib32/libdvdread.so.4
+usr/lib32/libdvdread.so.4.1.2
+usr/lib32/pkgconfig/dvdread.pc
+usr/lib32/libdvdnav.so
+usr/lib32/libdvdnav.so.4
+usr/lib32/libdvdnav.so.4.1.2
+usr/lib32/libdvdnavmini.so
+usr/lib32/libdvdnavmini.so.4
+usr/lib32/libdvdnavmini.so.4.1.2
+usr/lib32/pkgconfig/dvdnav.pc
+usr/lib32/pkgconfig/dvdnavmini.pc
+usr/lib32/libv4l/ov511-decomp
+usr/lib32/libv4l/ov518-decomp
+usr/lib32/libv4l/v4l1compat.so
+usr/lib32/libv4l/v4l2convert.so
+usr/lib32/libv4l1.so
+usr/lib32/libv4l1.so.0
+usr/lib32/libv4l2.so
+usr/lib32/libv4l2.so.0
+usr/lib32/libv4lconvert.so
+usr/lib32/libv4lconvert.so.0
+usr/lib32/pkgconfig/libv4l1.pc
+usr/lib32/pkgconfig/libv4l2.pc
+usr/lib32/pkgconfig/libv4lconvert.pc
+usr/lib32/libid3tag.so
+usr/lib32/libid3tag.so.0
+usr/lib32/libid3tag.so.0.3.0
+usr/lib32/pkgconfig/id3tag.pc
+usr/lib32/libshout.so
+usr/lib32/libshout.so.3
+usr/lib32/libshout.so.3.2.0
+usr/lib32/pkgconfig/shout.pc
+usr/lib32/sidplay/builders/libhardsid-builder.so
+usr/lib32/sidplay/builders/libhardsid-builder.so.0
+usr/lib32/sidplay/builders/libhardsid-builder.so.0.0.1
+usr/lib32/sidplay/builders/libresid-builder.so
+usr/lib32/sidplay/builders/libresid-builder.so.0
+usr/lib32/sidplay/builders/libresid-builder.so.0.0.1
+usr/lib32/libsidplay2.so
+usr/lib32/libsidplay2.so.1
+usr/lib32/libsidplay2.so.1.0.1
+usr/lib32/pkgconfig/libsidplay2.pc
+usr/lib32/libsidutils.so
+usr/lib32/libsidutils.so.0
+usr/lib32/libsidutils.so.0.0.4
+usr/lib32/pkgconfig/libsidutils.pc
+usr/lib32/libsidplay.so
+usr/lib32/libsidplay.so.1
+usr/lib32/libsidplay.so.1.0.3
+usr/lib32/libx264.so
+usr/lib32/pkgconfig/x264.pc
+usr/lib32/libiec61883.so
+usr/lib32/libiec61883.so.0*
+usr/lib32/pkgconfig/libiec61883.pc
+usr/lib32/liba52.so
+usr/lib32/liba52.so.0
+usr/lib32/liba52.so.0.0.0
+usr/lib32/libmimic.so
+usr/lib32/libmimic.so.0
+usr/lib32/libmimic.so.0.0.1
+usr/lib32/pkgconfig/libmimic.pc
+usr/lib32/libmms.so
+usr/lib32/libmms.so.0
+usr/lib32/libmms.so.0.0.2
+usr/lib32/pkgconfig/libmms.pc
+usr/lib32/libvisual-0.4.so
+usr/lib32/libvisual-0.4.so.0
+usr/lib32/libvisual-0.4.so.0.0.0
+usr/lib32/pkgconfig/libvisual-0.4.pc
+usr/lib32/libmpeg2.so
+usr/lib32/libmpeg2.so.0
+usr/lib32/libmpeg2.so.0.1.0
+usr/lib32/pkgconfig/libmpeg2.pc
+usr/lib32/libmpeg2convert.so
+usr/lib32/libmpeg2convert.so.0
+usr/lib32/libmpeg2convert.so.0.0.0
+usr/lib32/pkgconfig/libmpeg2convert.pc
+usr/lib32/liboil-0.3.so
+usr/lib32/liboil-0.3.so.0
+usr/lib32/liboil-0.3.so.0.3.0
+usr/lib32/pkgconfig/liboil-0.3.pc
+usr/lib32/libieee1284.so
+usr/lib32/libieee1284.so.3
+usr/lib32/libieee1284.so.3.2.2
+usr/lib32/libfribidi.so
+usr/lib32/libfribidi.so.0
+usr/lib32/libfribidi.so.0.3.4
+usr/lib32/pkgconfig/fribidi.pc
+usr/lib32/libiso9660++.so
+usr/lib32/libiso9660++.so.0
+usr/lib32/libiso9660++.so.0.0.0
+usr/lib32/libiso9660.so
+usr/lib32/libiso9660.so.9
+usr/lib32/libiso9660.so.9.0.0
+usr/lib32/pkgconfig/libiso9660++.pc
+usr/lib32/pkgconfig/libiso9660.pc
+usr/lib32/libcdio.so
+usr/lib32/libcdio.so.15.0.0
+usr/lib32/libcdio.so.15
+usr/lib32/pkgconfig/libcdio.pc
+usr/lib32/libcdio++.so
+usr/lib32/libcdio++.so.0
+usr/lib32/libcdio++.so.0.0.2
+usr/lib32/pkgconfig/libcdio++.pc
+usr/lib32/libudf.so
+usr/lib32/libudf.so.0
+usr/lib32/libudf.so.0.0.0
+usr/lib32/pkgconfig/libudf.pc
+usr/lib32/libcdio_cdda.so
+usr/lib32/libcdio_cdda.so.1
+usr/lib32/libcdio_cdda.so.1.0.0
+usr/lib32/libcdio_paranoia.so
+usr/lib32/libcdio_paranoia.so.1
+usr/lib32/libcdio_paranoia.so.1.0.0
+usr/lib32/pkgconfig/libcdio_cdda.pc
+usr/lib32/pkgconfig/libcdio_paranoia.pc
+usr/lib32/libavcodec.so
+usr/lib32/libavcodec.so.53
+usr/lib32/libavcodec.so.53.61.100
+usr/lib32/pkgconfig/libavcodec.pc
+usr/lib32/libavfilter.so
+usr/lib32/libavfilter.so.2
+usr/lib32/libavfilter.so.2.61.100
+usr/lib32/pkgconfig/libavfilter.pc
+usr/lib32/libavformat.so
+usr/lib32/libavformat.so.53
+usr/lib32/libavformat.so.53.32.100
+usr/lib32/pkgconfig/libavformat.pc
+usr/lib32/libavutil.so
+usr/lib32/libavutil.so.51*
+usr/lib32/pkgconfig/libavutil.pc
+usr/lib32/libdv.so
+usr/lib32/libdv.so.4
+usr/lib32/libdv.so.4.0.3
+usr/lib32/pkgconfig/libdv.pc
+usr/lib32/libgphoto2.so
+usr/lib32/libgphoto2.so.6
+usr/lib32/libgphoto2.so.6.0.0
+usr/lib32/libgphoto2/2.5.3.1/ptp2.so
+usr/lib32/libgphoto2_port.so
+usr/lib32/libgphoto2_port.so.10
+usr/lib32/libgphoto2_port.so.10.1.1
+usr/lib32/libgphoto2_port/0.10.0/disk.so
+usr/lib32/libgphoto2_port/0.10.0/ptpip.so
+usr/lib32/libgphoto2_port/0.10.0/usb1.so
+usr/lib32/libgphoto2_port/0.10.0/usbdiskdirect.so
+usr/lib32/libgphoto2_port/0.10.0/usbscsi.so
+usr/lib32/pkgconfig/libgphoto2.pc
+usr/lib32/pkgconfig/libgphoto2_port.pc
+usr/lib32/libsane.so
+usr/lib32/libsane.so.1
+usr/lib32/libsane.so.1.0.24
+usr/lib32/pkgconfig/sane-backends.pc
+usr/lib32/sane/libsane-abaton.so
+usr/lib32/sane/libsane-abaton.so.1
+usr/lib32/sane/libsane-abaton.so.1.0.24
+usr/lib32/sane/libsane-agfafocus.so
+usr/lib32/sane/libsane-agfafocus.so.1
+usr/lib32/sane/libsane-agfafocus.so.1.0.24
+usr/lib32/sane/libsane-apple.so
+usr/lib32/sane/libsane-apple.so.1
+usr/lib32/sane/libsane-apple.so.1.0.24
+usr/lib32/sane/libsane-artec.so
+usr/lib32/sane/libsane-artec.so.1
+usr/lib32/sane/libsane-artec.so.1.0.24
+usr/lib32/sane/libsane-artec_eplus48u.so
+usr/lib32/sane/libsane-artec_eplus48u.so.1
+usr/lib32/sane/libsane-artec_eplus48u.so.1.0.24
+usr/lib32/sane/libsane-as6e.so
+usr/lib32/sane/libsane-as6e.so.1
+usr/lib32/sane/libsane-as6e.so.1.0.24
+usr/lib32/sane/libsane-avision.so
+usr/lib32/sane/libsane-avision.so.1
+usr/lib32/sane/libsane-avision.so.1.0.24
+usr/lib32/sane/libsane-bh.so
+usr/lib32/sane/libsane-bh.so.1
+usr/lib32/sane/libsane-bh.so.1.0.24
+usr/lib32/sane/libsane-canon.so
+usr/lib32/sane/libsane-canon.so.1
+usr/lib32/sane/libsane-canon.so.1.0.24
+usr/lib32/sane/libsane-canon630u.so
+usr/lib32/sane/libsane-canon630u.so.1
+usr/lib32/sane/libsane-canon630u.so.1.0.24
+usr/lib32/sane/libsane-canon_dr.so
+usr/lib32/sane/libsane-canon_dr.so.1
+usr/lib32/sane/libsane-canon_dr.so.1.0.24
+usr/lib32/sane/libsane-canon_pp.so
+usr/lib32/sane/libsane-canon_pp.so.1
+usr/lib32/sane/libsane-canon_pp.so.1.0.24
+usr/lib32/sane/libsane-cardscan.so
+usr/lib32/sane/libsane-cardscan.so.1
+usr/lib32/sane/libsane-cardscan.so.1.0.24
+usr/lib32/sane/libsane-coolscan.so
+usr/lib32/sane/libsane-coolscan.so.1
+usr/lib32/sane/libsane-coolscan.so.1.0.24
+usr/lib32/sane/libsane-coolscan2.so
+usr/lib32/sane/libsane-coolscan2.so.1
+usr/lib32/sane/libsane-coolscan2.so.1.0.24
+usr/lib32/sane/libsane-coolscan3.so
+usr/lib32/sane/libsane-coolscan3.so.1
+usr/lib32/sane/libsane-coolscan3.so.1.0.24
+usr/lib32/sane/libsane-dc210.so
+usr/lib32/sane/libsane-dc210.so.1
+usr/lib32/sane/libsane-dc210.so.1.0.24
+usr/lib32/sane/libsane-dc240.so
+usr/lib32/sane/libsane-dc240.so.1
+usr/lib32/sane/libsane-dc240.so.1.0.24
+usr/lib32/sane/libsane-dc25.so
+usr/lib32/sane/libsane-dc25.so.1
+usr/lib32/sane/libsane-dc25.so.1.0.24
+usr/lib32/sane/libsane-dell1600n_net.so
+usr/lib32/sane/libsane-dell1600n_net.so.1
+usr/lib32/sane/libsane-dell1600n_net.so.1.0.24
+usr/lib32/sane/libsane-dll.so
+usr/lib32/sane/libsane-dll.so.1
+usr/lib32/sane/libsane-dll.so.1.0.24
+usr/lib32/sane/libsane-dmc.so
+usr/lib32/sane/libsane-dmc.so.1
+usr/lib32/sane/libsane-dmc.so.1.0.24
+usr/lib32/sane/libsane-epjitsu.so
+usr/lib32/sane/libsane-epjitsu.so.1
+usr/lib32/sane/libsane-epjitsu.so.1.0.24
+usr/lib32/sane/libsane-epson.so
+usr/lib32/sane/libsane-epson.so.1
+usr/lib32/sane/libsane-epson.so.1.0.24
+usr/lib32/sane/libsane-epson2.so
+usr/lib32/sane/libsane-epson2.so.1
+usr/lib32/sane/libsane-epson2.so.1.0.24
+usr/lib32/sane/libsane-fujitsu.so
+usr/lib32/sane/libsane-fujitsu.so.1
+usr/lib32/sane/libsane-fujitsu.so.1.0.24
+usr/lib32/sane/libsane-genesys.so
+usr/lib32/sane/libsane-genesys.so.1
+usr/lib32/sane/libsane-genesys.so.1.0.24
+usr/lib32/sane/libsane-gt68xx.so
+usr/lib32/sane/libsane-gt68xx.so.1
+usr/lib32/sane/libsane-gt68xx.so.1.0.24
+usr/lib32/sane/libsane-hp.so
+usr/lib32/sane/libsane-hp.so.1
+usr/lib32/sane/libsane-hp.so.1.0.24
+usr/lib32/sane/libsane-hp3500.so
+usr/lib32/sane/libsane-hp3500.so.1
+usr/lib32/sane/libsane-hp3500.so.1.0.24
+usr/lib32/sane/libsane-hp3900.so
+usr/lib32/sane/libsane-hp3900.so.1
+usr/lib32/sane/libsane-hp3900.so.1.0.24
+usr/lib32/sane/libsane-hp4200.so
+usr/lib32/sane/libsane-hp4200.so.1
+usr/lib32/sane/libsane-hp4200.so.1.0.24
+usr/lib32/sane/libsane-hp5400.so
+usr/lib32/sane/libsane-hp5400.so.1
+usr/lib32/sane/libsane-hp5400.so.1.0.24
+usr/lib32/sane/libsane-hp5590.so
+usr/lib32/sane/libsane-hp5590.so.1
+usr/lib32/sane/libsane-hp5590.so.1.0.24
+usr/lib32/sane/libsane-hpljm1005.so
+usr/lib32/sane/libsane-hpljm1005.so.1
+usr/lib32/sane/libsane-hpljm1005.so.1.0.24
+usr/lib32/sane/libsane-hpsj5s.so
+usr/lib32/sane/libsane-hpsj5s.so.1
+usr/lib32/sane/libsane-hpsj5s.so.1.0.24
+usr/lib32/sane/libsane-hs2p.so
+usr/lib32/sane/libsane-hs2p.so.1
+usr/lib32/sane/libsane-hs2p.so.1.0.24
+usr/lib32/sane/libsane-ibm.so
+usr/lib32/sane/libsane-ibm.so.1
+usr/lib32/sane/libsane-ibm.so.1.0.24
+usr/lib32/sane/libsane-kodak.so
+usr/lib32/sane/libsane-kodak.so.1
+usr/lib32/sane/libsane-kodak.so.1.0.24
+usr/lib32/sane/libsane-kodakaio.so
+usr/lib32/sane/libsane-kodakaio.so.1
+usr/lib32/sane/libsane-kodakaio.so.1.0.24
+usr/lib32/sane/libsane-kvs1025.so
+usr/lib32/sane/libsane-kvs1025.so.1
+usr/lib32/sane/libsane-kvs1025.so.1.0.24
+usr/lib32/sane/libsane-kvs20xx.so
+usr/lib32/sane/libsane-kvs20xx.so.1
+usr/lib32/sane/libsane-kvs20xx.so.1.0.24
+usr/lib32/sane/libsane-leo.so
+usr/lib32/sane/libsane-leo.so.1
+usr/lib32/sane/libsane-leo.so.1.0.24
+usr/lib32/sane/libsane-lexmark.so
+usr/lib32/sane/libsane-lexmark.so.1
+usr/lib32/sane/libsane-lexmark.so.1.0.24
+usr/lib32/sane/libsane-ma1509.so
+usr/lib32/sane/libsane-ma1509.so.1
+usr/lib32/sane/libsane-ma1509.so.1.0.24
+usr/lib32/sane/libsane-magicolor.so
+usr/lib32/sane/libsane-magicolor.so.1
+usr/lib32/sane/libsane-magicolor.so.1.0.24
+usr/lib32/sane/libsane-matsushita.so
+usr/lib32/sane/libsane-matsushita.so.1
+usr/lib32/sane/libsane-matsushita.so.1.0.24
+usr/lib32/sane/libsane-microtek.so
+usr/lib32/sane/libsane-microtek.so.1
+usr/lib32/sane/libsane-microtek.so.1.0.24
+usr/lib32/sane/libsane-microtek2.so
+usr/lib32/sane/libsane-microtek2.so.1
+usr/lib32/sane/libsane-microtek2.so.1.0.24
+usr/lib32/sane/libsane-mustek.so
+usr/lib32/sane/libsane-mustek.so.1
+usr/lib32/sane/libsane-mustek.so.1.0.24
+usr/lib32/sane/libsane-mustek_pp.so
+usr/lib32/sane/libsane-mustek_pp.so.1
+usr/lib32/sane/libsane-mustek_pp.so.1.0.24
+usr/lib32/sane/libsane-mustek_usb.so
+usr/lib32/sane/libsane-mustek_usb.so.1
+usr/lib32/sane/libsane-mustek_usb.so.1.0.24
+usr/lib32/sane/libsane-nec.so
+usr/lib32/sane/libsane-nec.so.1
+usr/lib32/sane/libsane-nec.so.1.0.24
+usr/lib32/sane/libsane-net.so
+usr/lib32/sane/libsane-net.so.1
+usr/lib32/sane/libsane-net.so.1.0.24
+usr/lib32/sane/libsane-niash.so
+usr/lib32/sane/libsane-niash.so.1
+usr/lib32/sane/libsane-niash.so.1.0.24
+usr/lib32/sane/libsane-p5.so
+usr/lib32/sane/libsane-p5.so.1
+usr/lib32/sane/libsane-p5.so.1.0.24
+usr/lib32/sane/libsane-pie.so
+usr/lib32/sane/libsane-pie.so.1
+usr/lib32/sane/libsane-pie.so.1.0.24
+usr/lib32/sane/libsane-pixma.so
+usr/lib32/sane/libsane-pixma.so.1
+usr/lib32/sane/libsane-pixma.so.1.0.24
+usr/lib32/sane/libsane-plustek.so
+usr/lib32/sane/libsane-plustek.so.1
+usr/lib32/sane/libsane-plustek.so.1.0.24
+usr/lib32/sane/libsane-plustek_pp.so
+usr/lib32/sane/libsane-plustek_pp.so.1
+usr/lib32/sane/libsane-plustek_pp.so.1.0.24
+usr/lib32/sane/libsane-qcam.so
+usr/lib32/sane/libsane-qcam.so.1
+usr/lib32/sane/libsane-qcam.so.1.0.24
+usr/lib32/sane/libsane-ricoh.so
+usr/lib32/sane/libsane-ricoh.so.1
+usr/lib32/sane/libsane-ricoh.so.1.0.24
+usr/lib32/sane/libsane-rts8891.so
+usr/lib32/sane/libsane-rts8891.so.1
+usr/lib32/sane/libsane-rts8891.so.1.0.24
+usr/lib32/sane/libsane-s9036.so
+usr/lib32/sane/libsane-s9036.so.1
+usr/lib32/sane/libsane-s9036.so.1.0.24
+usr/lib32/sane/libsane-sceptre.so
+usr/lib32/sane/libsane-sceptre.so.1
+usr/lib32/sane/libsane-sceptre.so.1.0.24
+usr/lib32/sane/libsane-sharp.so
+usr/lib32/sane/libsane-sharp.so.1
+usr/lib32/sane/libsane-sharp.so.1.0.24
+usr/lib32/sane/libsane-sm3600.so
+usr/lib32/sane/libsane-sm3600.so.1
+usr/lib32/sane/libsane-sm3600.so.1.0.24
+usr/lib32/sane/libsane-sm3840.so
+usr/lib32/sane/libsane-sm3840.so.1
+usr/lib32/sane/libsane-sm3840.so.1.0.24
+usr/lib32/sane/libsane-snapscan.so
+usr/lib32/sane/libsane-snapscan.so.1
+usr/lib32/sane/libsane-snapscan.so.1.0.24
+usr/lib32/sane/libsane-sp15c.so
+usr/lib32/sane/libsane-sp15c.so.1
+usr/lib32/sane/libsane-sp15c.so.1.0.24
+usr/lib32/sane/libsane-st400.so
+usr/lib32/sane/libsane-st400.so.1
+usr/lib32/sane/libsane-st400.so.1.0.24
+usr/lib32/sane/libsane-stv680.so
+usr/lib32/sane/libsane-stv680.so.1
+usr/lib32/sane/libsane-stv680.so.1.0.24
+usr/lib32/sane/libsane-tamarack.so
+usr/lib32/sane/libsane-tamarack.so.1
+usr/lib32/sane/libsane-tamarack.so.1.0.24
+usr/lib32/sane/libsane-teco1.so
+usr/lib32/sane/libsane-teco1.so.1
+usr/lib32/sane/libsane-teco1.so.1.0.24
+usr/lib32/sane/libsane-teco2.so
+usr/lib32/sane/libsane-teco2.so.1
+usr/lib32/sane/libsane-teco2.so.1.0.24
+usr/lib32/sane/libsane-teco3.so
+usr/lib32/sane/libsane-teco3.so.1
+usr/lib32/sane/libsane-teco3.so.1.0.24
+usr/lib32/sane/libsane-test.so
+usr/lib32/sane/libsane-test.so.1
+usr/lib32/sane/libsane-test.so.1.0.24
+usr/lib32/sane/libsane-u12.so
+usr/lib32/sane/libsane-u12.so.1
+usr/lib32/sane/libsane-u12.so.1.0.24
+usr/lib32/sane/libsane-umax.so
+usr/lib32/sane/libsane-umax.so.1
+usr/lib32/sane/libsane-umax.so.1.0.24
+usr/lib32/sane/libsane-umax1220u.so
+usr/lib32/sane/libsane-umax1220u.so.1
+usr/lib32/sane/libsane-umax1220u.so.1.0.24
+usr/lib32/sane/libsane-umax_pp.so
+usr/lib32/sane/libsane-umax_pp.so.1
+usr/lib32/sane/libsane-umax_pp.so.1.0.24
+usr/lib32/sane/libsane-xerox_mfp.so
+usr/lib32/sane/libsane-xerox_mfp.so.1
+usr/lib32/sane/libsane-xerox_mfp.so.1.0.24
+usr/lib32/libtag.so
+usr/lib32/libtag.so.1
+usr/lib32/libtag.so.1.12.0
+usr/lib32/libtag_c.so
+usr/lib32/libtag_c.so.0
+usr/lib32/libtag_c.so.0.0.0
+usr/lib32/pkgconfig/taglib.pc
+usr/lib32/pkgconfig/taglib_c.pc
+usr/lib32/libofa.so
+usr/lib32/libofa.so.0
+usr/lib32/libofa.so.0.0.0
+usr/lib32/pkgconfig/libofa.pc
+usr/lib32/libavcodec.so.54
+usr/lib32/libavcodec.so.54.59.100
+usr/lib32/libavdevice.so
+usr/lib32/libavdevice.so.54
+usr/lib32/libavdevice.so.54.2.101
+usr/lib32/libavfilter.so.3
+usr/lib32/libavfilter.so.3.17.100
+usr/lib32/libavformat.so.54
+usr/lib32/libavformat.so.54.29.104
+usr/lib32/libavresample.so
+usr/lib32/libavresample.so.0
+usr/lib32/libavresample.so.0.0.3
+usr/lib32/libswresample.so
+usr/lib32/libswresample.so.0
+usr/lib32/libswresample.so.0.15.100
+usr/lib32/libswscale.so
+usr/lib32/libswscale.so.2
+usr/lib32/libswscale.so.2.1.101
+usr/lib32/pkgconfig/libavdevice.pc
+usr/lib32/pkgconfig/libavresample.pc
+usr/lib32/pkgconfig/libswresample.pc
+usr/lib32/pkgconfig/libswscale.pc
+usr/lib32/libpostproc.so
+usr/lib32/libpostproc.so.52
+usr/lib32/libpostproc.so.52.0.100
+usr/lib32/pkgconfig/libpostproc.pc

app-emulation/virtualbox-additions/virtualbox-additions-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.24.ebuild,v 1.1 2014/03/14 10:26:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.24.ebuild,v 1.3 2014/06/08 09:44:16 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 

app-emulation/virtualbox-bin/virtualbox-bin-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.24.ebuild,v 1.1 2014/03/14 10:25:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.24.ebuild,v 1.3 2014/06/08 09:44:19 ago Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 

app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.24.ebuild,v 1.1 2014/03/14 10:26:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.24.ebuild,v 1.3 2014/06/08 09:44:22 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 

app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.24.ebuild,v 1.1 2014/03/14 10:27:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.24.ebuild,v 1.3 2014/06/08 09:44:25 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}

app-emulation/virtualbox-modules/virtualbox-modules-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.24.ebuild,v 1.1 2014/03/14 10:25:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.24.ebuild,v 1.3 2014/06/08 09:44:28 ago Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"

app-emulation/virtualbox/virtualbox-4.2.24.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.24.ebuild,v 1.2 2014/03/26 10:12:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.24.ebuild,v 1.4 2014/06/08 09:44:12 ago Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin

app-emulation/vmware-modules/files/264-3.10.0.patch

@@ -1,828 +0,0 @@
-diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
-index 2dd83fe..d945749 100644
---- a/vmblock-only/linux/control.c
-+++ b/vmblock-only/linux/control.c
-@@ -208,9 +208,10 @@ SetupProcDevice(void)
-    VMBlockSetProcEntryOwner(controlProcMountpoint);
- 
-    /* Create /proc/fs/vmblock/dev */
--   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
--                                        VMBLOCK_CONTROL_MODE,
--                                        controlProcDirEntry);
-+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
-+                                  VMBLOCK_CONTROL_MODE,
-+                                  controlProcDirEntry,
-+                                  &ControlFileOps);
-    if (!controlProcEntry) {
-       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
-       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
-@@ -218,7 +219,6 @@ SetupProcDevice(void)
-       return -EINVAL;
-    }
- 
--   controlProcEntry->proc_fops = &ControlFileOps;
-    return 0;
- }
- 
-diff --git a/vmnet-only/bridge.c b/vmnet-only/bridge.c
-index 10eaa41..6fdc19e 100644
---- a/vmnet-only/bridge.c
-+++ b/vmnet-only/bridge.c
-@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
- static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
- static void VNetBridgePortsChanged(VNetJack *this);
- static int  VNetBridgeIsBridged(VNetJack *this);
--static int  VNetBridgeProcRead(char *page, char **start, off_t off,
--                               int count, int *eof, void *data);
- static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
- static PacketStatus VNetCallSMACFunc(struct SMACState *state,
-                                      struct sk_buff **skb, void *startOfData,
-@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetBridgeProcShow --
-+ *
-+ *      Callback for read operation on this bridge entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                   void    *data)   // IN: client data - pointer to bridge
-+{
-+   VNetBridge *bridge = (VNetBridge*)data;
-+
-+   if (!bridge) {
-+      return 0;
-+   }
-+
-+   VNetPrintPort(&bridge->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", bridge->name);
-+
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_bridge_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_bridge_fops = {
-+       .open           = proc_bridge_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetBridge_Create --
-  *
-  *      Creates a bridge. Allocates struct, allocates internal device,
-@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN:  name of device (e.g., "eth0")
-     * Make proc entry for this jack.
-     */
- 
--   retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
--                               &bridge->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
-+                               &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
-    if (retval) {
-       if (retval == -ENXIO) {
-          bridge->port.jack.procEntry = NULL;
-       } else {
-          goto out;
-       }
--   } else {
--      bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
--      bridge->port.jack.procEntry->data = bridge;
-    }
- 
-    /*
-@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb,         // IN: packet to receive
-    return 0;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetBridgeProcRead --
-- *
-- *      Callback for read operation on this bridge entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetBridgeProcRead(char    *page,   // IN/OUT: buffer to write into
--                   char   **start,  // OUT: 0 if file < 4k, else offset into page
--                   off_t    off,    // IN: (unused) offset of read into the file
--                   int      count,  // IN: (unused) maximum number of bytes to read
--                   int     *eof,    // OUT: TRUE if there is nothing more to read
--                   void    *data)   // IN: client data - pointer to bridge
--{
--   VNetBridge *bridge = (VNetBridge*)data;
--   int len = 0;
--
--   if (!bridge) {
--      return len;
--   }
--
--   len += VNetPrintPort(&bridge->port, page+len);
--
--   len += sprintf(page+len, "dev %s ", bridge->name);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index b12b982..395f5ce 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -1775,21 +1775,17 @@ VNetSetMACUnique(VNetPort *port,            // IN:
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintJack(const VNetJack *jack, // IN: jack
--              char           *buf)  // OUT: info about jack
-+              struct seq_file *seqf)  // OUT: info about jack
- {
--   int len = 0;
--
-    read_lock(&vnetPeerLock);
-    if (!jack->peer) {
--      len += sprintf(buf+len, "connected not ");
-+      seq_printf(seqf, "connected not ");
-    } else {
--      len += sprintf(buf+len, "connected %s ", jack->peer->name);
-+      seq_printf(seqf, "connected %s ", jack->peer->name);
-    }
-    read_unlock(&vnetPeerLock);
--
--   return len;
- }
- 
- 
-@@ -1809,52 +1805,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
-  *----------------------------------------------------------------------
-  */
- 
--int
-+void
- VNetPrintPort(const VNetPort *port, // IN: port
--              char           *buf)  // OUT: info about port
-+              struct seq_file *seqf)  // OUT: info about port
- {
--   int len = 0;
-+   VNetPrintJack(&port->jack, seqf);
- 
--   len += VNetPrintJack(&port->jack, buf+len);
--
--   len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->paddr[0], port->paddr[1], port->paddr[2],
-                   port->paddr[3], port->paddr[4], port->paddr[5]);
- 
--   len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->ladrf[0], port->ladrf[1], port->ladrf[2],
-                   port->ladrf[3], port->ladrf[4], port->ladrf[5],
-                   port->ladrf[6], port->ladrf[7]);
- 
--   len += sprintf(buf+len, "flags IFF_RUNNING");
-+   seq_printf(seqf, "flags IFF_RUNNING");
- 
-    if (port->flags & IFF_UP) {
--      len += sprintf(buf+len, ",IFF_UP");
-+      seq_printf(seqf, ",IFF_UP");
-    }
- 
-    if (port->flags & IFF_BROADCAST) {
--      len += sprintf(buf+len, ",IFF_BROADCAST");
-+      seq_printf(seqf, ",IFF_BROADCAST");
-    }
- 
-    if (port->flags & IFF_DEBUG) {
--      len += sprintf(buf+len, ",IFF_DEBUG");
-+      seq_printf(seqf, ",IFF_DEBUG");
-    }
- 
-    if (port->flags & IFF_PROMISC) {
--      len += sprintf(buf+len, ",IFF_PROMISC");
-+      seq_printf(seqf, ",IFF_PROMISC");
-    }
- 
-    if (port->flags & IFF_MULTICAST) {
--      len += sprintf(buf+len, ",IFF_MULTICAST");
-+      seq_printf(seqf, ",IFF_MULTICAST");
-    }
- 
-    if (port->flags & IFF_ALLMULTI) {
--      len += sprintf(buf+len, ",IFF_ALLMULTI");
-+      seq_printf(seqf, ",IFF_ALLMULTI");
-    }
- 
--   len += sprintf(buf+len, " ");
--
--   return len;
-+   seq_printf(seqf, " ");
- }
- 
- 
-diff --git a/vmnet-only/hub.c b/vmnet-only/hub.c
-index 47f04ac..8aafb95 100644
---- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -25,6 +25,7 @@
- #include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/poll.h>
-+#include <linux/seq_file.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
- static Bool VNetHubCycleDetect(VNetJack *this, int generation);
- static void VNetHubPortsChanged(VNetJack *this);
- static int  VNetHubIsBridged(VNetJack *this);
--static int  VNetHubProcRead(char *page, char **start, off_t off,
--                            int count, int *eof, void *data);
- 
- static VNetHub *vnetHub;
- static DEFINE_SPINLOCK(vnetHubLock);
-@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetHubProcShow --
-+ *
-+ *      Callback for read operation on hub entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetHubProcShow(struct seq_file  *seqf,   // IN/OUT: buffer to write into
-+                void    *data)   // IN: client data - not used
-+{
-+   VNetJack *jack = (VNetJack*)data;
-+   VNetHub *hub;
-+
-+   if (!jack || !jack->private) {
-+      return 0;
-+   }
-+   hub = (VNetHub*)jack->private;
-+
-+   VNetPrintJack(jack, seqf);
-+
-+   seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
-+   seq_printf(seqf, "\n");
-+   return 0;
-+}
-+
-+static int proc_hub_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetHubProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_hub_fops = {
-+       .open           = proc_hub_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetHubAlloc --
-  *
-  *      Allocate a jack on this hub.
-@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
-           * Make proc entry for this jack.
-           */
- 
--         retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
-+         retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
-          if (retval) {
-             if (retval == -ENXIO) {
-                jack->procEntry = NULL;
-@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
- 	       hub->used[i] = FALSE;
-                return NULL;
-             }
--         } else {
--            jack->procEntry->read_proc = VNetHubProcRead;
--            jack->procEntry->data = jack;
-          }
- 
-          /*
-@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
- }
- 
- 
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetHubProcRead --
-- *
-- *      Callback for read operation on hub entry in vnets proc fs.
-- *
-- * Results:
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetHubProcRead(char    *page,   // IN/OUT: buffer to write into
--                char   **start,  // OUT: 0 if file < 4k, else offset into page
--                off_t    off,    // IN: offset of read into the file
--                int      count,  // IN: maximum number of bytes to read
--                int     *eof,    // OUT: TRUE if there is nothing more to read
--                void    *data)   // IN: client data - not used
--{
--   VNetJack *jack = (VNetJack*)data;
--   VNetHub *hub;
--   int len = 0;
--
--   if (!jack || !jack->private) {
--      return len;
--   }
--   hub = (VNetHub*)jack->private;
--
--   len += VNetPrintJack(jack, page+len);
--
--   len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
--
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 65f3cb9..b20f56a 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -63,8 +63,6 @@ static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
- static void VNetNetifSetMulticast(struct net_device *dev);
--static int  VNetNetIfProcRead(char *page, char **start, off_t off,
--                              int count, int *eof, void *data);
- 
- /*
-  *----------------------------------------------------------------------
-@@ -117,6 +115,53 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
- 
- }
- 
-+/*
-+ *----------------------------------------------------------------------
-+ *
-+ * VNetNetIfProcShow --
-+ *
-+ *      Callback for read operation on this netif entry in vnets proc fs.
-+ *
-+ * Results: 
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                  void   *data)  // IN: client data
-+{
-+   VNetNetIF *netIf = data; 
-+   
-+   if (!netIf) {
-+      return 0;
-+   }
-+   
-+   VNetPrintPort(&netIf->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", netIf->dev->name);
-+   
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_netif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_netif_fops = {
-+       .open           = proc_netif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -201,9 +246,9 @@ VNetNetIf_Create(char *devName,  // IN:
-    /*
-     * Make proc entry for this jack.
-     */
--   
--   retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
--                               &netIf->port.jack.procEntry);
-+  
-+   retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
-+                               &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
-    if (retval) {
-       if (retval == -ENXIO) {
-          netIf->port.jack.procEntry = NULL;
-@@ -211,9 +256,6 @@ VNetNetIf_Create(char *devName,  // IN:
-          netIf->port.jack.procEntry = NULL;
-          goto out;
-       }
--   } else {
--      netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead;
--      netIf->port.jack.procEntry->data = netIf;
-    }
- 
-    /*
-@@ -591,45 +633,3 @@ VNetNetifGetStats(struct net_device *dev) // IN:
-    return &netIf->stats;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetNetIfProcRead --
-- *
-- *      Callback for read operation on this netif entry in vnets proc fs.
-- *
-- * Results: 
-- *      Length of read operation.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetNetIfProcRead(char   *page,  // IN/OUT: buffer to write into
--                  char  **start, // OUT: 0 if file < 4k, else offset into page
--                  off_t   off,   // IN: (unused) offset of read into the file
--                  int     count, // IN: (unused) maximum number of bytes to read
--                  int    *eof,   // OUT: TRUE if there is nothing more to read
--                  void   *data)  // IN: client data
--{
--   VNetNetIF *netIf = (VNetNetIF*)data; 
--   int len = 0;
--   
--   if (!netIf) {
--      return len;
--   }
--   
--   len += VNetPrintPort(&netIf->port, page+len);
--
--   len += sprintf(page+len, "dev %s ", netIf->devName);
--   
--   len += sprintf(page+len, "\n");
--
--   *start = 0;
--   *eof   = 1;
--   return len;
--}
-diff --git a/vmnet-only/procfs.c b/vmnet-only/procfs.c
-index ca42ee2..fd7921e 100644
---- a/vmnet-only/procfs.c
-+++ b/vmnet-only/procfs.c
-@@ -45,10 +45,6 @@
- 
- #if defined(CONFIG_PROC_FS)
- 
--static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode,
--                                VNetProcEntry **ret);
--static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent);
--
- static VNetProcEntry *base = NULL;
- 
- 
-@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL;
- int
- VNetProc_Init(void)
- {
--   return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base);
-+	base = proc_mkdir("vmnet", NULL);
-+	if(IS_ERR(base)) {
-+		base = NULL;
-+		return PTR_ERR(base);
-+	}
-+	return 0;
- }
- 
- 
-@@ -94,14 +95,14 @@ VNetProc_Init(void)
- void
- VNetProc_Cleanup(void)
- {
--   VNetProcRemoveEntryInt(base, NULL);
-+   proc_remove(base);
-    base = NULL;
- }
- 
- /*
-  *----------------------------------------------------------------------
-  *
-- * VNetProcMakeEntryInt --
-+ * VNetProc_MakeEntryOps --
-  *
-  *      Make an entry in the vnets proc file system.
-  *
-@@ -116,72 +117,21 @@ VNetProc_Cleanup(void)
-  */
- 
- int
--VNetProcMakeEntryInt(VNetProcEntry  *parent, // IN:
--		     char            *name,  // IN:
-+VNetProc_MakeEntryOps(char            *name,  // IN:
- 		     int              mode,  // IN:
--		     VNetProcEntry  **ret)   // OUT:
-+		     VNetProcEntry  **ret,
-+		     const struct file_operations *fops,
-+		     void *data
-+		     )   // OUT:
- {
-    VNetProcEntry *ent;
--   ent = create_proc_entry(name, mode, parent);
-+   ent = proc_create_data(name, mode, base, fops, data);
-    *ret = ent;
-    if (!ent)
-       return -ENOMEM;
-    return 0;
- }
- 
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProcRemoveEntryInt --
-- *
-- *      Remove a previously installed proc entry.
-- *
-- * Results: 
-- *      None.
-- *
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--void
--VNetProcRemoveEntryInt(VNetProcEntry *node,
--                       VNetProcEntry *parent)
--{
--   if (node) {
--      remove_proc_entry(node->name, parent);
--   }
--}
--
--
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProc_MakeEntry --
-- *
-- *      Make an entry in the vnets proc file system.
-- *
-- * Results: 
-- *      errno. If errno is 0 and ret is non NULL then ret is filled
-- *      in with the resulting proc entry.
-- *      
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetProc_MakeEntry(char            *name,  // IN:
--		   int              mode,  // IN:
--		   VNetProcEntry  **ret)   // OUT:
--{
--   return VNetProcMakeEntryInt(base, name, mode, ret);
--}
--
--
- /*
-  *----------------------------------------------------------------------
-  *
-@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char            *name,  // IN:
- void
- VNetProc_RemoveEntry(VNetProcEntry *node)
- {
--   VNetProcRemoveEntryInt(node, base);
-+	if(node)
-+		proc_remove(node);
- }
- 
- 
-@@ -253,31 +204,6 @@ VNetProc_Cleanup(void)
- }
- 
- 
--/*
-- *----------------------------------------------------------------------
-- *
-- * VNetProc_MakeEntry --
-- *
-- *      Make an entry in the vnets proc file system.
-- *
-- * Results: 
-- *      errno. If errno is 0 and ret is non NULL then ret is filled
-- *      in with the resulting proc entry.
-- *      
-- * Side effects:
-- *      None.
-- *
-- *----------------------------------------------------------------------
-- */
--
--int
--VNetProc_MakeEntry(char            *name,
--                   int              mode,
--                   VNetProcEntry  **ret)
--{
--   return -ENXIO;
--}
--
- 
- /*
-  *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 17b49e0..b01004a 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -387,7 +387,7 @@ VNetUserIfReceive(VNetJack       *this, // IN
- /*
-  *----------------------------------------------------------------------
-  *
-- * VNetUserIfProcRead --
-+ * VNetUserIfProcShow --
-  *
-  *      Callback for read operation on this userif entry in vnets proc fs.
-  *
-@@ -401,30 +401,23 @@ VNetUserIfReceive(VNetJack       *this, // IN
-  */
- 
- static int
--VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
--                   char   **start, // OUT: 0 if file < 4k, else offset into
--                                   //      page
--                   off_t    off,   // IN: offset of read into the file
--                   int      count, // IN: maximum number of bytes to read
--                   int     *eof,   // OUT: TRUE if there is nothing more to
--                                   //      read
-+VNetUserIfProcShow(struct seq_file    *seqf,  // IN/OUT: buffer to write into
-                    void    *data)  // IN: client data - not used
- {
-    VNetUserIF *userIf = (VNetUserIF*)data; 
--   int len = 0;
-    
-    if (!userIf) {
--      return len;
-+      return 0;
-    }
-    
--   len += VNetPrintPort(&userIf->port, page+len);
-+   VNetPrintPort(&userIf->port, seqf);
-    
--   len += sprintf(page+len, "read %u written %u queued %u ",
-+   seq_printf(seqf, "read %u written %u queued %u ",
-                   userIf->stats.read,
-                   userIf->stats.written,
-                   userIf->stats.queued);
-    
--   len += sprintf(page+len, 
-+   seq_printf(seqf, 
- 		  "dropped.down %u dropped.mismatch %u "
- 		  "dropped.overflow %u dropped.largePacket %u",
-                   userIf->stats.droppedDown,
-@@ -432,13 +425,23 @@ VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
-                   userIf->stats.droppedOverflow,
- 		  userIf->stats.droppedLargePacket);
- 
--   len += sprintf(page+len, "\n");
-+   seq_printf(seqf, "\n");
-    
--   *start = 0;
--   *eof   = 1;
--   return len;
-+   return 0;
-+}
-+
-+static int proc_userif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetUserIfProcShow, PDE_DATA(inode));
- }
- 
-+static const struct file_operations proc_userif_fops = {
-+       .open           = proc_userif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -1034,8 +1037,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-     * Make proc entry for this jack.
-     */
-    
--   retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG,
--                               &userIf->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG,
-+                               &userIf->port.jack.procEntry, &proc_userif_fops, userIf);
-    if (retval) {
-       if (retval == -ENXIO) {
-          userIf->port.jack.procEntry = NULL;
-@@ -1043,9 +1046,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-          kfree(userIf);
-          return retval;
-       }
--   } else {
--      userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead;
--      userIf->port.jack.procEntry->data = userIf;
-    }
- 
-    /*
-diff --git a/vmnet-only/vnetInt.h b/vmnet-only/vnetInt.h
-index c615395..d90a1ef 100644
---- a/vmnet-only/vnetInt.h
-+++ b/vmnet-only/vnetInt.h
-@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack);
- 
- void VNetSend(const VNetJack *jack, struct sk_buff *skb);
- 
--int VNetProc_MakeEntry(char *name, int mode,
--                       VNetProcEntry **ret);
-+int VNetProc_MakeEntryOps(char *name, int mode,
-+                       VNetProcEntry **ret,
-+		       const struct file_operations *fops,
-+		       void *data);
- 
- void VNetProc_RemoveEntry(VNetProcEntry *node);
- 
--int VNetPrintJack(const VNetJack *jack, char *buf);
-+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf);
- 
- int VNet_MakeMACAddress(VNetPort *port);
- 
-@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr,
- 
- Bool VNetCycleDetectIf(const char *name, int generation);
- 
--int VNetPrintPort(const VNetPort *port, char *buf);
-+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf);
- 
- int VNetSnprintf(char *str, size_t size, const char *format, ...);
-