diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
new file mode 100644
index 000000000000..b3647902a5ed
--- /dev/null
+++ b/app-admin/puppet-lint/Manifest
@@ -0,0 +1 @@
+DIST puppet-lint-0.2.1.gem 31232 SHA256 99288b6541b96e2c47616fda3a30cc2ae8815f12ee9becc3fc4aadf30e2859df SHA512 79ce0ec4df74c17400fe8e4e8e8de1aef3d227f7a9e06054ad2d8fd1fac4fe68c711f9e1f8e637d5c79affdc96c441af02685ecc67d41c0e928d36523c70dcc2 WHIRLPOOL e9ed013e14817d7d1abba05b0900915a683dfb66b25da64b37b7ff2e1778a9bf706f57d8c68c31e3bfdd4d144f98c38d11ead5fb2e27308806adc7b680c22ba2
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
new file mode 100644
index 000000000000..f38749ea2aad
--- /dev/null
+++ b/app-admin/puppet-lint/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ ruby
+
+ antarus@gentoo.org
+ Primary
+
+Tim Sharpe's Puppet Linter. Enforces puppetlabs style.
+
diff --git a/app-admin/puppet-lint/puppet-lint-0.2.1.ebuild b/app-admin/puppet-lint/puppet-lint-0.2.1.ebuild
new file mode 100644
index 000000000000..d2cdee2c5e96
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-lint/puppet-lint-0.2.1.ebuild,v 1.1 2012/11/06 05:47:20 antarus Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README*"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL."
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+dev-ruby/rspec
+dev-ruby/rake"
+
+DEPEND="${DEPEND}"
+RDEPEND="${RDEPEND}"
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index db1826e495e7..a771fae47e19 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,2 +1,3 @@
DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
+DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch
new file mode 100644
index 000000000000..ca4e5599890a
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch
@@ -0,0 +1,177 @@
+diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.12/Makefile.am 2012-10-04 15:51:04.000000000 +0200
++++ my/Makefile.am 2012-11-06 03:48:12.392483514 +0100
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -O2 -Wall
++CFLAGS=-Wall
+
+ SUBDIRS=po
+
+@@ -84,88 +84,21 @@
+ rm -f .stamp-distutils-in-builddir
+
+ nobase_pkgdata_SCRIPTS= \
+- check-device-ids.py \
+- pysmb.py \
+- scp-dbus-service.py \
+- system-config-printer.py \
+- troubleshoot/__init__.py \
+- applet.py
++ check-device-ids.py
+
+ nobase_pkgdata_DATA= \
+- asyncconn.py \
+- asyncipp.py \
+- asyncpk1.py \
+- authconn.py \
+ config.py \
+- cupspk.py \
+ debug.py \
+ dnssdresolve.py \
+- errordialogs.py \
+- HIG.py \
+ firewall.py \
+- gui.py \
+- gtkinklevel.py \
+- gtkspinner.py \
+ installpackage.py \
+- jobviewer.py \
+ monitor.py \
+- newprinter.py \
+- options.py \
+- optionwidgets.py \
+ PhysicalDevice.py \
+- ppdcache.py \
+ ppdippstr.py \
+- ppdsloader.py \
+- printerproperties.py \
+ probe_printer.py \
+- gtk_label_autowrap.py \
+ SearchCriterion.py \
+- serversettings.py \
+ smburi.py \
+ statereason.py \
+- timedops.py \
+- ToolbarSearchEntry.py \
+- userdefault.py \
+- ui/AboutDialog.ui \
+- ui/ConnectDialog.ui \
+- ui/ConnectingDialog.ui \
+- ui/InstallDialog.ui \
+- ui/JobsWindow.ui \
+- ui/NewPrinterName.ui \
+- ui/NewPrinterWindow.ui \
+- ui/PrinterPropertiesDialog.ui \
+- ui/PrintersWindow.ui \
+- ui/ServerSettingsDialog.ui \
+- ui/SMBBrowseDialog.ui \
+- ui/statusicon_popupmenu.ui \
+- ui/WaitWindow.ui \
+- icons/i-network-printer.png \
+- troubleshoot/base.py \
+- troubleshoot/CheckLocalServerPublishing.py \
+- troubleshoot/CheckNetworkServerSanity.py \
+- troubleshoot/CheckPPDSanity.py \
+- troubleshoot/CheckPrinterSanity.py \
+- troubleshoot/CheckSELinux.py \
+- troubleshoot/CheckUSBPermissions.py \
+- troubleshoot/ChooseNetworkPrinter.py \
+- troubleshoot/ChoosePrinter.py \
+- troubleshoot/DeviceListed.py \
+- troubleshoot/ErrorLogCheckpoint.py \
+- troubleshoot/ErrorLogFetch.py \
+- troubleshoot/ErrorLogParse.py \
+- troubleshoot/Locale.py \
+- troubleshoot/LocalOrRemote.py \
+- troubleshoot/NetworkCUPSPrinterShared.py \
+- troubleshoot/PrinterStateReasons.py \
+- troubleshoot/PrintTestPage.py \
+- troubleshoot/QueueNotEnabled.py \
+- troubleshoot/QueueRejectingJobs.py \
+- troubleshoot/RemoteAddress.py \
+- troubleshoot/SchedulerNotRunning.py \
+- troubleshoot/ServerFirewalled.py \
+- troubleshoot/Shrug.py \
+- troubleshoot/VerifyPackages.py \
+- troubleshoot/Welcome.py \
+ xml/preferreddrivers.rng \
+ xml/validate.py
+
+@@ -173,18 +106,13 @@
+ cupshelpers_DATA=\
+ xml/preferreddrivers.xml
+
+-bin_SCRIPTS= \
+- system-config-printer \
+- system-config-printer-applet \
+- dbus/scp-dbus-service
+-
+ if UDEV_RULES
+ udevrulesdir=$(sysconfdir)/udev/rules.d
+ udevrules_DATA=udev/70-printers.rules
+ udev_udev_configure_printer_SOURCES=\
+ udev/udev-configure-printer.c
+-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
++udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS)
++udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
+ udevhelperdir=$(sysconfdir)/udev
+ udevhelper_PROGRAMS=\
+ udev/udev-configure-printer
+@@ -202,56 +130,17 @@
+
+ endif
+
+-man_MANS= \
+- man/system-config-printer.1 \
+- man/system-config-printer-applet.1
+-
+ dbus_DATA = \
+ dbus/com.redhat.NewPrinterNotification.conf \
+ dbus/com.redhat.PrinterDriversInstaller.conf
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+
+-dbusinterfaces_DATA = \
+- dbus/org.fedoraproject.Config.Printing.xml
+-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
+-
+-dbusservices_DATA = \
+- dbus/org.fedoraproject.Config.Printing.service
+-dbusservicesdir = $(datadir)/dbus-1/services/
+-
+-desktop_DATA =\
+- system-config-printer.desktop \
+- print-applet.desktop
+ desktopdir = $(datadir)/applications/
+ autostartdir = $(sysconfdir)/xdg/autostart/
+
+ DESKTOP_VENDOR=@DESKTOPVENDOR@
+ DESKTOP_PREFIX=@DESKTOPPREFIX@
+
+-install-desktopDATA: $(desktop_DATA)
+- mkdir -p $(DESTDIR)$(desktopdir)
+- mkdir -p $(DESTDIR)$(desktopdir)
+- desktop-file-install $(DESKTOP_VENDOR) \
+- --dir $(DESTDIR)$(desktopdir) \
+- --add-category System \
+- --add-category Settings \
+- --add-category HardwareSettings \
+- --add-category Printing \
+- --add-category GTK \
+- system-config-printer.desktop
+- desktop-file-install $(DESKTOP_VENDOR) \
+- --dir $(DESTDIR)$(autostartdir) \
+- --add-category System \
+- --add-category Monitor \
+- --add-category GTK \
+- print-applet.desktop
+-
+-uninstall-desktopDATA:
+- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
+- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
+-
+-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+-
+ EXTRA_DIST=\
+ $(nobase_pkgdata_SCRIPTS) \
+ $(nobase_pkgdata_DATA) \
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
new file mode 100644
index 000000000000..98d57d3a539c
--- /dev/null
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.1 2012/11/06 03:13:28 reavertm Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils python toolchain-funcs
+
+MY_P=${PN%-common}-${PV}
+
+DESCRIPTION="Common modules of Red Hat's printer administration tool"
+HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
+SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc policykit"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# system-config-printer split since 1.1.3
+COMMON_DEPEND="
+ >=dev-libs/glib-2
+ dev-libs/libxml2[python]
+ dev-python/dbus-python
+ >=dev-python/pycups-1.9.60
+ dev-python/pycurl
+ >=dev-python/pygobject-2.21.5:2
+ net-print/cups[dbus]
+ >=sys-fs/udev-172
+ virtual/libusb:1
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=sys-auth/polkit-0.104-r1 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.12-split.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-nls \
+ --with-udev-rules
+}
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ udevhelperdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+ udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d" \
+ install
+
+ dodoc AUTHORS ChangeLog README
+ use doc && dohtml -r html/
+
+ python_convert_shebangs -q -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+ python_mod_optimize cupshelpers
+}
+
+pkg_postrm() {
+ python_mod_cleanup cupshelpers /usr/share/system-config-printer
+}
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index db1826e495e7..eef026fa9d3a 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -1,2 +1,2 @@
DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
-DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
+DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599
diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
similarity index 90%
rename from app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch
rename to app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
index 6367ce14487f..864aecfb1c5b 100644
--- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.9-split.patch
+++ b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch
@@ -1,7 +1,7 @@
-diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
---- system-config-printer-1.3.9/Makefile.am 2011-10-26 14:14:19.000000000 +0200
-+++ my2/Makefile.am 2012-03-07 00:39:47.445321514 +0100
-@@ -1,89 +1,8 @@
+diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
+--- system-config-printer-1.3.12/Makefile.am 2012-10-04 15:51:04.000000000 +0200
++++ my/Makefile.am 2012-11-06 04:05:52.745405001 +0100
+@@ -1,90 +1,8 @@
-CFLAGS=-g -O2 -Wall
+CFLAGS=-Wall
@@ -56,6 +56,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
- sed \
- -e "s|\@prefix\@|$(prefix)|" \
- -e "s|\@sysconfdir\@|$(sysconfdir)|" \
+- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
- $< > $@
-
-# Use distutils to build the module.
@@ -92,7 +93,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
pysmb.py \
scp-dbus-service.py \
system-config-printer.py \
-@@ -95,33 +14,21 @@
+@@ -96,33 +14,21 @@
asyncipp.py \
asyncpk1.py \
authconn.py \
@@ -126,7 +127,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
timedops.py \
ToolbarSearchEntry.py \
userdefault.py \
-@@ -164,52 +71,17 @@
+@@ -165,52 +71,17 @@
troubleshoot/ServerFirewalled.py \
troubleshoot/Shrug.py \
troubleshoot/VerifyPackages.py \
@@ -149,8 +150,8 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
-udevrules_DATA=udev/70-printers.rules
-udev_udev_configure_printer_SOURCES=\
- udev/udev-configure-printer.c
--udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
--udev_udev_configure_printer_CFLAGS=$(AM_CFLAGS) $(GLIB_CFLAGS)
+-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
+-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
-udevhelperdir=$(sysconfdir)/udev
-udevhelper_PROGRAMS=\
- udev/udev-configure-printer
@@ -161,7 +162,7 @@ diff -ruN system-config-printer-1.3.9/Makefile.am my2/Makefile.am
-%.service: %.service.in
- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@
-systemdsystemunit_DATA = \
-- udev/udev-configure-printer.service
+- udev/configure-printer@.service
-CLEANFILES = \
- $(systemdsystemunit_DATA)
-endif
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
similarity index 90%
rename from app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild
rename to app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
index 2b1d56caf630..018cf9381ee0 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild,v 1.10 2012/07/15 16:21:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild,v 1.1 2012/11/06 03:14:05 reavertm Exp $
EAPI="3"
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="gnome-keyring"
@@ -53,7 +53,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
+ epatch "${FILESDIR}/${PN}-1.3.12-split.patch"
eautoreconf
}
diff --git a/app-admin/webmin/files/webmin-1.600-SA51201.patch b/app-admin/webmin/files/webmin-1.600-SA51201.patch
new file mode 100644
index 000000000000..43d1783f9d84
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.600-SA51201.patch
@@ -0,0 +1,105 @@
+diff -ur a/passwd/edit_passwd.cgi b/passwd/edit_passwd.cgi
+--- a/passwd/edit_passwd.cgi 2012-09-21 21:07:11.000000000 +0300
++++ b/passwd/edit_passwd.cgi 2012-11-01 19:00:02.000000000 +0200
+@@ -19,7 +19,7 @@
+ %uconfig = &foreign_config("useradmin");
+ $user[6] =~ s/,.*$// if ($uconfig{'extra_real'});
+ print &ui_table_row($text{'passwd_for'},
+- $user[0].( $user[6] ? " ($user[6])" : "" ));
++ &html_escape($user[0].( $user[6] ? " ($user[6])" : "" )));
+
+ # Old password field
+ if ($access{'old'} == 1 ||
+diff -ur a/passwd/index.cgi b/passwd/index.cgi
+--- a/passwd/index.cgi 2012-09-21 21:07:11.000000000 +0300
++++ b/passwd/index.cgi 2012-11-01 19:00:02.000000000 +0200
+@@ -85,7 +85,7 @@
+ @grid = ( );
+ for($i=0; $i<@ulist; $i++) {
+ push(@grid, "[0]\">".
++ "user=".&urlize($ulist[$i]->[0])."\">".
+ &html_escape($ulist[$i]->[0])."");
+ }
+ print &ui_grid_table(\@grid, 4, 100, undef, undef,
+diff -ur a/passwd/module.info b/passwd/module.info
+--- a/passwd/module.info 2012-09-21 21:11:10.000000000 +0300
++++ b/passwd/module.info 2012-11-01 19:00:02.000000000 +0200
+@@ -1,48 +1,38 @@
+-desc_pt_BR=Alterar Senha
+-desc_ca=Canvi de Contrasenyes
+-desc_it=Cambio Password
+-desc_hu.UTF-8=Jelszavak
+-readonly=1
+-desc=Change Passwords
+ category=system
+-desc_ja_JP.euc=パスワードの変更
+-desc_zh_TW.Big5=怒鷄KX
+-desc_ko_KR.UTF-8= 覲蟆
+-desc_fi=Vaihda Salasanoja
++depends=useradmin
++desc=Change Passwords
++desc_pl=Zmiany hase
++desc_hu=Jelszavak
+ name=Passwd
+-desc_tr=Parolalar Deitir
+-os_support=!windows
++desc_ca=Canvi de Contrasenyes
+ desc_de=Passwörter ändern
+-desc_af=Verander Wagwoord
+-desc_sk=Zmena hesla
+-desc_pl.UTF-8=Zmiany hase
+-desc_cz.UTF-8=Zmna hesla
+-desc_ja_JP.UTF-8=鴻若紊
+-desc_fr=Changez le Mot de Passe
+-desc_pl=Zmiany hase
++desc_nl=Wachtwoorden Wijzigen
++desc_zh_TW.Big5=怒鷄KX
+ desc_es=Cambio de Contraseñas
+-desc_ru_RU=瑁鉉
+ desc_no=Passord administrasjon
+-desc_cz=Zmna hesla
+-desc_ms=Menukar Katalaluan
+-desc_nl=Wachtwoorden Wijzigen
+-desc_sk.UTF-8=Zmena hesla
+-desc_hu=Jelszavak
+-desc_zh_TW.UTF-8=莅翫腆
+-version=1.600
+-longdesc=Change the password of any user on the system.
++desc_af=Verander Wagwoord
++desc_it=Cambio Password
+ desc_ru_SU=霑厦棉
++desc_ru_RU=瑁鉉
+ passwd=Change the passwords of Unix users.
++longdesc=Change the password of any user on the system.
++desc_pt_BR=Alterar Senha
++desc_ms=Menukar Katalaluan
++desc_cz=Zmna hesla
++desc_sk=Zmena hesla
++desc_tr=Parolalar Deitir
++readonly=1
++os_support=!windows
++desc_zh_TW.UTF-8=莅翫腆
++desc_fi=Vaihda Salasanoja
+ desc_ko_KR.euc=章硲 痕井
++desc_ko_KR.UTF-8= 覲蟆
++desc_ja_JP.euc=パスワードの変更
++desc_ja_JP.UTF-8=鴻若紊
+ desc_ru.UTF-8=舒仂仍亳
+-depends=useradmin 1.600
+-desc_de.UTF-8=Passwörter ändern
+-desc_fi.UTF-8=Vaihda Salasanoja
+-desc_af.UTF-8=Verander Wagwoord
+-desc_fr.UTF-8=Changez le Mot de Passe
+-desc_ms.UTF-8=Menukar Katalaluan
+-desc_it.UTF-8=Cambio Password
+-desc_es.UTF-8=Cambio de Contraseñas
+-desc_ca.UTF-8=Canvi de Contrasenyes
+-desc_pt_BR.UTF-8=Alterar Senha
+-desc_nl.UTF-8=Wachtwoorden Wijzigen
++desc_fr=Changez le Mot de Passe
++desc_hu.UTF-8=Jelszavak
++desc_cz.UTF-8=Zmna hesla
++desc_pl.UTF-8=Zmiany hase
++desc_sk.UTF-8=Zmena hesla
++version=1.605
diff --git a/app-admin/webmin/webmin-1.600.ebuild b/app-admin/webmin/webmin-1.600-r1.ebuild
similarity index 98%
rename from app-admin/webmin/webmin-1.600.ebuild
rename to app-admin/webmin/webmin-1.600-r1.ebuild
index b10f2b194bfa..1d2e90d61103 100644
--- a/app-admin/webmin/webmin-1.600.ebuild
+++ b/app-admin/webmin/webmin-1.600-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600.ebuild,v 1.1 2012/10/14 09:52:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600-r1.ebuild,v 1.1 2012/11/05 21:40:01 hwoarang Exp $
EAPI="3"
@@ -46,6 +46,9 @@ DEPEND="virtual/perl-Sys-Syslog
RDEPEND="${DEPEND}"
src_prepare() {
+ # Fix security bug - https://bugs.gentoo.org/show_bug.cgi?id=441840
+ epatch "${FILESDIR}/${P}-SA51201.patch"
+
local perl="$( which perl )"
# Remove the unnecessary and incompatible files
diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index 96a2d586367d..455b61ea10bd 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/metadata.xml
@@ -2,4 +2,7 @@
base-system
+
diff --git a/app-arch/tar/tar-1.26-r1.ebuild b/app-arch/tar/tar-1.26-r1.ebuild
index 39db2f06533a..b99c4f139e16 100644
--- a/app-arch/tar/tar-1.26-r1.ebuild
+++ b/app-arch/tar/tar-1.26-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.5 2012/05/24 04:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.7 2012/11/06 03:19:17 vapier Exp $
EAPI="3"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static userland_GNU xattr"
+IUSE="minimal nls static userland_GNU xattr"
RDEPEND="xattr? ( sys-apps/attr )"
DEPEND="${RDEPEND}
@@ -67,4 +67,10 @@ src_install() {
newman "${FILESDIR}"/tar.1 ${p}tar.1
mv "${ED}"/usr/sbin/${p}backup{,-tar}
mv "${ED}"/usr/sbin/${p}restore{,-tar}
+
+ if use minimal ; then
+ find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+ -type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+ -delete
+ fi
}
diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
index 49903ef75aea..f64d54c67925 100644
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@@ -2,3 +2,4 @@ DIST deja-dup-22.1.tar.xz 777248 SHA256 44cb8fcd45799a369c8da2717792a87e3e183eec
DIST deja-dup-23.2.tar.xz 823548 SHA256 64831f407bd102c13939d84600ab427c58f4d0ea1d9ecf2098979ad3eb7a6f2c SHA512 658c70a6248f206b99ed04b59075617ccb9691cbab3b118e68648c17d12732e3e88bd3a954c5c0dad9f08746af43f6cd2289875d65223f2dcb681f07289e7b42 WHIRLPOOL 6d72cdab99824952782fa0a9e17dd0367d3d590e99563ed29c9e8195db684fef61b4cc26d4a5e857b16d61b81ae3edcd27ff869f2af98723b30343e09ecf568e
DIST deja-dup-23.4.tar.xz 852796 SHA256 67392931fb6958cd13897a78d01fe7a31b169663696313142067901e28de041d SHA512 afe76249084a1b7222272b61673340f5d807867121c69af63f238d2de28b655f61efdd6ae50bb320ddbc481604dbc209d7a98c6f4c16f0646b36bdf635024f26 WHIRLPOOL bc8d2786fecb374a7717332b6c5c07da45d2d9ff8419b6228eb7185ccd2efc087a9ba4ef6af9f9343e5908be20451d9123824dca452082efeb6083277297f6dd
DIST deja-dup-24.0.tar.xz 865076 SHA256 4506871cb9858ea8ef56ef62cc20613a189c123070c123293b533bdfae333673 SHA512 01f9980e24272e89c7813fd75ca1493725940bb8d71f823fdc18ae46d9dcb76fb5a867c5cf1335ca35a65962e46a9e4c0bdf41d93427bbcb3c30e750337d4a70 WHIRLPOOL b2bcbe15e613656f8d834e875b6c52dbd870306d7629b7f0e359bc2e691b854b11df4cb6756b3e683b2814a005efb69b86f8f9737b437e4f616ac6c02d5d9dcc
+DIST deja-dup-25.1.1.tar.xz 844116 SHA256 6541545c14ac76e8d2b5b7d4a58a39bbe52586cf094db7f883263f65a341eaee SHA512 53226a850fcefda759c0948fe42fef62467e4479213326f1cc2922986cf56b0a07364dbe5ca2a69dfc9235f193124ba9d49a1eb7724f5986a16d9dfececde6ed WHIRLPOOL 8427f4084a44b69b7fce6bf1a64ab01369d88e482e9559f7e3ba924d8a22967b13265da1dba02eb70674cb11ff57790ab215c050de43977a07423f201b328bba
diff --git a/app-backup/deja-dup/deja-dup-25.1.1.ebuild b/app-backup/deja-dup/deja-dup-25.1.1.ebuild
new file mode 100644
index 000000000000..dc1f4fb3882e
--- /dev/null
+++ b/app-backup/deja-dup/deja-dup-25.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-25.1.1.ebuild,v 1.1 2012/11/05 18:28:43 jlec Exp $
+
+EAPI=4
+
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Simple backup tool using duplicity back-end"
+HOMEPAGE="https://launchpad.net/deja-dup/"
+SRC_URI="http://launchpad.net/${PN}/26/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/libsecret[vala]
+ dev-libs/glib:2
+ dev-libs/libpeas
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+
+ app-backup/duplicity
+ dev-libs/dbus-glib
+
+ nautilus? ( gnome-base/nautilus )"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gvfs[fuse]"
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ dev-lang/vala:0.16
+ dev-perl/Locale-gettext
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
+
+src_prepare() {
+ DOCS="NEWS AUTHORS"
+ G2CONF="${G2CONF}
+ $(use_with nautilus)
+ --without-ccpanel
+ --without-unity
+ --disable-schemas-compile
+ --disable-static"
+ export VALAC=$(type -p valac-0.16)
+
+ epatch ${PATCHES[@]}
+
+ gnome2_src_prepare
+}
diff --git a/app-backup/deja-dup/files/deja-dup-25.1.1-desktop.patch b/app-backup/deja-dup/files/deja-dup-25.1.1-desktop.patch
new file mode 100644
index 000000000000..09bcfad91bcd
--- /dev/null
+++ b/app-backup/deja-dup/files/deja-dup-25.1.1-desktop.patch
@@ -0,0 +1,27 @@
+ data/deja-dup-monitor.desktop.in.in | 2 +-
+ data/deja-dup-preferences.desktop.in.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/deja-dup-monitor.desktop.in.in b/data/deja-dup-monitor.desktop.in.in
+index c137b79..1f8e720 100644
+--- a/data/deja-dup-monitor.desktop.in.in
++++ b/data/deja-dup-monitor.desktop.in.in
+@@ -14,4 +14,4 @@ StartupNotify=false
+ NoDisplay=true
+
+ Type=Application
+-Categories=System;Utility;Archiving;
++Categories=Utility;Archiving;
+diff --git a/data/deja-dup-preferences.desktop.in.in b/data/deja-dup-preferences.desktop.in.in
+index 0c3a906..fed53ef 100644
+--- a/data/deja-dup-preferences.desktop.in.in
++++ b/data/deja-dup-preferences.desktop.in.in
+@@ -11,7 +11,7 @@ Exec=deja-dup-preferences
+ StartupNotify=true
+
+ Type=Application
+-Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-SystemSettings;
++Categories=GNOME;GTK;Archiving;Utility;X-GNOME-SystemSettings;
+
+ # Translators: Add whatever keywords you want in your language, separated by semicolons
+ # These keywords are used when searching for applications in dashes, etc.
diff --git a/app-crypt/bsign/bsign-0.4.5.ebuild b/app-crypt/bsign/bsign-0.4.5.ebuild
index c0649f1870d6..a31bd9ff3e05 100644
--- a/app-crypt/bsign/bsign-0.4.5.ebuild
+++ b/app-crypt/bsign/bsign-0.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bsign/bsign-0.4.5.ebuild,v 1.12 2012/05/21 18:33:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bsign/bsign-0.4.5.ebuild,v 1.13 2012/11/05 23:17:12 blueness Exp $
EAPI=2
inherit autotools eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/b/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86 ~x86-linux"
+KEYWORDS="~amd64 ppc ~ppc-macos ~x86 ~x86-linux"
IUSE="static-libs"
src_prepare() {
diff --git a/app-crypt/gpa/gpa-0.9.3.ebuild b/app-crypt/gpa/gpa-0.9.3.ebuild
index 7f87720b4951..1fb1f6c00ff2 100644
--- a/app-crypt/gpa/gpa-0.9.3.ebuild
+++ b/app-crypt/gpa/gpa-0.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.9.3.ebuild,v 1.2 2012/08/27 14:42:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.9.3.ebuild,v 1.3 2012/11/06 01:50:03 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86"
IUSE="nls"
RDEPEND=">=x11-libs/gtk+-2.10.0:2
diff --git a/app-crypt/md6sum/md6sum-1.0.ebuild b/app-crypt/md6sum/md6sum-1.0.ebuild
index b6c975640d25..53e991a4e6e2 100644
--- a/app-crypt/md6sum/md6sum-1.0.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md6sum/md6sum-1.0.ebuild,v 1.1 2011/03/28 11:02:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md6sum/md6sum-1.0.ebuild,v 1.2 2012/11/05 23:38:30 c1pher Exp $
EAPI="4"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
- epatch "${FILESDIR}/${P}-ldflags.patch" || die "patch failed"
+ epatch "${FILESDIR}/${P}-ldflags.patch"
}
src_install() {
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
index 5461f9f1e0cb..38577902120a 100644
--- a/app-crypt/md6sum/metadata.xml
+++ b/app-crypt/md6sum/metadata.xml
@@ -2,10 +2,6 @@
crypto
-
-hwoarang@gentoo.org
-Markos Chandras
-
diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
index 97ce039422a0..f17bbb48d282 100644
--- a/app-editors/fte/fte-20051115-r3.ebuild
+++ b/app-editors/fte/fte-20051115-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r3.ebuild,v 1.3 2012/11/05 13:20:00 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r3.ebuild,v 1.4 2012/11/05 23:19:18 blueness Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/fte/${P}-src.zip
LICENSE="|| ( GPL-2 Artistic )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="gpm slang X"
S="${WORKDIR}/${PN}"
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index a99410913845..2785786e2f21 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1 +1,2 @@
DIST akonadi-1.8.0.tar.bz2 213413 SHA256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d SHA512 9f995d90d84c8fa7bf51691b4bdabda69e64578dc7a2f0ee0b20979ef3da9e2128625c34b4ce84e5feb79c61615df7299905b2eeded9abcbe8deb22817e1821e WHIRLPOOL 492d184fa20a09e1f68438da8519e176731b1c2d66e01b8a2dfc940da24f167ae33bd00a51900444a18a6203a2165e4e70ef4a1c2db34ac4cc0660744f7a9230
+DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b0c58e28f215ffdc941b48c347 SHA512 8b33d9b2ee845e6ab8e01879f36b5a33c3ef1901490718859646f5b8a7ceffd6def1e788a218741023408991fef4c6cbb4769f125927801951515171ddbc6a7c WHIRLPOOL f20493ff6f1e3ae024dc47dfe7cb8f386fb4ce812cd30bd8132e09b75dc09fc884f41b9545ec46f6828b4582b7ee84f64c9586763eb5f221d3eb02da9e5e86f4
diff --git a/app-office/akonadi-server/akonadi-server-1.8.1.ebuild b/app-office/akonadi-server/akonadi-server-1.8.1.ebuild
new file mode 100644
index 000000000000..52ae50b77374
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.8.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.8.1.ebuild,v 1.1 2012/11/06 02:17:21 reavertm Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+ dev-libs/boost
+ >=dev-libs/soprano-2.6.51
+ >=x11-libs/qt-gui-4.5.0:4[dbus]
+ >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+ >=x11-libs/qt-test-4.5.0:4
+ x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt
+ >=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+ postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+RESTRICT=test
+# bug 401139
+
+pkg_setup() {
+ # Set default storage backend in order: SQLite, MySQL, PostgreSQL
+ # reverse driver check to keep the order
+ if use postgres; then
+ DRIVER="QPSQL"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ if use mysql; then
+ DRIVER="QMYSQL"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ if use sqlite; then
+ DRIVER="QSQLITE3"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ # Notify about driver name change
+ if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+ ewarn
+ ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+ ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+ fi
+
+ # Notify about MySQL not being default anymore
+ if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+ ewarn
+ ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+ ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+ ewarn "${CATEGORY}/${PN}."
+ ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+ ewarn "Available drivers are:${AVAILABLE}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DAKONADI_USE_STRIGI_SEARCH=OFF
+ $(cmake-utils_use test AKONADI_BUILD_TESTS)
+ $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ # Who knows, maybe it accidentally fixes our permission issues
+ cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+ insinto /usr/share/config/akonadi
+ doins "${T}"/akonadiserverrc
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ echo
+ elog "${DRIVER} has been set as your default akonadi storage backend."
+ elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+ elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index 51427ad69b3f..105fb43a3ff0 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -2,6 +2,7 @@
openoffice
+ dilfridge@gentoo.org
LibreOffice is a free office suite.
This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 4754d2799fa3..2bf141fbf79b 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,2 +1,3 @@
DIST texstudio-2.3.tar.gz 25524647 SHA256 ace47800118d3bdeb80dedcda6e659142f4ed5e5c2d8e9eb945ebd7ae8293d93 SHA512 c43864f51be4344adc10140b75a78f11e75f32afdea4c3310efd5897a6e628192dd4335b8250f2a2de8e287d9533864dca26e0a65d6d0f16322a4b3c18e81f86 WHIRLPOOL 4bcaff04bdabd7cb6156330c8e1e66d68fc9f781797eca8ef00198a48d509eed724b3c05a78bcce579f1c1fdbb76a25b6fd4708c05134ed251dcf2585daac955
DIST texstudio-2.4.tar.gz 13809336 SHA256 95ecd0e7aab5840b147c6bee68d3c5877d3cce0006117894b3056da211dc77a9 SHA512 394ddf6529284fced1db647db40b054490a49e01ed3b52515a880930f53a757a590b415c4b703442f89191e2be36d56ddb714ecc3445b3e49b37c1ad282a97e0 WHIRLPOOL 2373f9420c9d59d2c56d34c9485f699fe251785f366fb83ef03baa4a26a47fd81feaa287ca02fba55b92cd35e7ae6981254449d2f4916594b4bc292a887715dd
+DIST texstudio-2.5.tar.gz 16197967 SHA256 0e24af04aa6ab6e4b52c6c787c4a5687c3208457ad3bb5eb670b9703bb529d2a SHA512 89324ab50366ab78f89001a971a443cda5adf3d6dc2371f9ff2b40668ed582ca0b6af55def150f1fa2b837467576de97441828d508d6b03c12d95099d5fdae2c WHIRLPOOL 3a4dca74208e59e6944de5ef632c72aa25cc49a645732494f5a1c0430b7872ddbac5f619063eb1e0be2006582adac3f09f35e246e66604f926e9de4b43432726
diff --git a/app-office/texstudio/files/texstudio-2.5-hunspell.patch b/app-office/texstudio/files/texstudio-2.5-hunspell.patch
new file mode 100644
index 000000000000..a895713ff557
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-hunspell.patch
@@ -0,0 +1,84 @@
+ spellerutility.h | 2 +-
+ texstudio.pro | 37 ++++++-------------------------------
+ 2 files changed, 7 insertions(+), 32 deletions(-)
+
+diff --git a/spellerutility.h b/spellerutility.h
+index 1e1d6e2..083f412 100644
+--- a/spellerutility.h
++++ b/spellerutility.h
+@@ -13,7 +13,7 @@
+
+ #include "mostQtHeaders.h"
+
+-#include "hunspell/hunspell.hxx"
++#include
+ class SpellerUtility: public QObject {
+ Q_OBJECT
+ public:
+diff --git a/texstudio.pro b/texstudio.pro
+index 541b6b6..f801fc2 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
+ debughelper.h \
+ thesaurusdialog.h \
+ xmltagslistwidget.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/w_char.hxx \
+ qcodeedit/lib/qeditorinputbinding.h \
+ qcodeedit/lib/qeditorinputbindinginterface.h \
+ randomtextgenerator.h \
+@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
+ latexdocument.h \
+ unicodeinsertion.h \
+ universalinputdialog.h \
+- hunspell/replist.hxx \
+ scriptengine.h \
+ insertgraphics.h \
+ txstabwidget.h \
+@@ -157,18 +138,6 @@ SOURCES += main.cpp \
+ codesnippet.cpp \
+ thesaurusdialog.cpp \
+ xmltagslistwidget.cpp \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/replist.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/hunzip.cxx \
+ encodingdialog.cpp \
+ qcodeedit/lib/qeditorinputbinding.cpp \
+ randomtextgenerator.cpp \
+@@ -591,4 +560,10 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
+ #QMAKE_CXXFLAGS_DEBUG += -Werror -Wall -Wextra -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered -Wempty-body -Wsign-compare -Waddress -Wlogical-op -Winline
+ QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline
+
++# enable use of pkgconfig
++unix {
++ CONFIG += link_pkgconfig
++ # use system hunspell
++ PKGCONFIG += hunspell
++}
+
diff --git a/app-office/texstudio/files/texstudio-2.5-qtsingle.patch b/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
new file mode 100644
index 000000000000..9ef2cb44f68f
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
@@ -0,0 +1,23 @@
+ texstudio.pro | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/texstudio.pro b/texstudio.pro
+index f801fc2..2b1d3df 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -10,8 +10,6 @@ QT += network \
+ QT += phonon
+ DEFINES += PHONON
+ }
+-contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")
+-else:include(qtsingleapplication/qtsingleapplication.pri)
+
+ # ##############################
+ PRECOMPILED_HEADER = mostQtHeaders.h
+@@ -567,3 +565,6 @@ unix {
+ PKGCONFIG += hunspell
+ }
+
++#use system qtsingleapplication
++CONFIG += qtsingleapplication
++
diff --git a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
new file mode 100644
index 000000000000..667ee3186b34
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
@@ -0,0 +1,42 @@
+From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
+From: hannes
+Date: Sun, 9 Sep 2012 10:56:06 +0200
+Subject: [PATCH] viewer
+
+---
+ buildmanager.cpp | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git buildmanager.cpp buildmanager.cpp
+index ac7027a..ac913d0 100644
+--- buildmanager.cpp
++++ buildmanager.cpp
+@@ -762,25 +762,13 @@
+ // xdvi %.dvi -sourceposition @:%.tex
+ // kdvi "file:%.dvi#src:@ %.tex"
+ QString getCommandLineViewDvi(){
+- switch (x11desktop_env()) {
+- case 3: return "kdvi %.dvi > /dev/null";
+- case 4: return "okular %.dvi > /dev/null";
+- default:return "evince %.dvi > /dev/null";
+- }
++ return "xdg-open %.dvi > /dev/null";
+ };
+ QString getCommandLineViewPs(){
+- switch (x11desktop_env()) {
+- case 3: return "kghostview %.ps > /dev/null";
+- case 4: return "okular %.ps > /dev/null";
+- default: return "evince %.ps > /dev/null";
+- };
++ return "xdg-open %.ps > /dev/null";
+ }
+ QString getCommandLineViewPdfExternal(){
+- switch (x11desktop_env()) {
+- case 3: return "kpdf %.pdf > /dev/null";
+- case 4: return "okular %.pdf > /dev/null";
+- default: return "evince %.pdf > /dev/null";
+- };
++ return "xdg-open %.pdf > /dev/null";
+ }
+ QString getCommandLineGhostscript(){ return ""; }
+
diff --git a/app-office/texstudio/texstudio-2.5.ebuild b/app-office/texstudio/texstudio-2.5.ebuild
new file mode 100644
index 000000000000..a7ceeb4d0d02
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.5.ebuild,v 1.1 2012/11/05 18:57:07 jlec Exp $
+
+EAPI=4
+
+inherit base fdo-mime qt4-r2
+
+DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+ app-text/hunspell
+ app-text/poppler[qt4]
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.6.1:4
+ >=x11-libs/qt-core-4.6.1:4
+ >=x11-libs/qt-script-4.6.1:4
+ >=x11-libs/qt-test-4.6.1:4
+ >=x11-libs/qt-webkit-4.6.1:4
+ video? ( media-libs/phonon )"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hunspell.patch
+# 441914
+# "${FILESDIR}"/${P}-qtsingle.patch
+ "${FILESDIR}"/${PN}-2.4-desktop.patch
+# Get it from fedora
+ "${FILESDIR}"/${P}-viewers-use-xdg-open.patch
+ )
+
+src_prepare() {
+ find hunspell -delete
+ if use video; then
+ sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+ fi
+ qt4-r2_src_prepare
+}
+
+src_install() {
+ for i in 16x16 22x22 32x32 48x48 64x64; do
+ insinto /usr/share/icons/hicolor/${i}
+ newins utilities/${PN}${i}.png ${PN}.png
+ done
+ qt4-r2_src_install
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index cf4fd0ba680a..bb6f575eba95 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,3 +1,2 @@
-DIST gentoolkit-0.3.0.4.tar.gz 180411 SHA256 cc1fc031bf69a095a5cd2aab433f06e8eb3b5af2fef743bce5958c7f7f38803c SHA512 bff2b6e4d2f384f44e7c889dd12a08562ea2e1ff525e6892878cf9de72a97cb9fc9560115718e1e1903924cac052d7c61c6d83b48059a8377f3b482a6f77ed72 WHIRLPOOL 08c6b9bd3de6641f11fe02fd2ed532ae14cffd81d9a2d10c26c5eed6bdc095c4d6d3c8268e6320994d827db9b876197be8d1e60d5c2ebdc7bcd660340c150038
-DIST gentoolkit-0.3.0.5.tar.gz 3189023 SHA256 4085ab693dd2d01d31252a295036dbb0a4cb7d27ff393529186d412802a7a6f3 SHA512 53d4cde2679a6cac1860d0c824888fa4f9fad0f4b00640f2fcdf3f3f539f0b8094cbb45a85e8e784cf356f25d9298fa190905471737eeb40ebf2266c5f53512e WHIRLPOOL 7ebe891b6072f49cd6eb35cd3813cad2881927a3348847a0cf9149839c1e36353b70431ede3635e804fecff49d32626b4b625fb4b91c7f26209b9d5720f3cbeb
DIST gentoolkit-0.3.0.6.tar.gz 191896 SHA256 5b1b7e9e0363764b3c8349540e3a16fcdd850ec2441bb56b24fdb729130e604a SHA512 6bc46fd364cba3326e9e4f1083485f1220a8dc6675b75ad058fbee59d3c103f2ca103be6035f5f726e92f496a854dca72ec08b0d2cfe012aa7efbdc3a95891a0 WHIRLPOOL e928b8d3c493ac00b622b859985e144cd7828d4c4e1be7c2a4b8abae9864f10aa22c4626b991d9ba81c6408dc7769be2346f2f9abf3c2ec864ce9eed2ae3d9e5
+DIST gentoolkit-0.3.0.7.tar.gz 3191108 SHA256 45ca2b48cfba7939a76428213f2fc4c3a1fc58716290f7a352ccd9299beb49d7 SHA512 798a058a58cf881a24b92ae32fabe7c6d49305e2611bab568004dd711392e5af97b7d66029e344f4e7c52d0b6cf47690b76cf7e3d77b5482c30b6883f872c1d1 WHIRLPOOL c21ce47365500cd93c6c617d79ee9c979f1f6a06966ed41a69eb73014354b6e066fef904c2d221b64f6116a76792f2060a8863ee633f781764c270ce954de1a7
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
deleted file mode 100644
index 35c19f133f3f..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild,v 1.11 2012/10/29 16:31:11 mgorny Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-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"
-
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml. This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
- >=dev-lang/python-2.6[xml]
- !>=dev-lang/python-2.6[-xml]
- !<=app-portage/gentoolkit-dev-0.2.7
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep
- virtual/python-argparse"
-
-distutils_src_compile_pre_hook() {
- echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
- VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
- || die "setup.py set_version failed"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-euse-376393.patch"
- epatch "${FILESDIR}/${PV}-euse-379599.patch"
- epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
- epatch "${FILESDIR}/${PV}-equery-380573.patch"
- epatch "${FILESDIR}/${PV}-euse-382219.patch"
- epatch "${FILESDIR}/${PV}-setup-394909.patch"
-}
-
-src_install() {
- python_convert_shebangs -r "" build-*/scripts-*
- distutils_src_install
-
- # Create cache directory for revdep-rebuild
- dodir /var/cache/revdep-rebuild
- keepdir /var/cache/revdep-rebuild
- use prefix || fowners root:root /var/cache/revdep-rebuild
- fperms 0700 /var/cache/revdep-rebuild
-
- # remove on Gentoo Prefix platforms where it's broken anyway
- if use prefix; then
- elog "The revdep-rebuild command is removed, the preserve-libs"
- elog "feature of portage will handle issues."
- rm "${ED}"/usr/bin/revdep-rebuild
- rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
- rm -rf "${ED}"/etc/revdep-rebuild
- rm -rf "${ED}"/var
- fi
-
- # Can distutils handle this?
- dosym eclean /usr/bin/eclean-dist
- dosym eclean /usr/bin/eclean-pkg
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- einfo
- einfo "For further information on gentoolkit, please read the gentoolkit"
- einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
- einfo
- einfo "Another alternative to equery is app-portage/portage-utils"
- ewarn
- ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
- ewarn "options and default behavior. The list of injected GLSAs"
- ewarn "has moved to /var/lib/portage/glsa_injected, please"
- ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
similarity index 73%
rename from app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
index dbe1a72e4aca..508d9131b2db 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild,v 1.10 2012/10/29 16:31:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.1 2012/11/05 23:59:49 fuzzyray Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -18,11 +18,8 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-# Drop the prefix keywords since equery is currently broken on prefix Bug 406495
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-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 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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"
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
# Note: dev-lang/python dependencies are so emerge will print a blocker if any
# installed slot of python is not built with +xml. This is used since
# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
@@ -63,8 +60,7 @@ src_install() {
if use prefix; then
elog "The revdep-rebuild command is removed, the preserve-libs"
elog "feature of portage will handle issues."
- rm "${ED}"/usr/bin/revdep-rebuild
- rm "${ED}"/usr/bin/revdep-rebuild.py
+ rm "${ED}"/usr/bin/revdep-rebuild*
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
rm -rf "${ED}"/etc/revdep-rebuild
rm -rf "${ED}"/var
@@ -83,9 +79,13 @@ pkg_postinst() {
einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
einfo
einfo "Another alternative to equery is app-portage/portage-utils"
- ewarn
- ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
- ewarn "options and default behavior. The list of injected GLSAs"
- ewarn "has moved to /var/lib/portage/glsa_injected, please"
- ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+ einfo
+ einfo "Additional tools that may be of interest:"
+ einfo
+ einfo " app-admin/eclean-kernel"
+ einfo " app-portage/diffmask"
+ einfo " app-portage/flaggie"
+ einfo " app-portage/install-mask"
+ einfo " app-portage/portpeek"
+ einfo " app-portage/smart-live-rebuild"
}
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 9c0335941024..8ee99ee7c927 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,2 +1,3 @@
DIST libexttextcat-3.2.0.tar.xz 864460 SHA256 5fce7471ff644500f2ffd72e4ade0fc0d19f810d69cbe59245edb2d4cc51e105 SHA512 6973a098b216f122f6fbafdfc1018cd6d18be98de0344639e6f342a7dbe7c643d27c5ce6b0ae46a26b9b820d344ddc9dc4e781207a57b16f30fc6e2748531a58 WHIRLPOOL 9e562b2ee00ab4363fb0f6c833b20aca36a87151a9d77340e13244b3272380f54f738620fbc920b4307e4ac0a890c58c52d8c2490a2f582d0a505e8d39e0a07a
DIST libexttextcat-3.3.1.tar.xz 988072 SHA256 04923138f7eb42ac3f1f47d76c1f9e78c88b7e912a6b6e28f471b91b2f5deaa8 SHA512 1b4f0e0315f9704816537af1260a469d1486bd368a5015eeea88646b1aeec38c8476a81ae131f9a44a53f9afea3e975787491c03e79de50494571e2d42dd5d5c WHIRLPOOL dd742ce2b923de47e9d6054ec98fafdd377495941f496bad8e907d3bb749df13a9b429974e917205aac2456a68b1d92c980c09d1789c8799b21c567773ce08ed
+DIST libexttextcat-3.4.0.tar.xz 987560 SHA256 a7e08926274daa3932129deb8e86d90417f54d01ed4b8345b984ad262dac0ac2 SHA512 e62914117269292232b082f83ba5bcc9860d896dfed8b4043aab4fcfa7cba89b3c31b876dca7cce39fa5bc5b1788832050ecb50f86d26a4cf853ef7664f257a3 WHIRLPOOL 0d092da2bce0e73dcf167c942a730bd92e9620771decd15d5016a4f7528c6cff6f0eb77f89fe1e92b67d6d366ab14856b872bfce80311ef7d207922aee1b516f
diff --git a/app-text/libexttextcat/libexttextcat-3.4.0.ebuild b/app-text/libexttextcat/libexttextcat-3.4.0.ebuild
new file mode 100644
index 000000000000..aa1426aae504
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.4.0.ebuild,v 1.1 2012/11/05 20:39:46 scarabeus Exp $
+
+EAPI=4
+
+DESCRIPTION="Library implementing N-gram-based text categorization"
+HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild
index 0272eaeb8bb2..08a907abef50 100644
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild,v 1.3 2012/05/22 12:16:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild,v 1.4 2012/11/05 21:15:29 ulm Exp $
EAPI="4"
@@ -12,7 +12,7 @@ MY_PN=${PN/-bin/}
DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
SRC_URI="http://www.frijters.net/${MY_PN}bin-${PV}.zip"
-LICENSE="as-is"
+LICENSE="ZLIB GPL-2-with-linking-exception"
SLOT="0"
S=${WORKDIR}/${MY_P}
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
index f021893457ab..0708103f718d 100644
--- a/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild,v 1.1 2012/07/21 09:23:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-7.1.4532.2.ebuild,v 1.2 2012/11/05 21:15:29 ulm Exp $
EAPI="4"
@@ -12,7 +12,7 @@ MY_PN=${PN/-bin/}
DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
SRC_URI="http://www.frijters.net/${MY_PN}bin-${PV}.zip"
-LICENSE="as-is"
+LICENSE="ZLIB GPL-2-with-linking-exception"
SLOT="0"
S=${WORKDIR}/${MY_P}
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
index ff06db3b85a3..1d05db0a9f0d 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild,v 1.5 2012/05/04 03:56:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild,v 1.6 2012/11/05 21:15:03 ulm Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
http://www.frijters.net/${PN}src-${PV}.zip"
-LICENSE="as-is"
+LICENSE="ZLIB GPL-2-with-linking-exception"
SLOT="0"
KEYWORDS="amd64 ppc x86"
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index 39a85d6a790e..1b4f3098daee 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.6 2012/07/21 16:16:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.7 2012/11/05 21:15:03 ulm Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
http://www.frijters.net/${PN}src-${PV}.zip"
-LICENSE="as-is"
+LICENSE="ZLIB GPL-2-with-linking-exception"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
diff --git a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
index 14647021b566..6a1756e2125f 100644
--- a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.2 2012/07/21 16:16:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.3 2012/11/05 21:15:03 ulm Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip
http://www.frijters.net/${PN}src-${PV}.zip"
-LICENSE="as-is"
+LICENSE="ZLIB GPL-2-with-linking-exception"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-embedded/include/include-0.4.2.ebuild b/dev-embedded/include/include-0.4.2.ebuild
index 03f68a6ab2fd..0531e6ab1d7c 100644
--- a/dev-embedded/include/include-0.4.2.ebuild
+++ b/dev-embedded/include/include-0.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/include/include-0.4.2.ebuild,v 1.2 2012/11/05 11:05:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/include/include-0.4.2.ebuild,v 1.3 2012/11/05 22:50:29 blueness Exp $
EAPI="4"
@@ -10,5 +10,5 @@ SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc ~x86"
IUSE=""
diff --git a/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild
index d62182edf722..8f00c5de86ae 100644
--- a/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild
+++ b/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild,v 1.2 2012/11/04 19:50:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/regina-rexx-3.6-r1.ebuild,v 1.3 2012/11/05 21:39:22 blueness Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ~s390 ~sparc ~x86"
IUSE=""
S=${WORKDIR}/Regina-REXX-${PV}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d8bdd95d839b..ae01b65da038 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,3 +1,4 @@
DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 SHA512 e7cc4383bb960cb59eecd29ef66e2c53466fe5f126bde58f50ba104ee8ab220771db5f7b35e4b9856e9f257d1def5a9b7ea48e1d2757976a89c5a2e3f1fdc327 WHIRLPOOL 4d8d94821c996475ec2bab962b92ec061b890a318897cab695e66daef3f9c8687990450fb26fd783fd0c5be35ccb71616994ef0c8e41c555312ae5383e3649cf
DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
DIST boost_1_51_0.tar.bz2 50811407 SHA256 fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696 SHA512 43a45ff34879328c57e1694e199b895d7535df7cdf78b127ec2649841ac5973f2dddbc0b00a1ed71f2347def6d44f1d8cc5c0deea120f60f53714ebe28046478 WHIRLPOOL 2cfe8ff8b1b812f1a2d02cad25a06fe2a824ef319d95e113fc307d432ff54f2367ac86d922517ce63fce2335b14a9d86ec0c9858b10466b4bf76d28c1ceca828
+DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
diff --git a/dev-libs/boost/boost-1.52.0.ebuild b/dev-libs/boost/boost-1.52.0.ebuild
new file mode 100644
index 000000000000..2cd7a8306294
--- /dev/null
+++ b/dev-libs/boost/boost-1.52.0.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0.ebuild,v 1.1 2012/11/05 18:23:56 flameeyes Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit flag-o-matic multilib multiprocessing python toolchain-funcs versionator
+
+MY_P=${PN}_$(replace_all_version_separators _)
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+MAJOR_V="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug doc icu mpi python static-libs tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
+ !icu? ( virtual/libiconv )
+ mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
+ sys-libs/zlib
+ !app-admin/eselect-boost"
+DEPEND="${RDEPEND}
+ =dev-util/boost-build-${MAJOR_V}*"
+
+S=${WORKDIR}/${MY_P}
+
+MAJOR_PV=$(replace_all_version_separators _ ${MAJOR_V})
+BJAM="b2-${MAJOR_PV}"
+
+create_user-config.jam() {
+ local compiler compiler_version compiler_executable
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ compiler="darwin"
+ compiler_version="$(gcc-fullversion)"
+ compiler_executable="$(tc-getCXX)"
+ else
+ compiler="gcc"
+ compiler_version="$(gcc-version)"
+ compiler_executable="$(tc-getCXX)"
+ fi
+ local mpi_configuration python_configuration
+
+ if use mpi; then
+ mpi_configuration="using mpi ;"
+ fi
+
+ if use python; then
+ python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
+ fi
+
+ cat > user-config.jam << __EOF__
+using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_setup() {
+ if use python; then
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
+ "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
+ "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
+ "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
+ "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
+ "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
+ "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
+ "${FILESDIR}/remove-toolset-1.48.0.patch"
+}
+
+src_configure() {
+ OPTIONS=""
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ # We need to add the prefix, and in two cases this exceeds, so prepare
+ # for the largest possible space allocation.
+ append-ldflags -Wl,-headerpad_max_install_names
+ fi
+
+ # bug 298489
+ if use ppc || use ppc64; then
+ [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+ fi
+
+ use icu && OPTIONS+=" -sICU_PATH=/usr"
+ use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
+ use mpi || OPTIONS+=" --without-mpi"
+ use python || OPTIONS+=" --without-python"
+
+ # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
+ if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
+ OPTIONS+=" --disable-long-double"
+ fi
+
+ OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
+
+ if use static-libs; then
+ LINK_OPTS="link=shared,static"
+ LIBRARY_TARGETS="*.a *$(get_libname)"
+ else
+ LINK_OPTS="link=shared"
+ # There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
+ LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
+ fi
+}
+
+src_compile() {
+ export BOOST_ROOT="${S}"
+ PYTHON_DIRS=""
+ MPI_PYTHON_MODULE=""
+ NUMJOBS="-j$(makeopts_jobs)"
+
+ building() {
+ create_user-config.jam
+
+ einfo "Using the following command to build:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} ${NUMJOBS} -q -d+2 \
+ gentoorelease \
+ --user-config=user-config.jam \
+ ${OPTIONS} threading=single,multi ${LINK_OPTS} \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ || die "Building of Boost libraries failed"
+
+ # ... and do the whole thing one more time to get the debug libs
+ if use debug; then
+ einfo "Using the following command to build:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} ${NUMJOBS} -q -d+2 \
+ gentoodebug \
+ --user-config=user-config.jam \
+ ${OPTIONS} threading=single,multi ${LINK_OPTS} \
+ --buildid=debug \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ || die "Building of Boost debug libraries failed"
+ fi
+
+ if use python; then
+ if [[ -z "${PYTHON_DIRS}" ]]; then
+ PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+ else
+ if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+ die "Inconsistent structure of build directories"
+ fi
+ fi
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
+ done
+
+ if use mpi; then
+ if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+ MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
+ if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+ die "Multiple mpi.so files found"
+ fi
+ else
+ if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
+ die "Inconsistent structure of build directories"
+ fi
+ fi
+
+ mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
+ fi
+ fi
+ }
+ if use python; then
+ python_execute_function building
+ else
+ building
+ fi
+
+ if use tools; then
+ pushd tools > /dev/null || die
+ einfo "Using the following command to build the tools:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
+
+ ${BJAM} ${NUMJOBS} -q -d+2\
+ gentoorelease \
+ --user-config=../user-config.jam \
+ ${OPTIONS} \
+ || die "Building of Boost tools failed"
+ popd > /dev/null || die
+ fi
+}
+
+src_install () {
+ installation() {
+ create_user-config.jam
+
+ if use python; then
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+ done
+
+ if use mpi; then
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+ fi
+ fi
+
+ einfo "Using the following command to install:"
+ einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
+
+ ${BJAM} -q -d+2 \
+ gentoorelease \
+ --user-config=user-config.jam \
+ ${OPTIONS} threading=single,multi ${LINK_OPTS} \
+ --includedir="${D}usr/include" \
+ --libdir="${D}usr/$(get_libdir)" \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ install || die "Installation of Boost libraries failed"
+
+ if use debug; then
+ einfo "Using the following command to install:"
+ einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} -q -d+2 \
+ gentoodebug \
+ --user-config=user-config.jam \
+ ${OPTIONS} threading=single,multi ${LINK_OPTS} \
+ --includedir="${D}usr/include" \
+ --libdir="${D}usr/$(get_libdir)" \
+ --buildid=debug \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ install || die "Installation of Boost debug libraries failed"
+ fi
+
+ if use python; then
+ rm -r ${PYTHON_DIRS} || die
+
+ # Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
+ if use mpi; then
+ mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+ mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+ cat << EOF > "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
+import sys
+if sys.platform.startswith('linux'):
+ import DLFCN
+ flags = sys.getdlopenflags()
+ sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
+ from . import mpi
+ sys.setdlopenflags(flags)
+ del DLFCN, flags
+else:
+ from . import mpi
+del sys
+EOF
+ fi
+ fi
+ }
+ if use python; then
+ python_execute_function installation
+ else
+ installation
+ fi
+
+ use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
+
+ if use doc; then
+ find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
+ dohtml \
+ -A pdf,txt,cpp,hpp \
+ *.{htm,html,png,css} \
+ -r doc
+ dohtml \
+ -A pdf,txt \
+ -r tools
+ insinto /usr/share/doc/${PF}/html
+ doins -r libs
+ doins -r more
+
+ # To avoid broken links
+ insinto /usr/share/doc/${PF}/html
+ doins LICENSE_1_0.txt
+
+ dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
+ fi
+
+ dosym boost-${MAJOR_PV}/boost /usr/include/boost
+
+ pushd "${D}usr/$(get_libdir)" > /dev/null || die
+
+ # The threading libs obviously always gets the "-mt" (multithreading) tag
+ # some packages seem to have a problem with it. Creating symlinks...
+
+ if use static-libs; then
+ THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+ else
+ THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+ fi
+ local lib
+ for lib in ${THREAD_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
+ done
+
+ # The same goes for the mpi libs
+ if use mpi; then
+ if use static-libs; then
+ MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+ else
+ MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+ fi
+ local lib
+ for lib in ${MPI_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
+ done
+ fi
+
+ if use debug; then
+ if use static-libs; then
+ THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
+ else
+ THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
+ fi
+
+ local lib
+ for lib in ${THREAD_DEBUG_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
+ done
+
+ if use mpi; then
+ if use static-libs; then
+ MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+ else
+ MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+ fi
+
+ local lib
+ for lib in ${MPI_DEBUG_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/${lib/-mt/}"
+ done
+ fi
+ fi
+
+ local f
+ for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
+ dosym ${f} /usr/$(get_libdir)/${f/-${MAJOR_PV}}
+ done
+
+ if use debug; then
+ dodir /usr/$(get_libdir)/boost-debug
+ local f
+ for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
+ dosym ../${f} /usr/$(get_libdir)/boost-debug/${f/-${MAJOR_PV}-debug}
+ done
+ fi
+
+ popd > /dev/null || die
+
+ if use tools; then
+ pushd dist/bin > /dev/null || die
+ # Append version postfix to binaries for slotting
+ local b
+ for b in *; do
+ newbin "${b}" "${b}-${MAJOR_PV}"
+ done
+ popd > /dev/null || die
+
+ pushd dist > /dev/null || die
+ insinto /usr/share
+ doins -r share/boostbook
+ # Append version postfix for slotting
+ mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
+ popd > /dev/null || die
+ fi
+
+ pushd status > /dev/null || die
+ if [[ -f regress.log ]]; then
+ docinto status
+ dohtml *.html ../boost.png
+ dodoc regress.log
+ fi
+ popd > /dev/null || die
+
+ # boost's build system truely sucks for not having a destdir. Because for
+ # this reason we are forced to build with a prefix that includes the
+ # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+ # DESTROOT instread of the actual EPREFIX. There is no way out of here
+ # but to do it the dirty way of manually setting the right install_names.
+ if [[ ${CHOST} == *-darwin* ]]; then
+ einfo "Working around completely broken build-system(tm)"
+ local d
+ for d in "${ED}"usr/lib/*.dylib; do
+ if [[ -f ${d} ]]; then
+ # fix the "soname"
+ ebegin " correcting install_name of ${d#${ED}}"
+ install_name_tool -id "/${d#${D}}" "${d}"
+ eend $?
+ # fix references to other libs
+ refs=$(otool -XL "${d}" | \
+ sed -e '1d' -e 's/^\t//' | \
+ grep "^libboost_" | \
+ cut -f1 -d' ')
+ local r
+ for r in ${refs}; do
+ ebegin " correcting reference to ${r}"
+ install_name_tool -change \
+ "${r}" \
+ "${EPREFIX}/usr/lib/${r}" \
+ "${d}"
+ eend $?
+ done
+ fi
+ done
+ fi
+}
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+src_test() { :; }
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
index 683c053094db..1993c86d4b82 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.8 2012/03/08 15:01:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.9 2012/11/05 21:56:02 eras Exp $
EAPI=2
@@ -14,7 +14,7 @@ HOMEPAGE="http://asg.web.cmu.edu/sasl/"
SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-LICENSE="as-is"
+LICENSE="BSD-4"
SLOT="2"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
index 4d4b299aaca2..b2668145102f 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.1 2012/01/12 07:34:48 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.2 2012/11/05 21:56:02 eras Exp $
EAPI=4
inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
HOMEPAGE="http://cyrusimap.web.cmu.edu/"
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BSD-4"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
index c40b8315f9cb..def0e9d1c9e1 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild,v 1.2 2012/05/29 16:36:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild,v 1.3 2012/11/05 21:56:02 eras Exp $
EAPI=4
inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
HOMEPAGE="http://cyrusimap.web.cmu.edu/"
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BSD-4"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
index 2999cdc99319..22d0131b768d 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.1 2012/07/11 18:17:25 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.2 2012/11/05 21:56:02 eras Exp $
EAPI=4
inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
HOMEPAGE="http://cyrusimap.web.cmu.edu/"
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BSD-4"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
index 9f32d4f8e22a..1ec7a785daab 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.2 2011/12/05 10:39:46 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.3 2012/11/05 21:56:02 eras Exp $
EAPI=4
inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
HOMEPAGE="http://cyrusimap.web.cmu.edu/"
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BSD-4"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild
index a6cdfc1e2412..fd6cb29cad97 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild,v 1.1 2012/08/17 14:41:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild,v 1.2 2012/11/06 02:57:11 blueness Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/dev-python/coverage/coverage-3.5.3.ebuild b/dev-python/coverage/coverage-3.5.3.ebuild
index 5fdc65781ad9..b429984ee61d 100644
--- a/dev-python/coverage/coverage-3.5.3.ebuild
+++ b/dev-python/coverage/coverage-3.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3.ebuild,v 1.1 2012/09/30 11:05:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3.ebuild,v 1.3 2012/11/05 22:33:51 blueness Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools"
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index d32cf1ca8e55..b43b27e6bd51 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,4 +1,3 @@
-DIST logilab-common-0.55.2.tar.gz 182524 SHA256 3242039f4e0732b510e03ef638f1ea43e65ddb7154164a9bda02514ee514f99a SHA512 bbc5b3ee84e53a20ddd04be9703022ae73b163537c9a9d812ec4c49fdfdfa9758c3a45e065cb8fb693cca2deb1dfbd032493923ab3000f59d88945139f95719a WHIRLPOOL 8d5f6c62ebf5e5ced1902f4dfed457b94aa879b92ceb854ed715b0d2975a82ebefb38f64bf4f1ff6bf7a57ae63ec4a56f867782d1e0739ed1ee35474e3490b92
DIST logilab-common-0.57.1.tar.gz 181975 SHA256 102c4860cad1ffaee98e6746ad89de4e5c40b63a569d4e131379b84c4907ed0a SHA512 84d4be823fbbff0944a6f9162dc365feea6e6116d43c2c5a65726a4e7347c771fbecaf9a4d8d81c3cdd7f79ab9a6697ab1def0bf1f4219cb947c8b1a7012c023 WHIRLPOOL 95914ed46451447f2b023fc4b86bc8c27bc2d9a99c2b7e73da6ea704877a8ed761c56cf4562afccffb6d6b7da0853cc5575922c790de7f81438a0c6c343286b0
DIST logilab-common-0.57.2.tar.gz 182851 SHA256 feb56645bf944cbbb4d193e77d5780463084c0d2b50370885054f9144e0da86e SHA512 cbc4f96bced643b8ad0d49d06124bce68bcfbff04195c71b6ab9057dfc836f9b509f31d97c4ff35b2ccaba98a01dc6de095bc125ed37c20cbc378cb5d8d35646 WHIRLPOOL 13d4090e829d575ba438de260f014c5352bc5745f96209d2df54e580c10daf7db9ec5f1afb0d406614844b9fba347792b6fe7e5d66705b53e747336c54d05296
DIST logilab-common-0.58.1.tar.gz 193990 SHA256 2fadd2fa938fd033c8a7e126cfe835f6b790de918b0f0d2c631b49962e9e7ff9 SHA512 b70bdf2b00ac75c34e74b341886008b0069c96f38308af62c093756fdbb218bbbcbb6b95827099f2c0da2c43744eb9029f3dc546947bfc7e0b32a9ed8df6dc7b WHIRLPOOL f059b457d286db7d3b71b4f6e1f9a659a151a8930ff65565a617345151e467e587aae2524846b24190437bfc634523210868dd160cf65db674cd03606ae8e5fb
diff --git a/dev-python/logilab-common/logilab-common-0.55.2.ebuild b/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild
similarity index 65%
rename from dev-python/logilab-common/logilab-common-0.55.2.ebuild
rename to dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild
index 70dab4b66dbc..0478428f69e1 100644
--- a/dev-python/logilab-common/logilab-common-0.55.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.55.2.ebuild,v 1.5 2012/08/27 15:21:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1-r1.ebuild,v 1.1 2012/11/05 17:48:10 idella4 Exp $
-EAPI="3"
+EAPI="4"
SUPPORT_PYTHON_ABIS="1"
+# Current tally of 8 test failures for python3
+#PYTHON_TESTS_RESTRICTED_ABIS="3.*"
inherit distutils
@@ -13,21 +15,43 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test doc"
# dev-python/unittest2 is not required with Python >=3.2.
RDEPEND="dev-python/setuptools
dev-python/unittest2"
+
# Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed.
DEPEND="${RDEPEND}
test? (
dev-python/egenix-mx-base
!dev-python/psycopg[-mxdatetime]
- )"
+ )
+ doc? ( dev-python/epydoc )"
PYTHON_MODNAME="logilab"
+src_prepare() {
+ if use doc; then
+ sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
+ fi
+ distutils_src_prepare
+}
+
+src_compile() {
+ distutils_src_compile
+
+ # Simplest way to make makefile point to the right place.
+ mklinks() {
+ # dosym it seems is restricted to src_install.
+ ln -s build-${PYTHON_ABI} build
+ emake -C doc epydoc
+ rm build
+ }
+ use doc && python_execute_function -f mklinks
+}
+
src_test() {
testing() {
# Install temporarily.
@@ -40,9 +64,9 @@ src_test() {
pushd "${spath}" > /dev/null || return 1
if [[ "${PYTHON_ABI}" == 3.* ]]; then
# Support for Python 3 is experimental. Some tests are known to fail.
- PYTHONPATH="${spath}" "$(PYTHON)" "${tpath}${EPREFIX}/usr/bin/pytest" -v
+ PYTHONPATH=.:/logilab/common/test "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
else
- PYTHONPATH="${spath}" "$(PYTHON)" "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
+ PYTHONPATH="${spath}" "${tpath}${EPREFIX}/usr/bin/pytest" -v || return 1
fi
popd > /dev/null || return 1
}
@@ -59,5 +83,7 @@ src_install() {
delete_tests() {
rm -fr "${ED}$(python_get_sitedir)/${PN/-//}/test"
}
+
+ use doc && dohtml -r doc/apidoc/
python_execute_function -q delete_tests
}
diff --git a/dev-python/logilab-common/logilab-common-0.58.1.ebuild b/dev-python/logilab-common/logilab-common-0.58.1.ebuild
index 3f24272f2b16..1a015ed87834 100644
--- a/dev-python/logilab-common/logilab-common-0.58.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.58.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1.ebuild,v 1.2 2012/08/27 15:21:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.58.1.ebuild,v 1.3 2012/11/05 17:48:10 idella4 Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -19,6 +19,7 @@ IUSE="test"
# dev-python/unittest2 is not required with Python >=3.2.
RDEPEND="dev-python/setuptools
dev-python/unittest2"
+
# Tests using dev-python/psycopg are skipped when dev-python/psycopg isn't installed.
DEPEND="${RDEPEND}
test? (
diff --git a/dev-python/matplotlib/matplotlib-1.1.1.ebuild b/dev-python/matplotlib/matplotlib-1.1.1.ebuild
index 4e6e7979dcff..4e50e298ddc4 100644
--- a/dev-python/matplotlib/matplotlib-1.1.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.1.ebuild,v 1.2 2012/08/01 19:50:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.1.ebuild,v 1.3 2012/11/06 01:18:51 blueness Exp $
EAPI="3"
@@ -24,7 +24,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
IUSE="cairo doc excel examples fltk gtk latex qt4 test tk wxwidgets"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-freebsd ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-freebsd ~x86-linux ~x86-macos"
# Main license: matplotlib
# Some modules: BSD
diff --git a/dev-python/pyalsa/pyalsa-1.0.26.ebuild b/dev-python/pyalsa/pyalsa-1.0.26.ebuild
index 0b9b9307ccc4..28a767851e5c 100644
--- a/dev-python/pyalsa/pyalsa-1.0.26.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.26.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/pyalsa-1.0.26.ebuild,v 1.1 2012/09/07 13:03:02 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/pyalsa-1.0.26.ebuild,v 1.2 2012/11/05 22:25:39 blueness Exp $
EAPI="2"
PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild
index 49bf03f388ae..6793da59c87b 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild,v 1.1 2012/08/29 05:34:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1-modules/pyasn1-modules-0.0.4.ebuild,v 1.3 2012/11/05 22:35:15 blueness Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND="dev-python/pyasn1"
diff --git a/dev-python/pyasn1/pyasn1-0.1.4.ebuild b/dev-python/pyasn1/pyasn1-0.1.4.ebuild
index daf870a2cf65..47af6863908c 100644
--- a/dev-python/pyasn1/pyasn1-0.1.4.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.4.ebuild,v 1.1 2012/08/29 05:31:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.4.ebuild,v 1.3 2012/11/05 22:40:32 blueness Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-python/setuptools"
diff --git a/dev-python/pycups/pycups-1.9.62.ebuild b/dev-python/pycups/pycups-1.9.62.ebuild
index caf114c01ab3..16b30b5373c5 100644
--- a/dev-python/pycups/pycups-1.9.62.ebuild
+++ b/dev-python/pycups/pycups-1.9.62.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.62.ebuild,v 1.1 2012/08/05 22:07:31 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.62.ebuild,v 1.3 2012/11/05 22:36:56 blueness Exp $
EAPI="3"
@@ -13,7 +13,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="http://cyberelk.net/tim/data/pycups/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/python-docs/python-docs-3.3.0.ebuild b/dev-python/python-docs/python-docs-3.3.0.ebuild
index f39d869ca425..59361c9b0da7 100644
--- a/dev-python/python-docs/python-docs-3.3.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-3.3.0.ebuild,v 1.3 2012/10/07 04:03:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-3.3.0.ebuild,v 1.5 2012/11/05 22:39:00 blueness Exp $
EAPI="3"
@@ -10,7 +10,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.b
LICENSE="PSF-2"
SLOT="3.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=""
diff --git a/dev-python/python-ldap/python-ldap-2.4.10.ebuild b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
index bbea54fd4feb..3cf90817a43e 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.2 2012/11/05 12:36:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.3 2012/11/05 22:13:34 blueness Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-solaris"
IUSE="doc examples sasl ssl"
# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
diff --git a/dev-python/traits/traits-4.1.0.ebuild b/dev-python/traits/traits-4.1.0.ebuild
index 142a82bb96ab..5e1e73ead14f 100644
--- a/dev-python/traits/traits-4.1.0.ebuild
+++ b/dev-python/traits/traits-4.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.1.0.ebuild,v 1.4 2012/08/22 23:04:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.1.0.ebuild,v 1.5 2012/11/06 04:16:00 idella4 Exp $
EAPI=4
@@ -35,6 +35,17 @@ src_compile() {
use doc && virtualmake -C docs html
}
+src_test() {
+ testing() {
+ local exit_status=0
+ pushd $(find build-${PYTHON_ABI}/ -name "${PN}") > /dev/null
+ PYTHONPATH=. nosetests -v tests || exit_status=1
+ popd > /dev/null
+ return $exit_status
+ }
+ python_execute_function testing
+}
+
src_install() {
find -name "*LICENSE*.txt" -delete
distutils_src_install
diff --git a/dev-python/traits/traits-4.2.0.ebuild b/dev-python/traits/traits-4.2.0.ebuild
index 6ebfb34ebfac..9b34825804aa 100644
--- a/dev-python/traits/traits-4.2.0.ebuild
+++ b/dev-python/traits/traits-4.2.0.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.2.0.ebuild,v 1.1 2012/10/09 13:31:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.2.0.ebuild,v 1.3 2012/11/06 04:24:34 idella4 Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils virtualx
@@ -35,6 +35,17 @@ src_compile() {
use doc && virtualmake -C docs html
}
+src_test() {
+ testing() {
+ local exit_status=0
+ pushd $(find build-${PYTHON_ABI}/ -name "${PN}") > /dev/null
+ PYTHONPATH=. nosetests -v tests || exit_status=1
+ popd > /dev/null
+ return $exit_status
+ }
+ python_execute_function testing
+}
+
src_install() {
find -name "*LICENSE*.txt" -delete
distutils_src_install
diff --git a/dev-python/urwid/urwid-0.9.9.1.ebuild b/dev-python/urwid/urwid-0.9.9.1.ebuild
index 9ad4d54b229b..5ab9eeb7f205 100644
--- a/dev-python/urwid/urwid-0.9.9.1.ebuild
+++ b/dev-python/urwid/urwid-0.9.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.9.9.1.ebuild,v 1.4 2010/05/23 18:15:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.9.9.1.ebuild,v 1.5 2012/11/05 22:10:00 radhermit Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -14,9 +14,10 @@ SRC_URI="http://excess.org/urwid/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="examples"
+IUSE="examples test"
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools
+ test? ( dev-python/twisted )"
RDEPEND=""
RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/urwid/urwid-1.0.2.ebuild b/dev-python/urwid/urwid-1.0.2.ebuild
index cfc647d40d3c..83650b3606ab 100644
--- a/dev-python/urwid/urwid-1.0.2.ebuild
+++ b/dev-python/urwid/urwid-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.5 2012/09/23 08:11:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.6 2012/11/05 22:10:00 radhermit Exp $
EAPI="4"
PYTHON_USE_WITH="ncurses"
@@ -18,9 +18,10 @@ SRC_URI="http://excess.org/urwid/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="examples"
+IUSE="examples test"
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools
+ test? ( dev-python/twisted )"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
diff --git a/dev-python/urwid/urwid-1.1.0.ebuild b/dev-python/urwid/urwid-1.1.0.ebuild
index ec437a995de8..d527d6c170b1 100644
--- a/dev-python/urwid/urwid-1.1.0.ebuild
+++ b/dev-python/urwid/urwid-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.0.ebuild,v 1.1 2012/10/24 04:59:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.0.ebuild,v 1.2 2012/11/05 22:10:00 radhermit Exp $
EAPI="4"
PYTHON_USE_WITH="ncurses"
@@ -18,10 +18,11 @@ SRC_URI="http://excess.org/urwid/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc examples"
+IUSE="doc examples test"
DEPEND="dev-python/setuptools
- doc? ( dev-python/sphinx )"
+ doc? ( dev-python/sphinx )
+ test? ( dev-python/twisted )"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
diff --git a/dev-tex/hevea/hevea-2.00.ebuild b/dev-tex/hevea/hevea-2.00.ebuild
index ea29df0bcaed..d3134bb25e17 100644
--- a/dev-tex/hevea/hevea-2.00.ebuild
+++ b/dev-tex/hevea/hevea-2.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.00.ebuild,v 1.1 2012/09/09 16:01:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.00.ebuild,v 1.2 2012/11/05 23:08:33 blueness Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
RDEPEND="${DEPEND}"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index d8bdd95d839b..ae01b65da038 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,3 +1,4 @@
DIST boost_1_46_1.tar.bz2 42001335 SHA256 e1dfbf42b16e5015c46b98e9899c423ca4d04469cbeee05e43ea19236416d883 SHA512 e7cc4383bb960cb59eecd29ef66e2c53466fe5f126bde58f50ba104ee8ab220771db5f7b35e4b9856e9f257d1def5a9b7ea48e1d2757976a89c5a2e3f1fdc327 WHIRLPOOL 4d8d94821c996475ec2bab962b92ec061b890a318897cab695e66daef3f9c8687990450fb26fd783fd0c5be35ccb71616994ef0c8e41c555312ae5383e3649cf
DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
DIST boost_1_51_0.tar.bz2 50811407 SHA256 fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696 SHA512 43a45ff34879328c57e1694e199b895d7535df7cdf78b127ec2649841ac5973f2dddbc0b00a1ed71f2347def6d44f1d8cc5c0deea120f60f53714ebe28046478 WHIRLPOOL 2cfe8ff8b1b812f1a2d02cad25a06fe2a824ef319d95e113fc307d432ff54f2367ac86d922517ce63fce2335b14a9d86ec0c9858b10466b4bf76d28c1ceca828
+DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
diff --git a/dev-util/boost-build/boost-build-1.52.0.ebuild b/dev-util/boost-build/boost-build-1.52.0.ebuild
new file mode 100644
index 000000000000..3f2145a6e1cd
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.52.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.52.0.ebuild,v 1.1 2012/11/05 18:23:38 flameeyes Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+inherit eutils flag-o-matic python toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators _)
+MAJOR_PV="$(replace_all_version_separators _ $(get_version_component_range 1-2))"
+
+DESCRIPTION="A system for large project software construction, which is simple to use and powerful."
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT=0
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="examples python test"
+
+REQUIRED_USE="test? ( python )"
+
+RDEPEND="!=x11-libs/motif-2.3:0
+ ppc? ( dev-libs/elfutils )
+ ppc64? ( dev-libs/elfutils )
+ readline? ( sys-libs/readline )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-apps/xfontsel
+ gnuplot? ( sci-visualization/gnuplot )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc44.patch"
+ "${FILESDIR}/${P}-gdb-disassembler-bug.patch"
+ "${FILESDIR}/${PN}-3.3.12-man.patch"
+)
+
+DOCS=(
+ AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
+ doc/ddd{-paper.ps,.pdf,-themes.pdf}
+)
+
+AUTOTOOLS_AUTORECONF=1
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ --with-termlib=ncurses
+ $(use_with readline)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ # Remove app defaults
+ rm -f "${S}"/ddd/Ddd
+
+ # Install ddd distribution
+ autotools-utils_src_install
+
+ # Install application icon
+ doicon "${S}"/icons/ddd.xpm
+}
+
+pkg_postinst() {
+ if ! use gnuplot; then
+ echo
+ elog "To enable data visualization in DDD, install sci-visualization/gnuplot,"
+ elog "or re-emerge DDD with gnuplot USE flag (recommended)."
+ elog "For flat file package.use layout:"
+ elog " echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
+ elog "For directory package.use layout:"
+ elog " echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
+ fi
+ echo
+ elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
+ elog " virtual/jdk"
+ elog " app-shells/bashdb"
+ elog " dev-lang/perl"
+ elog " dev-python/pydb"
+ echo
+}
diff --git a/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch b/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
new file mode 100644
index 000000000000..738cda5946f9
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-gdb-disassembler-bug.patch
@@ -0,0 +1,11 @@
+--- a/ddd/GDBAgent.C 2004-09-01 20:07:38.000000000 +0200
++++ b/ddd/GDBAgent.C 2010-06-15 14:16:34.000000000 +0200
+@@ -3078,7 +3078,7 @@
+ {
+ string end_( end );
+ normalize_address(end_);
+- cmd += ' ';
++ cmd += ',';
+ cmd += end_;
+ }
+ return cmd;
diff --git a/dev-util/ddd/files/ddd-3.3.12-man.patch b/dev-util/ddd/files/ddd-3.3.12-man.patch
new file mode 100644
index 000000000000..c6a1bc4fba24
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-man.patch
@@ -0,0 +1,16 @@
+diff -ruN ddd-3.3.12/ddd/Makefile.am ddd-my/ddd/Makefile.am
+--- ddd-3.3.12/ddd/Makefile.am 2009-02-11 18:25:07.000000000 +0100
++++ ddd-my/ddd/Makefile.am 2012-11-06 01:48:46.363493473 +0100
+@@ -1371,10 +1371,8 @@
+ man_MANS = ddd.1
+
+ # `ddd.man' has 8-bit format, `ddd.1' has 7-bit format
+-ddd.1: ddd.man $(srcdir)/unumlaut.sed
+- -$(SED) -f $(srcdir)/unumlaut.sed ddd.man | $(DELETE_CR) > $@~ \
+- && $(MV) $@~ $@
+-
++ddd.1: ddd.man
++ iconv -f ISO8859-15 -t UTF8 ddd.man > ddd.1
+
+
+ # -----------------------------------------------------------------------------
diff --git a/dev-util/dialog/dialog-1.1.20120706.ebuild b/dev-util/dialog/dialog-1.1.20120706.ebuild
index c9983597f520..43d843f1ba85 100644
--- a/dev-util/dialog/dialog-1.1.20120706.ebuild
+++ b/dev-util/dialog/dialog-1.1.20120706.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120706.ebuild,v 1.4 2012/11/04 14:09:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120706.ebuild,v 1.7 2012/11/05 20:03:55 vapier Exp $
EAPI="4"
-inherit multilib
+inherit multilib eutils
MY_PV="${PV/1.1./1.1-}"
S=${WORKDIR}/${PN}-${MY_PV}
@@ -14,13 +14,12 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
- >=app-shells/bash-2.04-r3
- !unicode? ( >=sys-libs/ncurses-5.2-r5 )
- unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )
+ >=sys-libs/ncurses-5.2-r5
+ unicode? ( sys-libs/ncurses[unicode] )
"
DEPEND="
${RDEPEND}
@@ -31,16 +30,16 @@ DEPEND="
src_prepare() {
sed -i configure -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' || die
+ sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
}
src_configure() {
- local ncursesw
- use unicode && ncursesw="w"
econf \
--disable-rpath-hack \
$(use_enable nls) \
$(use_with !minimal libtool) \
- --with-ncurses${ncursesw}
+ --with-libtool-opts=$(usex static-libs '' '-shared') \
+ --with-ncurses$(usex unicode w '')
}
src_install() {
@@ -62,8 +61,6 @@ src_install() {
fi
if ! use static-libs; then
- rm -f \
- "${D}"usr/$(get_libdir)/libdialog.a \
- "${D}"usr/$(get_libdir)/libdialog.la
+ rm -f "${ED}"usr/$(get_libdir)/libdialog.{la,a}
fi
}
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
index 86ca7aed970d..36956b7d3159 100644
--- a/dev-util/synopsis/Manifest
+++ b/dev-util/synopsis/Manifest
@@ -1 +1,2 @@
DIST synopsis-0.12.tar.gz 9849309 SHA256 42d3c63e31e03afa558bdbab895f6630fe7fee2612bbf52fdfa9b959f36b1110 SHA512 15e368a4d290d019bd21f12af51ef61a7133e499626fe3b59316a2490e366267500f8e7a0239c4705dbfcfb6e6390017ab39fe42b24a52b25ede8f1f7c19f160 WHIRLPOOL ba27bd3969d8867bf0024fef2e33a571a1786ab5fe7ed65ef42cb44a0700914e2ebb108d46c3eaa02d506a20deeb577b2573de966b148c0bac61f35d778bc2ff
+DIST synopsis-0.13.tar.gz 10691494 SHA256 8a27f39203d828ace4a122b8bdc4f98e3746af724f88a0d75e1380fe736dbe5f SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54 WHIRLPOOL 0198437a19b8871428ddc1bcbbf01cad3b9e660cdb577f48c3542fcffc2b31acbb92ef5938b4e2d4a0404c5db85de9915772e953b93c45505fd8341748222aea
diff --git a/dev-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
new file mode 100644
index 000000000000..423a7bfdbc99
--- /dev/null
+++ b/dev-util/synopsis/synopsis-0.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.13.ebuild,v 1.1 2012/11/05 17:53:44 kensington Exp $
+
+EAPI=4
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 multilib toolchain-funcs
+
+DESCRIPTION="General source code documentation tool"
+HOMEPAGE="http://synopsis.fresco.org/index.html"
+SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/boehm-gc"
+RDEPEND="${COMMON_DEPEND}
+ media-gfx/graphviz"
+DEPEND="${COMMON_DEPEND}
+ ${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12-gcc45.patch )
+
+pkg_setup() {
+ tc-export CC CXX
+}
+
+python_prepare() {
+ rm -r src/Synopsis/gc || die "failed to remove bundled lib"
+
+ # the distutils script passes its options to a number of
+ # autoconf scripts, to not all of which these options are
+ # relevant. adding this option disables these useless warnings.
+ sed -e "/self.announce(command)/i\ command += ' --disable-option-checking'" \
+ -i Synopsis/dist/command/config.py || die
+}
+
+python_configure() {
+ local mydistutilsargs=(
+ config
+ --libdir=/usr/$(get_libdir)
+ --with-gc-prefix=/usr
+ )
+ esetup.py
+}
diff --git a/games-action/chromium-bsu/Manifest b/games-action/chromium-bsu/Manifest
index feb85121aacf..30f7e3a1bb89 100644
--- a/games-action/chromium-bsu/Manifest
+++ b/games-action/chromium-bsu/Manifest
@@ -1 +1 @@
-DIST chromium-bsu-0.9.15.tar.gz 1656178 RMD160 2909f2f0da0cb2272b9bf25bf6474d46a346512c SHA1 819107ecb8d0194c0827bc16dec252d30199d7e9 SHA256 6d926cceea6158a74583b6e8927716b9f837fab5693cf4039c6500b50e5147b2
+DIST chromium-bsu-0.9.15.tar.gz 1656178 SHA256 6d926cceea6158a74583b6e8927716b9f837fab5693cf4039c6500b50e5147b2
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild
index c63a347c1da1..92bf2e1cb092 100644
--- a/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild
+++ b/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild,v 1.1 2011/05/26 03:30:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium-bsu/chromium-bsu-0.9.15.ebuild,v 1.2 2012/11/05 22:42:32 blueness Exp $
EAPI=2
inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
LICENSE="Clarified-Artistic"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="mixer nls +sdl"
RDEPEND="media-fonts/dejavu
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index a32e00135004..5963d84b0521 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -3,5 +3,6 @@ DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593
DIST ioq3-for-UrbanTerror-4.2.002.tar.xz 14879152 SHA256 72238ca9de878a5f11f100683e60953520cdc73d74bcefd42c48f399e49be76c SHA512 cea6c4e486a6d9211a66dc6c56292594775990c83db542961b018a8ce36ce04489fdbc77e0f34f2dc0db69ac320c7cd1d7bbe34e674f1bf7dca8cf907e515b08 WHIRLPOOL dbe1b41b40cc18aea6d81cf228ac545e30fbab49652bdb472f9b9b82015152a945a8a9759a44c3c433200d36faf374fcd505f5785bd64f0ad92a22c3625420d5
DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8
DIST urbanterror-4.2.003-to-4.2.004-update.tar 47554560 SHA256 02716eb643c20eb424a0026ace9f3d1bb49e1d3f182817b629316ec785f8967b SHA512 a20fa720643d3009890e317780fef1a33f33f70af9baae4a5e44dfbea95373639d3da7b339b96d46bf403c88c0d1240d6f044c4405d0104eb5bbf33b3e4c3715 WHIRLPOOL 2c6b7fba90bab80f4ee5462572bef0dd26689e2dbc41e056b21068c143f11dd470a75b1d67ffdabe348b108d9b898989a2602b802732c3cb194d22e72289825a
+DIST urbanterror-4.2.003-to-4.2.005-update.tar 127436800 SHA256 81b456f5cabb616fa99b15ab43ada7133b044fca68693b16a691da25d0d9e675 SHA512 fba8f5ec672ea9ee5ded868cfaf4c8f98ebd42c1c7838127d55775c787affa8f90e8689414cb18584226fdbe34e29c4051ab4ba63667b0b5ba8f1e4b8e43c958 WHIRLPOOL 86665fb41ab669a6938451ad3327c16e2ab065bace55b5b772339b6e5a8cf91270261c25e639824dbe57780e061d30faf582531f3c02b905bd3ed035d4456e88
DIST urbanterror-4.2.003.tar.xz 1261543556 SHA256 4eef34227d1dc06b6d1b70af2603e5286dc130e9e65aececc8c9d4d1614a4d4a SHA512 f9b541027f39a1cc7cfafc931bf9dba1d3eb0acba9d241dae3e970a183a917a8797dc5e63d1d4dc0719461509d56734178eebcd2ef10f34327253408b6ab6ef7 WHIRLPOOL 532c589c5ed9c1c3b701cc47a87c437b93d76925fdd9e83b43c5fb431dd95becdbfabc1338089086f964263ae09d37403d003560a91d2579fadb28251d555867
DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.005-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.005-build.patch
new file mode 100644
index 000000000000..9221b671cbed
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.005-build.patch
@@ -0,0 +1,70 @@
+--- Makefile
++++ Makefile
+@@ -213,7 +213,7 @@
+ endif
+ endif
+
+- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+
+ ifeq ($(USE_OPENAL),1)
+ BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -239,19 +239,15 @@
+ BASE_CFLAGS += -I/usr/X11R6/include
+ endif
+
+- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
++ OPTIMIZE = -ffast-math -funroll-loops
+
+ ifeq ($(ARCH),x86_64)
+- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
+- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+- -fstrength-reduce
++ OPTIMIZE = -ffast-math -funroll-loops
+ # experimental x86_64 jit compiler! you need GNU as
+ HAVE_VM_COMPILED = true
+ else
+ ifeq ($(ARCH),i386)
+- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+- -funroll-loops -falign-loops=2 -falign-jumps=2 \
+- -falign-functions=2 -fstrength-reduce
++ OPTIMIZE = -ffast-math -funroll-loops
+ HAVE_VM_COMPILED=true
+ else
+ ifeq ($(ARCH),ppc)
+@@ -265,7 +261,7 @@
+ BASE_CFLAGS += -DNO_VM_COMPILED
+ endif
+
+- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
++ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
+
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
+
+@@ -274,7 +270,7 @@
+ SHLIBLDFLAGS=-shared $(LDFLAGS)
+
+ THREAD_LDFLAGS=-lpthread
+- LDFLAGS=-ldl -lm
++ LDFLAGS+=-ldl -lm
+
+ ifeq ($(USE_SDL),1)
+ CLIENT_LDFLAGS=$(shell sdl-config --libs)
+@@ -1153,13 +1149,13 @@
+
+ $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
+ $(echo_cmd) "LD $@"
+- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
+- $(LDFLAGS) $(LIBSDLMAIN)
++ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \
++ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
+
+ $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
+ $(echo_cmd) "LD $@"
+- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
+- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
++ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
++ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
+
+ ifneq ($(strip $(LIBSDLMAIN)),)
+ ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/urbanterror/urbanterror-4.2.005.ebuild b/games-fps/urbanterror/urbanterror-4.2.005.ebuild
new file mode 100644
index 000000000000..4cb5c2664c10
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.2.005.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.005.ebuild,v 1.2 2012/11/05 22:44:15 hasufell Exp $
+
+EAPI=4
+
+inherit check-reqs eutils gnome2-utils games
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://www.urbanterror.info/home/"
+SRC_URI="http://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> ${PN}-4.2.003.tar.xz
+ http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz
+ http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg
+ mirror://gentoo/urbanterror-4.2.003-to-4.2.005-update.tar"
+
+LICENSE="GPL-2 Q3AEULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl debug dedicated openal +sdl server smp vorbis"
+
+RDEPEND="
+ !dedicated? (
+ virtual/opengl
+ curl? ( net-misc/curl )
+ openal? ( media-libs/openal )
+ sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
+ !sdl? ( x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm )
+ vorbis? ( media-libs/libogg
+ media-libs/libvorbis )
+ )"
+DEPEND="${RDEPEND}
+ dedicated? ( curl? ( net-misc/curl ) )"
+
+S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002
+S_DATA=${WORKDIR}/UrbanTerror42
+S_UPDATE=${WORKDIR}/urbanterror-4.2.003-to-4.2.005-update
+
+CHECKREQS_DISK_BUILD="2700M"
+CHECKREQS_DISK_USR="1300M"
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+
+ if ! use dedicated ; then
+ if ! use sdl && ! use openal ; then
+ ewarn
+ ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
+ ewarn
+ fi
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+ buildit() { use $1 && echo 1 || echo 0 ; }
+ nobuildit() { use $1 && echo 0 || echo 1 ; }
+
+ emake \
+ ARCH=$(usex amd64 "x86_64" "i386") \
+ DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
+ BUILD_CLIENT=$(nobuildit dedicated) \
+ BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
+ BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
+ USE_SDL=$(buildit sdl) \
+ USE_OPENAL=$(buildit openal) \
+ USE_OPENAL_DLOPEN=0 \
+ USE_CURL=$(buildit curl) \
+ USE_CURL_DLOPEN=0 \
+ USE_CODEC_VORBIS=$(buildit vorbis) \
+ USE_LOCAL_HEADERS=0 \
+ Q="" \
+ $(usex debug "debug" "release")
+}
+
+src_install() {
+ local my_arch=$(usex amd64 "x86_64" "i386")
+
+ doicon -s scalable "${DISTDIR}"/${PN}.svg
+ dodoc ChangeLog README md4-readme.txt "${S_DATA}"/q3ut4/readme42.txt
+ insinto "${GAMES_DATADIR}"/${PN}/q3ut4
+ doins "${S_DATA}"/q3ut4/*.pk3
+ doins "${S_UPDATE}"/*.pk3
+
+ if use !dedicated ; then
+ newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
+ make_desktop_entry ${PN} "UrbanTerror"
+ fi
+
+ if use dedicated || use server ; then
+ newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
+ docinto examples
+ dodoc "${S_DATA}"/q3ut4/{server.cfg,mapcycle.txt}
+ fi
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+
+ if use openal && ! use dedicated ; then
+ einfo
+ elog "You might need to set:"
+ elog " seta s_useopenal \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+ einfo
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 46b8f88bbcee..ca6e957a5803 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,2 +1 @@
-DIST gcompris-12.01.tar.gz 149465806 SHA256 77e5a4901550dfcad632277437b6895a65a553225224c8a78f2bd5b7b459aa91 SHA512 00a016c66965a8607048ad54e08902ce26dbb0cb424fda8a7b6f5dd8f25a44db94f0b0ea4d60e5a0e2eb575449a9a80893a5bf8f9baf927d27a87f5db067940e WHIRLPOOL 44c37f372b9fbe2b5432d459102c01dd723df0b321f03d0cb84a508f99906ad1f245a5ff8912a3eff33f286d506ebdf1a7d52078a2abaf2ca5830c6c91ba685b
DIST gcompris-12.05.tar.bz2 152545527 SHA256 a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0 SHA512 65ecc6746e02adcc7158dff61f236b5b776a0032bb9c30d24cc41388f242f59a98d5e14c41aa27299c711ebf1569323b846a648ccb5e5b64c58440dac3fee77a WHIRLPOOL cc0ba912efbfd4be5dbb7125bf4594b7270715bfea15b0e20ee7697acb84876741931f167c53c9d4b822480662f405c77f045c199084733164da1275789b2e4a
diff --git a/games-kids/gcompris/files/gcompris-12.01-build.patch b/games-kids/gcompris/files/gcompris-12.01-build.patch
deleted file mode 100644
index 07be210e0a50..000000000000
--- a/games-kids/gcompris/files/gcompris-12.01-build.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- gcompris-9.5.orig/Makefile.am
-+++ gcompris-9.5/Makefile.am
-@@ -17,7 +17,7 @@
- # endif
-
-
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
-
- if BUILD_MINGW32
-@@ -25,7 +25,7 @@
- Applications_in_files =
- Applications_DATA =
- else
--Applicationsdir = $(datadir)/applications/
-+Applicationsdir = /usr/share/applications/
- Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
- Applications_DATA = gcompris.desktop gcompris-edit.desktop
- endif
---- gcompris-9.5.orig/configure.ac
-+++ gcompris-9.5/configure.ac
-@@ -203,10 +203,8 @@
- USE_DEBUG="$enableval", USE_DEBUG="no")
- if test "x$USE_DEBUG" == "xyes" ; then
- AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
-- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g"
--else
-- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -O2"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
-
- dnl disable activation code
- AC_ARG_ENABLE(disable-activation-code,
-@@ -337,28 +335,28 @@
- fi
- else
- dnl Set PACKAGE_LOCALE_DIR in config.h.
-- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
-+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
-
- dnl Set PACKAGE_DATA_DIR
- PACKAGE_DATA_DIR="boards"
- AC_SUBST(PACKAGE_DATA_DIR)
-- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
-+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
-
- dnl Plugin Directory
- my_libdir=`eval echo "${libdir}"`
-- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
-+ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
- plugindir=$libdir/gcompris
- AC_SUBST(plugindir)
-
- dnl Python plugin Directory
-- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
-+ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
- AC_SUBST(PYTHON_PLUGIN_DIR)
-
- dnl System GCompris config directory
- AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
-
- dnl Test for gnuchess
-- AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
-+ AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
- if test x$GNUCHESS = xno; then
- AC_MSG_ERROR(Couldn't find gnuchess, please install the gnuchess package version 5 or above)
- fi
---- gcompris-9.5.orig/docs/C/Makefile.am
-+++ gcompris-9.5/docs/C/Makefile.am
-@@ -10,7 +10,7 @@
- overview.dia \
- $(man_MANS)
-
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
-
- all: $(doc)
-
---- gcompris-9.5.orig/docs/eu/Makefile.am
-+++ gcompris-9.5/docs/eu/Makefile.am
-@@ -8,7 +8,7 @@
- overview.dia \
- gcompris.texi
-
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
-
- all: $(doc)
-
---- gcompris-9.5.orig/docs/fr/Makefile.am
-+++ gcompris-9.5/docs/fr/Makefile.am
-@@ -8,7 +8,7 @@
- overview.dia \
- gcompris.texi
-
--gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
-+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
-
- all: $(doc)
-
---- gcompris-9.5.orig/po/Makefile.in.in
-+++ gcompris-9.5/po/Makefile.in.in
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
---- gcompris-9.5.orig/src/gcompris/gcompris.c
-+++ gcompris-9.5/src/gcompris/gcompris.c
-@@ -1308,7 +1308,7 @@
- properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
- properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
- NULL);
-- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
-+ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
- properties->menu_dir = g_strdup(properties->package_data_dir);
- g_free(pkg_data_dir);
- g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/gcompris-12.01-r1.ebuild b/games-kids/gcompris/gcompris-12.01-r1.ebuild
deleted file mode 100644
index 1a3e20949d1f..000000000000
--- a/games-kids/gcompris/gcompris-12.01-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.01-r1.ebuild,v 1.1 2012/07/16 06:41:08 mr_bones_ Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite threads"
-
-inherit autotools eutils python games
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="mirror://sourceforge/gcompris/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnet"
-
-RDEPEND="x11-libs/gtk+:2
- gnome-base/librsvg[gtk]
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-good
- media-plugins/gst-plugins-ogg
- media-plugins/gst-plugins-alsa
- media-plugins/gst-plugins-vorbis
- media-libs/sdl-mixer
- media-libs/libsdl
- dev-libs/libxml2
- dev-libs/popt
- virtual/libintl
- games-board/gnuchess
- dev-db/sqlite:3
- gnet? ( net-libs/gnet:2 )
- dev-python/pygtk"
-DEPEND="${RDEPEND}
- gnome-base/gnome-common
- dev-perl/XML-Parser
- sys-devel/gettext
- sys-apps/texinfo
- app-text/texi2html
- virtual/pkgconfig"
-RDEPEND="${RDEPEND}
- media-gfx/tuxpaint
- sci-electronics/gnucap"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- games_pkg_setup
-}
-
-src_prepare() {
- # Drop DEPRECATED flags, bug #387817
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
- src/gcompris/Makefile.am src/gcompris/Makefile.in \
- src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
- || die
-
- epatch "${FILESDIR}"/${P}-build.patch
- cp /usr/share/gettext/config.rpath .
- eautoreconf
-}
-
-src_configure() {
- GNUCHESS="${GAMES_BINDIR}"/gnuchess \
- egamesconf \
- --disable-dependency-tracking \
- --datarootdir="${GAMES_DATADIR}" \
- --datadir="${GAMES_DATADIR}" \
- --localedir=/usr/share/locale \
- --infodir=/usr/share/info \
- --with-python="$(PYTHON -a)" \
- $(use_enable gnet) \
- --enable-sqlite \
- --enable-py-build-only
-}
-
-src_compile() {
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- find "${D}" -name '*.la' -exec rm -f '{}' +
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- prepgamesdirs
-}
diff --git a/games-kids/gcompris/gcompris-12.01.ebuild b/games-kids/gcompris/gcompris-12.01.ebuild
deleted file mode 100644
index 6362e6564484..000000000000
--- a/games-kids/gcompris/gcompris-12.01.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.01.ebuild,v 1.5 2012/05/03 03:26:38 jdhore Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH_OPT="python"
-PYTHON_USE_WITH="sqlite threads"
-
-inherit autotools eutils python games
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="mirror://sourceforge/gcompris/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnet python"
-
-RDEPEND="x11-libs/gtk+:2
- gnome-base/librsvg[gtk]
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-good
- media-plugins/gst-plugins-ogg
- media-plugins/gst-plugins-alsa
- media-plugins/gst-plugins-vorbis
- media-libs/sdl-mixer
- media-libs/libsdl
- dev-libs/libxml2
- dev-libs/popt
- virtual/libintl
- games-board/gnuchess
- dev-db/sqlite:3
- gnet? ( net-libs/gnet:2 )
- python? ( dev-python/pygtk )"
-DEPEND="${RDEPEND}
- gnome-base/gnome-common
- dev-perl/XML-Parser
- sys-devel/gettext
- sys-apps/texinfo
- app-text/texi2html
- virtual/pkgconfig"
-RDEPEND="${RDEPEND}
- media-gfx/tuxpaint
- sci-electronics/gnucap"
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
- games_pkg_setup
-}
-
-src_prepare() {
- # Drop DEPRECATED flags, bug #387817
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
- src/gcompris/Makefile.am src/gcompris/Makefile.in \
- src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
- || die
-
- epatch "${FILESDIR}"/${P}-build.patch
- cp /usr/share/gettext/config.rpath .
- eautoreconf
-}
-
-src_configure() {
- GNUCHESS="${GAMES_BINDIR}"/gnuchess \
- egamesconf \
- --disable-dependency-tracking \
- --datarootdir="${GAMES_DATADIR}" \
- --datadir="${GAMES_DATADIR}" \
- --localedir=/usr/share/locale \
- --infodir=/usr/share/info \
- $(use_with python python "$(PYTHON -a)") \
- $(use_enable gnet) \
- --enable-sqlite \
- --enable-py-build-only
-}
-
-src_compile() {
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- find "${D}" -name '*.la' -exec rm -f '{}' +
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- prepgamesdirs
-}
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
index 643f9311bbf8..ea6b02c82a91 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild,v 1.2 2012/01/05 02:19:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild,v 1.3 2012/11/05 21:32:06 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="+bluetooth +cdr cups +networkmanager"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild
index 6d145d230baa..b4ea14f57f48 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild,v 1.1 2012/09/10 04:17:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.4.1.ebuild,v 1.2 2012/11/05 21:32:06 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="+bluetooth +cdr cups +networkmanager"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild
index 8274d5372703..09fd79493fa4 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild,v 1.2 2011/11/25 07:51:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.2.1.ebuild,v 1.3 2012/11/05 21:33:43 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="cups python"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild
index e819d6b7963f..680f9656f692 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild,v 1.1 2012/09/10 04:15:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.4.1.ebuild,v 1.2 2012/11/05 21:33:43 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="cups python"
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild
index e590319adf42..02ddb59f7509 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild,v 1.2 2011/12/05 03:40:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.2.1.ebuild,v 1.3 2012/11/05 21:35:29 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the applications of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="+shotwell +tracker"
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild
index 29144648fb74..6867eebf50d6 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild,v 1.1 2012/09/10 04:17:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.4.1.ebuild,v 1.2 2012/11/05 21:35:29 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for the applications of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="+shotwell +tracker"
diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild
index a772dcf5cc8d..ed517d53cac0 100644
--- a/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild
+++ b/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild,v 1.1 2011/11/07 07:49:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.2.1.ebuild,v 1.2 2012/11/05 21:36:52 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for GNOME 3 fallback mode"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="cups"
diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild
index 97e6089911db..43745ae609f0 100644
--- a/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild
+++ b/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild,v 1.1 2012/09/10 04:17:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.4.1.ebuild,v 1.2 2012/11/05 21:36:52 ulm Exp $
EAPI="4"
DESCRIPTION="Sub-meta package for GNOME 3 fallback mode"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="3.0"
IUSE="cups"
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
index 52b5c8d11804..e5b7e61d7874 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.9 2012/07/15 17:23:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.10 2012/11/05 21:38:52 ulm Exp $
EAPI="4"
S=${WORKDIR}
DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0"
IUSE="+automount"
diff --git a/gnome-base/gnome-light/gnome-light-3.2.1.ebuild b/gnome-base/gnome-light/gnome-light-3.2.1.ebuild
index b8c104a4ec72..b0f7a7092b49 100644
--- a/gnome-base/gnome-light/gnome-light-3.2.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.2.1.ebuild,v 1.2 2011/12/06 19:06:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.2.1.ebuild,v 1.3 2012/11/05 21:38:53 ulm Exp $
EAPI="4"
DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0"
IUSE="cups +fallback +gnome-shell"
diff --git a/gnome-base/gnome-light/gnome-light-3.4.1.ebuild b/gnome-base/gnome-light/gnome-light-3.4.1.ebuild
index bfb580774b18..211bccb3e609 100644
--- a/gnome-base/gnome-light/gnome-light-3.4.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.4.1.ebuild,v 1.1 2012/09/10 04:19:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.4.1.ebuild,v 1.2 2012/11/05 21:38:52 ulm Exp $
EAPI="4"
DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0"
IUSE="cups +fallback +gnome-shell"
diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
index 066275ab00fc..559cec441f27 100644
--- a/gnome-base/gnome/gnome-2.32.1-r2.ebuild
+++ b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.8 2012/07/15 17:30:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.9 2012/11/05 21:30:07 ulm Exp $
EAPI="4"
DESCRIPTION="Meta package for the GNOME desktop"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0"
# when unmasking for an arch
diff --git a/gnome-base/gnome/gnome-3.2.1.ebuild b/gnome-base/gnome/gnome-3.2.1.ebuild
index 3c6457e84c9b..6afb43491d6e 100644
--- a/gnome-base/gnome/gnome-3.2.1.ebuild
+++ b/gnome-base/gnome/gnome-3.2.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.2.1.ebuild,v 1.3 2012/09/10 06:23:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.2.1.ebuild,v 1.4 2012/11/05 21:30:07 ulm Exp $
EAPI="4"
DESCRIPTION="Meta package for GNOME 3, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0" # Cannot be installed at the same time as gnome-2
# when unmasking for an arch
diff --git a/gnome-base/gnome/gnome-3.4.1.ebuild b/gnome-base/gnome/gnome-3.4.1.ebuild
index 17283484dc0e..65e00a6a543e 100644
--- a/gnome-base/gnome/gnome-3.4.1.ebuild
+++ b/gnome-base/gnome/gnome-3.4.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.4.1.ebuild,v 1.2 2012/09/10 06:23:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.4.1.ebuild,v 1.3 2012/11/05 21:30:07 ulm Exp $
EAPI="4"
DESCRIPTION="Meta package for GNOME 3, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2.0" # Cannot be installed at the same time as gnome-2
# when unmasking for an arch
diff --git a/gnome-extra/at-spi/at-spi-2.0.0.ebuild b/gnome-extra/at-spi/at-spi-2.0.0.ebuild
index e491223b4591..2c06030cdc28 100644
--- a/gnome-extra/at-spi/at-spi-2.0.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.0.0.ebuild,v 1.1 2011/08/19 11:19:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.0.0.ebuild,v 1.2 2012/11/05 21:41:26 ulm Exp $
EAPI="3"
@@ -8,7 +8,7 @@ DESCRIPTION="The Gnome Accessibility Toolkit"
HOMEPAGE="http://projects.gnome.org/accessibility/"
SRC_URI=""
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/gnome-extra/at-spi/at-spi-2.2.0.ebuild b/gnome-extra/at-spi/at-spi-2.2.0.ebuild
index 77923df96af3..16f2096be50f 100644
--- a/gnome-extra/at-spi/at-spi-2.2.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.2.0.ebuild,v 1.1 2011/11/16 01:55:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.2.0.ebuild,v 1.2 2012/11/05 21:41:26 ulm Exp $
EAPI="4"
@@ -8,7 +8,7 @@ DESCRIPTION="The Gnome Accessibility Toolkit"
HOMEPAGE="http://projects.gnome.org/accessibility/"
SRC_URI=""
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/gnome-extra/at-spi/at-spi-2.4.0.ebuild b/gnome-extra/at-spi/at-spi-2.4.0.ebuild
index a7e94a7fc555..993090f9da70 100644
--- a/gnome-extra/at-spi/at-spi-2.4.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-2.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.4.0.ebuild,v 1.1 2012/08/24 18:54:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-2.4.0.ebuild,v 1.2 2012/11/05 21:41:26 ulm Exp $
EAPI="4"
@@ -8,7 +8,7 @@ DESCRIPTION="The Gnome Accessibility Toolkit"
HOMEPAGE="http://projects.gnome.org/accessibility/"
SRC_URI=""
-LICENSE="as-is"
+LICENSE="metapackage"
SLOT="2"
KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE=""
diff --git a/mail-filter/spamass-milter/Manifest b/mail-filter/spamass-milter/Manifest
index f42034530c74..a5db2abc69d0 100644
--- a/mail-filter/spamass-milter/Manifest
+++ b/mail-filter/spamass-milter/Manifest
@@ -1,2 +1,2 @@
-DIST spamass-milter-0.3.1.tar.bz2 116591 RMD160 49946c80ac99e04190981cd6c8de12ef54f0619d SHA1 71f8f2d56baf47058789c61e76c5cffd4046da5a SHA256 d7423835af7bb9cdf97bba7f31c5bea197dc86a600133d354aa6083bf1bbd24c
-DIST spamass-milter-0.3.2.tar.bz2 125350 RMD160 2acd06dc998a7d381f2425c5711fd83a57059809 SHA1 9a490748797e22a38b615e2e6a8f5f90a4834bfc SHA256 ba2eb8c9e4c50307ffae38bb06444b9830695e742e9fd8c9da40953e7e1d830b
+DIST spamass-milter-0.3.1.tar.bz2 116591 SHA256 d7423835af7bb9cdf97bba7f31c5bea197dc86a600133d354aa6083bf1bbd24c
+DIST spamass-milter-0.3.2.tar.bz2 125350 SHA256 ba2eb8c9e4c50307ffae38bb06444b9830695e742e9fd8c9da40953e7e1d830b SHA512 19279c53c8af738fbdd796e3aa382754474fc8c2ed17a3f857906d61740aefbd30f4759952fc1aaeff31af492fa8782363cbaac8ea1f389b4e2c1237226086d8 WHIRLPOOL e7e9df528b12a1b9b29f1ace8c2d0e7398806aac0ca148ee74f68fa0c2a86240578e36e8d20a21279159ccbef3f651ec27eb2286351f0396014ad4fce5fb6c87
diff --git a/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild b/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
index 6c1edac875e4..6f36cc74117d 100644
--- a/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
+++ b/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild,v 1.2 2012/06/05 00:06:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild,v 1.3 2012/11/05 21:04:52 eras Exp $
EAPI=4
@@ -40,7 +40,3 @@ src_install() {
dodoc AUTHORS NEWS README ChangeLog "${FILESDIR}/README.gentoo"
}
-
-pkg_postinst() {
- elog "Documentation is installed in /usr/share/doc/${P}"
-}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3f120c46c7a4..65e0269338e5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,2 +1,3 @@
DIST OpenCV-2.3.1a.tar.bz2 32669613 SHA256 a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c SHA512 6875eae92fa099766410dece37b65ee51c95eb8ed6d1bbe19b533c66361686b31bf5513f6558efdd37332e68b30c5a5f221d17492c00822aeb07efcbf956584d WHIRLPOOL 7cea733b5ea764b229b72565b3c8ea7b2665aa7063c98f97d05bc82d6a41000110a1935b9061050bf17fdf2cb3f382778ba924aa5c8ce7fbf96895a0317e4489
DIST OpenCV-2.4.2.tar.bz2 52562911 SHA256 690023811e03e21df996291392fcf78e43e42ef557b9307503c74c74b4272c28 SHA512 1e009817553668e4040c7959e07b402d06d66f6d4743ac4da2e44a38bef6c73ae0fa454932f7aae778915d29f5d457248fa3488f5df208d1cfb5775a26e34f44 WHIRLPOOL 8412be6b0f51ec76cce9fcb1fc1450b4b50aa3a98a2ab7d312d62ea47fc2b40f997cf09843de048a71d2cc1b5b2f1bf5eea92696ad3d4f5f520c4f3c850266e1
+DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57
diff --git a/media-libs/opencv/files/opencv-2.4.3-gcc47.patch b/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
new file mode 100644
index 000000000000..13ac8f8fb58f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.3-gcc47.patch
@@ -0,0 +1,22 @@
+diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp
+--- OpenCV-2.4.3.orig/modules/highgui/src/grfmt_tiff.cpp 2012-10-12 00:55:12.000000000 +0200
++++ OpenCV-2.4.3/modules/highgui/src/grfmt_tiff.cpp 2012-11-05 21:37:40.000000000 +0100
+@@ -47,6 +47,7 @@
+
+ #include "precomp.hpp"
+ #include "grfmt_tiff.hpp"
++#include "unistd.h"
+
+ namespace cv
+ {
+diff -ruN OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h OpenCV-2.4.3/modules/highgui/src/window_QT.h
+--- OpenCV-2.4.3.orig/modules/highgui/src/window_QT.h 2012-10-18 00:55:38.000000000 +0200
++++ OpenCV-2.4.3/modules/highgui/src/window_QT.h 2012-11-05 21:38:41.000000000 +0100
+@@ -41,6 +41,7 @@
+ #define __OPENCV_HIGHGUI_QT_H__
+
+ #include "precomp.hpp"
++#include "unistd.h"
+
+ #if defined( HAVE_QT_OPENGL )
+ #include
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index a35f3f87de2d..06482d11d4de 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -17,6 +17,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
Enable Intel Integrated Primitive support
Enable optimization for SSE3 capable chips
faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)
+ Add support for OpenCL
Add support for the Intel threadingbuildingblocks library
Build and install programs for testing OpenCV (performance)
diff --git a/media-libs/opencv/opencv-2.4.3.ebuild b/media-libs/opencv/opencv-2.4.3.ebuild
new file mode 100644
index 000000000000..0a9bb5e0195d
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.3.ebuild,v 1.1 2012/11/05 21:25:37 dilfridge Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+
+inherit base toolchain-funcs cmake-utils python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-python/numpy
+ sys-libs/zlib
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ ieee1394? (
+ media-libs/libdc1394
+ sys-libs/libraw1394
+ )
+ ipp? ( sci-libs/ipp )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr )
+ opengl? ( virtual/glu )
+ png? ( media-libs/libpng )
+ qt4? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-test:4
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ threads? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+ "${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+ "${FILESDIR}/${PN}-2.4.2-cflags.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ # please dont sort here, order is the same as in CMakeLists.txt
+ local mycmakeargs=(
+ # the optinal dependency libraries
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF
+ -DWITH_CARBON=OFF
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with opencl)
+ # $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ # $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ -DWITH_OPENNI=OFF # not packaged
+ $(cmake-utils_use_with png)
+ -DWITH_PVAPI=OFF # not packaged
+ $(cmake-utils_use_with qt4 QT)
+ -DWITH_QUICKTIME=OFF
+ $(cmake-utils_use_with threads TBB)
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ # the build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -DENABLE_OMIT_FRAME_POINTER=OFF #
+ -DENABLE_FAST_MATH=OFF #
+ -DENABLE_SSE=OFF # these options do nothing but
+ -DENABLE_SSE2=OFF # add params to CFLAGS
+ -DENABLE_SSE3=OFF
+ -DENABLE_SSSE3=OFF
+ -DENABLE_SSE41=OFF
+ -DENABLE_SSE42=OFF
+ -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic
+ )
+
+ if use cuda; then
+ if [[ "$(gcc-version)" > "4.6" ]]; then
+ ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ else
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
+ fi
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ fi
+
+ if use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ mycmakeargs+=(
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 01625dfb6850..8bff408e09c0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,4 @@
DIST lilypond-2.14.2.tar.gz 15224418 SHA256 243a6b3845722a37083d73ed681e69ffde0b3b9c6158af20db3c0926dd982696 SHA512 e2d551eb8cfc08387519c7282c3813072da644c7e503461669fa79621af2805ac63b9924c7bb2894b2413f05e202b426d9ee0f6889e99287cc1941442342232a WHIRLPOOL 3b85ad14214726f13fe6ffda7a2ba42b10c079139c0c44ec380a8ec5c485966f88ba52184ad126957515948a6de77f884fe4e6be7696a39eec8b1aafd682ec05
DIST lilypond-2.16.0.tar.gz 15994773 SHA256 ecd5b7a2da668c94de7757e366f34bdd5d49b89e9b40ce859174dd2a7edb163d SHA512 254ea1a1efbff2f5eb39f9007a27d57b8a43fc86278e28594541c3c2b47c7f0349c7f390c7789528f9531fc95a64010db7beb25390a0f884653287919e600dcc WHIRLPOOL 7ee02629edf0ade4105f52fa3fdbcdd4e8cd763027e6be2a9871fe59138db848af00fb5f143ad4855d6522b484a15c0bc51a7a5a849fd955ddec7979e7e9904d
DIST lilypond-2.17.5.tar.gz 16051524 SHA256 d121075918089f93c2527e4a9a47800668ea996570336aa062449296d6c9a17a SHA512 294c42e6e45fb838f04a7c0ffb6bfec5667d79be0fe779e11f1ebeffe5999630365ba5f29cefaba72fe8b5ee64e14eb04e80a26f4ffef3d580928a551be7a7fe WHIRLPOOL f3b929ecf32417a374eb4b6cb52d11b8990df319cd6072e9c2a208953def803d9b720587ad2965a0c88bd5dc5d7e5c8dacc42712e6c1e641df9ef99922968a86
+DIST lilypond-2.17.6.tar.gz 16112409 SHA256 dac4a1676aad4e0cb903d2736b500d63e74e1ecc68140dd0b3222d39f8379e26 SHA512 de1597bdf4fb336674cf87b9110997c69edf6cbd9b193a473f3e4d287390a04f368197ba40e2d202c79d2b98a18fed85bff541a2e081ecd0657846a8a64191fd WHIRLPOOL 4e483ca6613a99a00e185177475b09dfc46f31618544d3aef354c226d3d7453b2df2afa2fabbb2795db18f943f6afcd5d63f3bac0ac15fef2d38f0e6f45d068e
diff --git a/media-sound/lilypond/lilypond-2.17.6.ebuild b/media-sound/lilypond/lilypond-2.17.6.ebuild
new file mode 100644
index 000000000000..82e994833cf2
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.17.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.6.ebuild,v 1.1 2012/11/06 05:38:38 radhermit Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+
+inherit elisp-common python autotools eutils
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-3 FDL-1.3"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug emacs profile vim-syntax"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+ >=dev-scheme/guile-1.8.2[deprecated,regex]
+ media-fonts/urw-fonts
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=x11-libs/pango-1.12.3
+ emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+ app-text/t1utils
+ dev-lang/perl
+ dev-texlive/texlive-metapost
+ virtual/pkgconfig
+ media-gfx/fontforge
+ >=sys-apps/texinfo-4.11
+ >=sys-devel/bison-2.0
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+ if ! use vim-syntax ; then
+ sed -i -e "s/vim//" GNUmakefile.in || die
+ fi
+
+ sed -i -e "s/OPTIMIZE -g/OPTIMIZE/" aclocal.m4 || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # documentation generation currently not supported since it requires a newer
+ # version of texi2html than is currently in the tree
+
+ econf \
+ --with-ncsb-dir=/usr/share/fonts/urw-fonts \
+ --disable-documentation \
+ --disable-optimising \
+ --disable-pipe \
+ $(use_enable debug debugging) \
+ $(use_enable profile profiling)
+}
+
+src_compile() {
+ default
+
+ if use emacs ; then
+ elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+ || die "elisp-compile failed"
+ fi
+}
+
+src_install () {
+ emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+ # remove elisp files since they are in the wrong directory
+ rm -r "${D}"/usr/share/emacs || die
+
+ if use emacs ; then
+ elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+ || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+ fi
+
+ python_convert_shebangs -r 2 "${D}"
+
+ dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 3b96ea69b0bc..a53bb48adf90 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,2 +1,3 @@
DIST qmmp-0.6.0.tar.bz2 772882 SHA256 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe SHA512 63897d7b93a071a1b51a18063f453044013bee91c68b186e52a48aa08c84180a8914dcaf1b20fdb8554430fd99511485d4529608f1ae61704c7c0a591356be98 WHIRLPOOL 24e8e834d64bec8aef259309829cce3f0a17193d72c25fb98e7afb9af5a831fa388e652e44bea43b49e966620d8a928231c9749f13c4f39cb0aad728a2d2ea29
DIST qmmp-0.6.3.tar.bz2 775285 SHA256 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8 SHA512 2e38a8cd4346af6b3cc4f6cefe4c78dc9a2f32e648b0f9e6b9d058a302787317744f5fa251c6572777851690c28825508291e45416e3cf7395350fd85f099258 WHIRLPOOL 88850bece4da6a1e24e95ada34176ee6fcbefc6071c1b480d5760b9c379e6d41b8865159753496a4351f6d3a656244c2fab510e7e198c02bbf2b78e0654b386f
+DIST qmmp-0.6.4.tar.bz2 786486 SHA256 3db8a38da74ed4a8551c9215f4984f83831d5a4602e1daaf42fcb48313a73372 SHA512 7b8a088db6477f35184c6105f94c68a3b06af14e20da18d293d784bab47051bdec009453b8a3272a8cc7e08f38155195bb5d7353d70ba3544c37ab48a13817ad WHIRLPOOL d9c3d52f0df41d0586b2fb1e977e91b838dce276a4e5d5536e5a0d404704a51ad93d4bec4aa1ce39e26b45358c4093ed7961c8d1738c49d85f27aeb559fdd73c
diff --git a/media-sound/qmmp/qmmp-0.6.4.ebuild b/media-sound/qmmp/qmmp-0.6.4.ebuild
new file mode 100644
index 000000000000..9adee9cab040
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.6.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.4.ebuild,v 1.1 2012/11/05 21:59:18 hwoarang Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss
+projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
+
+RDEPEND="x11-libs/qt-qt3support:4
+ media-libs/taglib
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( || ( media-video/mplayer
+ media-video/mplayer2 )
+ )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ projectm? ( media-libs/libprojectm
+ x11-libs/qt-opengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udev? ( sys-fs/udisks:0 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udev UDISKS)
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 484008ca8a27..c5b7c66b948c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Nov 2012 17:07:01 +0000
+Tue, 06 Nov 2012 06:07:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 484008ca8a27..c5b7c66b948c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Nov 2012 17:07:01 +0000
+Tue, 06 Nov 2012 06:07:01 +0000
diff --git a/metadata/md5-cache/app-admin/puppet-lint-0.2.1 b/metadata/md5-cache/app-admin/puppet-lint-0.2.1
new file mode 100644
index 000000000000..2a3f9cb9c478
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-lint-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/rspec[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rspec[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A linter for puppet DSL.
+EAPI=4
+HOMEPAGE=http://puppet-lint.com/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-ruby/rspec[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rspec[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/puppet-lint-0.2.1.gem
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 ruby-fakegem 2785c639b173dd603e95bd60b8d6c4c0 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=d2a60122c97c0c25396e6025224a5b37
diff --git a/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12 b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
new file mode 100644
index 000000000000..29dcd642d926
--- /dev/null
+++ b/metadata/md5-cache/app-admin/system-config-printer-common-1.3.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=dev-libs/glib-2 dev-libs/libxml2[python] dev-python/dbus-python >=dev-python/pycups-1.9.60 dev-python/pycurl >=dev-python/pygobject-2.21.5:2 net-print/cups[dbus] >=sys-fs/udev-172 virtual/libusb:1 dev-util/intltool virtual/pkgconfig doc? ( dev-python/epydoc ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=Common modules of Red Hat's printer administration tool
+EAPI=4
+HOMEPAGE=http://cyberelk.net/tim/software/system-config-printer/
+IUSE=doc policykit
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2[python] dev-python/dbus-python >=dev-python/pycups-1.9.60 dev-python/pycurl >=dev-python/pygobject-2.21.5:2 net-print/cups[dbus] >=sys-fs/udev-172 virtual/libusb:1 !=sys-auth/polkit-0.104-r1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.12.tar.xz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=10488f8f7d0eed555cfcce9ec7c54444
diff --git a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.9-r1 b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
similarity index 66%
rename from metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.9-r1
rename to metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
index 507017ac0e5b..660e8468356a 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.9-r1
+++ b/metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postrm prepare setup
-DEPEND=~app-admin/system-config-printer-common-1.3.9 dev-python/notify-python >=dev-python/pycups-1.9.60 >=dev-python/pygtk-2.4 gnome-keyring? ( dev-python/gnome-keyring-python ) app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-util/desktop-file-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext =dev-lang/python-2* =dev-lang/python-2*[xml] =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=~app-admin/system-config-printer-common-1.3.12 dev-python/notify-python >=dev-python/pycups-1.9.60 >=dev-python/pygtk-2.4 gnome-keyring? ( dev-python/gnome-keyring-python ) app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-util/desktop-file-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext =dev-lang/python-2* =dev-lang/python-2*[xml] =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=GNOME frontend for a Red Hat's printer administration tool
EAPI=3
HOMEPAGE=http://cyberelk.net/tim/software/system-config-printer/
IUSE=gnome-keyring linguas_ar linguas_as linguas_bg linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kn linguas_ko linguas_lo linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_nn linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr@latin linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sh sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=~app-admin/system-config-printer-common-1.3.9 dev-python/notify-python >=dev-python/pycups-1.9.60 >=dev-python/pygtk-2.4 gnome-keyring? ( dev-python/gnome-keyring-python ) =dev-lang/python-2* =dev-lang/python-2*[xml]
+RDEPEND=~app-admin/system-config-printer-common-1.3.12 dev-python/notify-python >=dev-python/pycups-1.9.60 >=dev-python/pygtk-2.4 gnome-keyring? ( dev-python/gnome-keyring-python ) =dev-lang/python-2* =dev-lang/python-2*[xml]
RESTRICT=test
SLOT=0
-SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.9.tar.xz
+SRC_URI=http://cyberelk.net/tim/data/system-config-printer/1.3/system-config-printer-1.3.12.tar.xz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=506b9238bf04abb4309ebe26652a5ec9
+_md5_=3690f98315001d72d95962816fd170c0
diff --git a/metadata/md5-cache/app-admin/webmin-1.600 b/metadata/md5-cache/app-admin/webmin-1.600-r1
similarity index 97%
rename from metadata/md5-cache/app-admin/webmin-1.600
rename to metadata/md5-cache/app-admin/webmin-1.600-r1
index 8aebbf78e94c..05d9efabc4a4 100644
--- a/metadata/md5-cache/app-admin/webmin-1.600
+++ b/metadata/md5-cache/app-admin/webmin-1.600-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-Sys-Syslog virtual/perl-Time-HiRes virtual/perl-Time-Local
SLOT=0
SRC_URI=minimal? ( mirror://sourceforge/webadmin/webmin-1.600-minimal.tar.gz ) !minimal? ( mirror://sourceforge/webadmin/webmin-1.600.tar.gz )
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 ssl-cert 7f678cd359743d336ecf3a6cc4ce1521 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7c3abc46f95d2d6f7e37cfc0617aaad6
+_md5_=46ae1eb6b9626564bcadcdce29e816ac
diff --git a/metadata/md5-cache/app-arch/tar-1.26-r1 b/metadata/md5-cache/app-arch/tar-1.26-r1
index d99e22b6fd0b..8db0ae21c9bf 100644
--- a/metadata/md5-cache/app-arch/tar-1.26-r1
+++ b/metadata/md5-cache/app-arch/tar-1.26-r1
@@ -3,11 +3,11 @@ DEPEND=xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.10.35 ) || ( >=sys-
DESCRIPTION=Use this to make tarballs :)
EAPI=3
HOMEPAGE=http://www.gnu.org/software/tar/
-IUSE=nls static userland_GNU xattr
+IUSE=minimal nls static userland_GNU xattr
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=xattr? ( sys-apps/attr )
SLOT=0
SRC_URI=mirror://gnu/tar/tar-1.26.tar.bz2 mirror://gnu-alpha/tar/tar-1.26.tar.bz2
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c76c88e52852ddb6875e7986ca9176b
+_md5_=908a462471c9de6941bc3c131e5ecae6
diff --git a/metadata/md5-cache/app-backup/deja-dup-25.1.1 b/metadata/md5-cache/app-backup/deja-dup-25.1.1
new file mode 100644
index 000000000000..ed3ae59e6cb9
--- /dev/null
+++ b/metadata/md5-cache/app-backup/deja-dup-25.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-crypt/libsecret[vala] dev-libs/glib:2 dev-libs/libpeas x11-libs/gtk+:3 x11-libs/libnotify app-backup/duplicity dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) app-text/yelp-tools dev-lang/vala:0.16 dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Simple backup tool using duplicity back-end
+EAPI=4
+HOMEPAGE=https://launchpad.net/deja-dup/
+IUSE=nautilus debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/libsecret[vala] dev-libs/glib:2 dev-libs/libpeas x11-libs/gtk+:3 x11-libs/libnotify app-backup/duplicity dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/gvfs[fuse]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://launchpad.net/deja-dup/26/25.1.1/+download/deja-dup-25.1.1.tar.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 15aa463585bf2d9974b9235ea20ccb94 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=1071f48ca40592a6b5f820d8e2e8ad7f
diff --git a/metadata/md5-cache/app-crypt/bsign-0.4.5 b/metadata/md5-cache/app-crypt/bsign-0.4.5
index 92ad0b4657f0..82dedcace926 100644
--- a/metadata/md5-cache/app-crypt/bsign-0.4.5
+++ b/metadata/md5-cache/app-crypt/bsign-0.4.5
@@ -4,9 +4,9 @@ DESCRIPTION=embed secure hashes (SHA1) and digital signatures (GNU Privacy Guard
EAPI=2
HOMEPAGE=http://packages.debian.org/sid/bsign
IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~ppc-macos ~x86 ~x86-linux
+KEYWORDS=~amd64 ppc ~ppc-macos ~x86 ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/b/bsign/bsign_0.4.5.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62f140a6118fa7213896ba8856925b5a
+_md5_=4973ebe7b6a92aa861d6c67e80773f82
diff --git a/metadata/md5-cache/app-crypt/gpa-0.9.3 b/metadata/md5-cache/app-crypt/gpa-0.9.3
index 495d6c91a9a4..7ddff36f8cef 100644
--- a/metadata/md5-cache/app-crypt/gpa-0.9.3
+++ b/metadata/md5-cache/app-crypt/gpa-0.9.3
@@ -4,9 +4,9 @@ DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for Gn
EAPI=4
HOMEPAGE=http://gpa.wald.intevation.org
IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ppc ppc64 ~sparc ~x86
LICENSE=GPL-3
RDEPEND=>=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0
SLOT=0
SRC_URI=mirror://gnupg/gpa/gpa-0.9.3.tar.bz2
-_md5_=2aebcaac20eba7b8fe90cc0d5dc8df1c
+_md5_=ce46461d7adf5ea74fa629d9dd683394
diff --git a/metadata/md5-cache/app-crypt/md6sum-1.0 b/metadata/md5-cache/app-crypt/md6sum-1.0
index 57015db7ed66..86b2b57ec144 100644
--- a/metadata/md5-cache/app-crypt/md6sum-1.0
+++ b/metadata/md5-cache/app-crypt/md6sum-1.0
@@ -7,4 +7,4 @@ LICENSE=MIT
SLOT=0
SRC_URI=mirror://sourceforge/md6sum/md6sum-1.0.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5c1f91ffd366c85a55ba315788334773
+_md5_=544c3f1863ccd951e209275c5f2e2539
diff --git a/metadata/md5-cache/app-editors/fte-20051115-r3 b/metadata/md5-cache/app-editors/fte-20051115-r3
index 594ccbf6b183..e2d81d4fd946 100644
--- a/metadata/md5-cache/app-editors/fte-20051115-r3
+++ b/metadata/md5-cache/app-editors/fte-20051115-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight text-mode editor
EAPI=4
HOMEPAGE=http://fte.sourceforge.net
IUSE=gpm slang X
-KEYWORDS=~alpha amd64 ~ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=|| ( GPL-2 Artistic )
RDEPEND=>=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXpm ) gpm? ( >=sys-libs/gpm-1.20 )
SLOT=0
SRC_URI=mirror://sourceforge/fte/fte-20051115-src.zip mirror://sourceforge/fte/fte-20051115-common.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=601d1f1f2255c7d9d6105e43c0480a47
+_md5_=56e807be04fdee0222a223f8066fe28d
diff --git a/metadata/md5-cache/app-office/akonadi-server-1.8.1 b/metadata/md5-cache/app-office/akonadi-server-1.8.1
new file mode 100644
index 000000000000..256a48396601
--- /dev/null
+++ b/metadata/md5-cache/app-office/akonadi-server-1.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=dev-libs/boost >=dev-libs/soprano-2.6.51 >=x11-libs/qt-gui-4.5.0:4[dbus] >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?] >=x11-libs/qt-test-4.5.0:4 x11-misc/shared-mime-info dev-libs/libxslt >=dev-util/automoc-0.9.88 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=The server part of Akonadi
+EAPI=4
+HOMEPAGE=http://pim.kde.org/akonadi
+IUSE=mysql postgres +sqlite test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost >=dev-libs/soprano-2.6.51 >=x11-libs/qt-gui-4.5.0:4[dbus] >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?] >=x11-libs/qt-test-4.5.0:4 x11-misc/shared-mime-info postgres? ( dev-db/postgresql-server )
+REQUIRED_USE=|| ( sqlite mysql postgres )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kde/stable/akonadi/src/akonadi-1.8.1.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils d9d351169c1d554e8f47f1a19f17becd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5c9c3a4234c8bdf5cbfd5b9d13476fad
diff --git a/metadata/md5-cache/app-office/texstudio-2.5 b/metadata/md5-cache/app-office/texstudio-2.5
new file mode 100644
index 000000000000..7eec85eea10d
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 video? ( media-libs/phonon ) virtual/pkgconfig
+DESCRIPTION=Free cross-platform LaTeX editor (former texmakerX)
+EAPI=4
+HOMEPAGE=http://texstudio.sourceforge.net/
+IUSE=video
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 video? ( media-libs/phonon ) virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
+SLOT=0
+SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.5/texstudio-2.5.tar.gz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 75aa32643ef22632eb9b45989b4c03fc toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8455d9cd0b1d2514dc7e60f0760993bc
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5
deleted file mode 100644
index deac8a1d378c..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=3
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse dev-lang/python[xml] dev-lang/python
-SLOT=0
-SRC_URI=mirror://gentoo/gentoolkit-0.3.0.5.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=314c22dc077d334934a5ebc577fe1c3f
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.4-r5 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
similarity index 68%
rename from metadata/md5-cache/app-portage/gentoolkit-0.3.0.4-r5
rename to metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
index 470b93d3c5a4..f1eb5e81ae15 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.4-r5
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
@@ -3,10 +3,10 @@ DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
DESCRIPTION=Collection of administration scripts for Gentoo
EAPI=3
HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-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
LICENSE=GPL-2
RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse dev-lang/python[xml] dev-lang/python
SLOT=0
-SRC_URI=mirror://gentoo/gentoolkit-0.3.0.4.tar.gz
+SRC_URI=mirror://gentoo/gentoolkit-0.3.0.7.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cdc54b8c207ab7d7618dd169272cc428
+_md5_=2836f20e253d2c2b26540bbdd5ce0b9e
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.0 b/metadata/md5-cache/app-text/libexttextcat-3.4.0
new file mode 100644
index 000000000000..9c2969db6bd5
--- /dev/null
+++ b/metadata/md5-cache/app-text/libexttextcat-3.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Library implementing N-gram-based text categorization
+EAPI=4
+HOMEPAGE=http://software.wise-guys.nl/libtextcat/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.0.tar.xz
+_md5_=cb9d5b1819cab7c04e98ea39357e3ae0
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
index a05bef5da0c0..24882765ce81 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
IUSE=elibc_FreeBSD
KEYWORDS=amd64 ppc x86
-LICENSE=as-is
+LICENSE=ZLIB GPL-2-with-linking-exception
RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.1.9-r1
SLOT=0
SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.1.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 2d9eb3508fa5d6759e39354b74545567 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=60a749c09fc450cb142757831c9169bc
+_md5_=ff37b2713fc007c22f14578769356722
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
index 507398a45656..2961ab7dfbae 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
IUSE=elibc_FreeBSD
KEYWORDS=amd64 ~ppc x86
-LICENSE=as-is
+LICENSE=ZLIB GPL-2-with-linking-exception
RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.1.9-r1
SLOT=0
SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.2.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 2d9eb3508fa5d6759e39354b74545567 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=4c9e5b725ff4006d34e16ec8f09d1df5
+_md5_=ef0de40ffc137d803c8645001d9f8ad1
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2 b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
index 14a6bea27b79..817dccd4e1f6 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
IUSE=elibc_FreeBSD
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=ZLIB GPL-2-with-linking-exception
RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.1.9-r1
SLOT=0
SRC_URI=http://www.frijters.net/openjdk-7u4-stripped.zip http://www.frijters.net/ikvmsrc-7.1.4532.2.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 2d9eb3508fa5d6759e39354b74545567 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=029b40d93668efbc91020b62fa40d6fd
+_md5_=3c221b97da568fe418b17b30c9a7f674
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-bin-0.46.0.2 b/metadata/md5-cache/dev-dotnet/ikvm-bin-0.46.0.2
index 7c60e23af4da..5e9b56ae1fbc 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-bin-0.46.0.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-bin-0.46.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Java VM for .NET
EAPI=4
HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
KEYWORDS=amd64 x86
-LICENSE=as-is
+LICENSE=ZLIB GPL-2-with-linking-exception
RDEPEND=>=dev-lang/mono-1.1 !dev-dotnet/ikvm app-arch/unzip
SLOT=0
SRC_URI=http://www.frijters.net/ikvmbin-0.46.0.2.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c1df6b7103f7b1f9ffe487596440d686
+_md5_=ca7f4f8b2317babc8083b2cf814527f1
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2 b/metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
index bfe9ff76305e..5d1b7ca37864 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
@@ -4,9 +4,9 @@ DESCRIPTION=Java VM for .NET
EAPI=4
HOMEPAGE=http://www.ikvm.net/ http://weblog.ikvm.net/
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=ZLIB GPL-2-with-linking-exception
RDEPEND=>=dev-lang/mono-1.1 !dev-dotnet/ikvm app-arch/unzip
SLOT=0
SRC_URI=http://www.frijters.net/ikvmbin-7.1.4532.2.zip
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ce0b7479967c31db84871441a68bcf4a
+_md5_=9b2d3800bb82d7b4b4bc917359cc8c63
diff --git a/metadata/md5-cache/dev-embedded/include-0.4.2 b/metadata/md5-cache/dev-embedded/include-0.4.2
index 5f50d21cdb00..05f33ac92821 100644
--- a/metadata/md5-cache/dev-embedded/include-0.4.2
+++ b/metadata/md5-cache/dev-embedded/include-0.4.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=A collection of useful, independent include files for C/Assembler developers.
EAPI=4
HOMEPAGE=http://openwince.sourceforge.net/include/
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc ~sparc ~x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/openwince/include-0.4.2.tar.bz2
-_md5_=4326b0e45a934f6dcad3513c6f012fcb
+_md5_=c34cc9772ae5aec6e9ee58c35b656b83
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.6-r1 b/metadata/md5-cache/dev-lang/regina-rexx-3.6-r1
index 87cddcff3a96..c003623a6fc2 100644
--- a/metadata/md5-cache/dev-lang/regina-rexx-3.6-r1
+++ b/metadata/md5-cache/dev-lang/regina-rexx-3.6-r1
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=Portable Rexx interpreter
EAPI=4
HOMEPAGE=http://regina-rexx.sourceforge.net
-KEYWORDS=~amd64 ~hppa ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ppc ~s390 ~sparc ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.6.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=4318e5fc1ab2cf7e9b31217733d18b3c
+_md5_=ba528ae8fc069d7c4ab1301127ce84c5
diff --git a/metadata/md5-cache/dev-libs/boost-1.52.0 b/metadata/md5-cache/dev-libs/boost-1.52.0
new file mode 100644
index 000000000000..1cffe5ff40e1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.52.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !app-admin/eselect-boost =dev-util/boost-build-1.52* python? ( dev-lang/python )
+DESCRIPTION=Boost Libraries for C++
+EAPI=5
+HOMEPAGE=http://www.boost.org/
+IUSE=debug doc icu mpi python static-libs tools
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=Boost-1.0
+RDEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !app-admin/eselect-boost python? ( dev-lang/python )
+SLOT=0
+SRC_URI=mirror://sourceforge/boost/boost_1_52_0.tar.bz2
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=e57f6eafaab36110065fc5db381f59e6
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
index c2e2f9d0bf6c..2ba2e37a8ee3 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
@@ -5,9 +5,9 @@ EAPI=2
HOMEPAGE=http://asg.web.cmu.edu/sasl/
IUSE=authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom elibc_FreeBSD java
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=as-is
+LICENSE=BSD-4
RDEPEND=authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=2
SRC_URI=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz ntlm_unsupported_patch? ( mirror://gentoo/cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f db-use 2f5d6a2718559b90a51648d8ff58be83 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=f3575c736695632b57cba29fc5fc7a01
+_md5_=ca8dcbc64d6e2c59d8f5da65e96d4286
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
index 7897cd466a5a..ebe17227a4d4 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://cyrusimap.web.cmu.edu/
IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=as-is
+LICENSE=BSD-4
RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=2
SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f db-use 2f5d6a2718559b90a51648d8ff58be83 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=4d7f20ec8128f520f9e9f03310fd8ec7
+_md5_=1c7cd2f2e77b05f253f20924fc2f0f6c
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
index 520f7fb30dcc..28d16822f034 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://cyrusimap.web.cmu.edu/
IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=as-is
+LICENSE=BSD-4
RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=2
SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f db-use 2f5d6a2718559b90a51648d8ff58be83 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=3c9fb4a7ad8f074f116b755ea34fc1f3
+_md5_=7abc5fbb87f9d21db4f379c3fb4c1406
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
index cb64cfdb0228..091280f364a3 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r2
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://cyrusimap.web.cmu.edu/
IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=as-is
+LICENSE=BSD-4
RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=2
SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f db-use 2f5d6a2718559b90a51648d8ff58be83 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=b532139b18ba1a6023f082d1bfe3d106
+_md5_=0e335fa00c9d50032ee97ed69eb4da3f
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3
index 812e3598a4c5..3420a7848da4 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://cyrusimap.web.cmu.edu/
IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=as-is
+LICENSE=BSD-4
RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=2
SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f db-use 2f5d6a2718559b90a51648d8ff58be83 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e1c2cbbd3cf5ed4bcfb199b61e1c052d
+_md5_=128173d672a26621471b221522e96888
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1 b/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
index b63f89523f50..143f24fd8f4a 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=a regular expression library for different character encodings
EAPI=4
HOMEPAGE=http://www.geocities.jp/kosako3/oniguruma
IUSE=combination-explosion-check crnl-as-line-terminator static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=BSD-2
SLOT=0
SRC_URI=http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.2.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aec54d037c9bad39e441d06090d441a8
+_md5_=d970bddb40b917ba920097493e24766d
diff --git a/metadata/md5-cache/dev-python/coverage-3.5.3 b/metadata/md5-cache/dev-python/coverage-3.5.3
index 734c1a0043cf..73f0b6fb1b59 100644
--- a/metadata/md5-cache/dev-python/coverage-3.5.3
+++ b/metadata/md5-cache/dev-python/coverage-3.5.3
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools dev-lang/python
DESCRIPTION=Code coverage measurement for Python
EAPI=3
HOMEPAGE=http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=dev-python/setuptools dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/c/coverage/coverage-3.5.3.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=7d4f7e2878796f3b7361a5cf3958c17b
+_md5_=a41aad82d611ff390fa7381568d6f2e1
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.58.1 b/metadata/md5-cache/dev-python/logilab-common-0.58.1
index 33282aac06d1..cf6b2513ab81 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.58.1
+++ b/metadata/md5-cache/dev-python/logilab-common-0.58.1
@@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools dev-python/unittest2 dev-lang/python
SLOT=0
SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.58.1.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.58.1.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=4dab8a9df15009f285c649e7c48b998e
+_md5_=74ff47c7e3f497642691a184d9e0c106
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.55.2 b/metadata/md5-cache/dev-python/logilab-common-0.58.1-r1
similarity index 51%
rename from metadata/md5-cache/dev-python/logilab-common-0.55.2
rename to metadata/md5-cache/dev-python/logilab-common-0.58.1-r1
index 095f01dfc23e..b5aa3d98539e 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.55.2
+++ b/metadata/md5-cache/dev-python/logilab-common-0.58.1-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools dev-python/unittest2 test? ( dev-python/egenix-mx-base !dev-python/psycopg[-mxdatetime] ) dev-lang/python
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools dev-python/unittest2 test? ( dev-python/egenix-mx-base !dev-python/psycopg[-mxdatetime] ) doc? ( dev-python/epydoc ) dev-lang/python
DESCRIPTION=Useful miscellaneous modules used by Logilab projects
-EAPI=3
+EAPI=4
HOMEPAGE=http://www.logilab.org/project/logilab-common http://pypi.python.org/pypi/logilab-common
-IUSE=test
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+IUSE=test doc
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=LGPL-2.1
RDEPEND=dev-python/setuptools dev-python/unittest2 dev-lang/python
SLOT=0
-SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.55.2.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.55.2.tar.gz
+SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.58.1.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.58.1.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=ca769c29a1c2d4fc679a9ec07b67e4b6
+_md5_=f2211e7ff33fa16e6134f1c1843a627d
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.1.1 b/metadata/md5-cache/dev-python/matplotlib-1.1.1
index a9a0bf8390a7..9d8a6de6b519 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.1.1
+++ b/metadata/md5-cache/dev-python/matplotlib-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
EAPI=3
HOMEPAGE=http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib
IUSE=cairo doc excel examples fltk gtk latex qt4 test tk wxwidgets
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-freebsd ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-freebsd ~x86-linux ~x86-macos
LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
RDEPEND=dev-python/numpy dev-python/python-dateutil dev-python/pytz media-libs/freetype:2 media-libs/libpng gtk? ( dev-python/pygtk ) wxwidgets? ( dev-python/wxpython:2.8 ) dev-python/pyparsing cairo? ( dev-python/pycairo ) excel? ( dev-python/xlwt ) fltk? ( dev-python/pyfltk ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended ) qt4? ( || ( dev-python/PyQt4[X] dev-python/pyside[X] ) ) =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
SLOT=0
SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.1.1.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4042ed92cb6347130dda4599cdfb6214
+_md5_=bb80a1f834bbf1b0e8e8420e43bac6f4
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.0.26 b/metadata/md5-cache/dev-python/pyalsa-1.0.26
index ca0c8d43d99f..0870459d6628 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.0.26
+++ b/metadata/md5-cache/dev-python/pyalsa-1.0.26
@@ -3,10 +3,10 @@ DEPEND=media-libs/alsa-lib dev-python/setuptools =dev-lang/python-2*
DESCRIPTION=Python bindings for ALSA library
EAPI=2
HOMEPAGE=http://alsa-project.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/alsa-lib =dev-lang/python-2*
SLOT=0
SRC_URI=mirror://alsaproject/pyalsa/pyalsa-1.0.26.tar.bz2
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0644a4da2e511fdfa1fcf892b1ce1a4
+_md5_=6b613500b98d1d5ebbb157a1cf20a896
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.1.4 b/metadata/md5-cache/dev-python/pyasn1-0.1.4
index e07d8e43e3eb..9462d9d0608d 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.1.4
+++ b/metadata/md5-cache/dev-python/pyasn1-0.1.4
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools dev-lang/python
DESCRIPTION=ASN.1 library for Python
EAPI=4
HOMEPAGE=http://pyasn1.sourceforge.net/ http://pypi.python.org/pypi/pyasn1
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.1.4.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=dfb54ddc8134fddcf89c1d2ad40c4bc2
+_md5_=c43a37613097b2d1bfef10cc87fa3c88
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.4 b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.4
index 82ae7bd5f2de..adad0f3a1229 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.0.4
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.0.4
@@ -3,10 +3,10 @@ DEPEND=dev-python/pyasn1 dev-python/setuptools dev-lang/python
DESCRIPTION=pyasn1 modules
EAPI=4
HOMEPAGE=http://pyasn1.sourceforge.net/ http://pypi.python.org/pypi/pyasn1-modules
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=BSD
RDEPEND=dev-python/pyasn1 dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.0.4.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=34a78cf2b938f654161079a53396934f
+_md5_=10ff90adb3720e632f76020d430d1f1e
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.62 b/metadata/md5-cache/dev-python/pycups-1.9.62
index ee6196b2d444..86c9156f1d6f 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.62
+++ b/metadata/md5-cache/dev-python/pycups-1.9.62
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for the CUPS API
EAPI=3
HOMEPAGE=http://cyberelk.net/tim/data/pycups/
IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86
LICENSE=GPL-2
RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
SLOT=0
SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.62.tar.bz2
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17ddd108482b04e7b0a5a011be83f9b7
+_md5_=2f6386d8ba4157316504f5201c5e1b16
diff --git a/metadata/md5-cache/dev-python/python-docs-3.3.0 b/metadata/md5-cache/dev-python/python-docs-3.3.0
index a2f7e56ae87c..fc1a02f4609d 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.3.0
+++ b/metadata/md5-cache/dev-python/python-docs-3.3.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postrm setup
DESCRIPTION=HTML documentation for Python
EAPI=3
HOMEPAGE=http://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=PSF-2
SLOT=3.3
SRC_URI=http://www.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2
-_md5_=72b3a53f37a4e89ebe0c2e8162ca00b7
+_md5_=524627a1a704c4f7e8fce84de276924a
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.10 b/metadata/md5-cache/dev-python/python-ldap-2.4.10
index efb31c7bff57..4e7813988f3c 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.10
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=Various LDAP-related Python modules
EAPI=4
HOMEPAGE=http://python-ldap.sourceforge.net/ http://www.python-ldap.org/
IUSE=doc examples sasl ssl
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-solaris
LICENSE=PSF-2
RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1 sasl? ( dev-libs/cyrus-sasl ) dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.10.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=a139d27f4266c78a1a37099a5872c99e
+_md5_=bdc1c4d9641a1c227500cc22d848b7e7
diff --git a/metadata/md5-cache/dev-python/traits-4.1.0 b/metadata/md5-cache/dev-python/traits-4.1.0
index 5cb80d38efc6..eb41bd553918 100644
--- a/metadata/md5-cache/dev-python/traits-4.1.0
+++ b/metadata/md5-cache/dev-python/traits-4.1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-python/numpy dev-lang/python
SLOT=0
SRC_URI=http://www.enthought.com/repo/ETS/traits-4.1.0.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=add2e044e86d54932ee355db1da5eeb0
+_md5_=0c636a684dd509eceaeffc9d2b733d72
diff --git a/metadata/md5-cache/dev-python/traits-4.2.0 b/metadata/md5-cache/dev-python/traits-4.2.0
index 5708ab22c288..ae2087338600 100644
--- a/metadata/md5-cache/dev-python/traits-4.2.0
+++ b/metadata/md5-cache/dev-python/traits-4.2.0
@@ -10,4 +10,4 @@ RDEPEND=dev-python/numpy dev-lang/python
SLOT=0
SRC_URI=http://www.enthought.com/repo/ETS/traits-4.2.0.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2c908471a0ab465dd050e531557b2fc8
+_md5_=e8f59c7b7ac439ab189b9f250854ff3d
diff --git a/metadata/md5-cache/dev-python/urwid-0.9.9.1 b/metadata/md5-cache/dev-python/urwid-0.9.9.1
index 9471139eb4b2..267562e56287 100644
--- a/metadata/md5-cache/dev-python/urwid-0.9.9.1
+++ b/metadata/md5-cache/dev-python/urwid-0.9.9.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools dev-lang/python
+DEPEND=dev-python/setuptools test? ( dev-python/twisted ) dev-lang/python
DESCRIPTION=Urwid is a curses-based user interface library for Python.
EAPI=2
HOMEPAGE=http://excess.org/urwid/ http://pypi.python.org/pypi/urwid
-IUSE=examples
+IUSE=examples test
KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=dev-lang/python
SLOT=0
SRC_URI=http://excess.org/urwid/urwid-0.9.9.1.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=2284ab6c4567a57a884c6d5d867d9954
+_md5_=549bd5267f5fb3d850e1c5858a40a28d
diff --git a/metadata/md5-cache/dev-python/urwid-1.0.2 b/metadata/md5-cache/dev-python/urwid-1.0.2
index 47d715ffb7cc..2e7cd897ad74 100644
--- a/metadata/md5-cache/dev-python/urwid-1.0.2
+++ b/metadata/md5-cache/dev-python/urwid-1.0.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools dev-lang/python[ncurses] dev-lang/python
+DEPEND=dev-python/setuptools test? ( dev-python/twisted ) dev-lang/python[ncurses] dev-lang/python
DESCRIPTION=Urwid is a curses-based user interface library for Python
EAPI=4
HOMEPAGE=http://excess.org/urwid/ http://pypi.python.org/pypi/urwid
-IUSE=examples
+IUSE=examples test
KEYWORDS=amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=dev-lang/python[ncurses] dev-lang/python
SLOT=0
SRC_URI=http://excess.org/urwid/urwid-1.0.2.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=72ccf6264f064fe1c0f0aeb061a4c578
+_md5_=386689f0a7c6f20cd2b65a59904f8dea
diff --git a/metadata/md5-cache/dev-python/urwid-1.1.0 b/metadata/md5-cache/dev-python/urwid-1.1.0
index 8a5cb11988ba..777ea73e044f 100644
--- a/metadata/md5-cache/dev-python/urwid-1.1.0
+++ b/metadata/md5-cache/dev-python/urwid-1.1.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python[ncurses] dev-lang/python
+DEPEND=dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/twisted ) dev-lang/python[ncurses] dev-lang/python
DESCRIPTION=Urwid is a curses-based user interface library for Python
EAPI=4
HOMEPAGE=http://excess.org/urwid/ http://pypi.python.org/pypi/urwid
-IUSE=doc examples
+IUSE=doc examples test
KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=dev-lang/python[ncurses] dev-lang/python
SLOT=0
SRC_URI=http://excess.org/urwid/urwid-1.1.0.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c1faa1ce34254e9e4e39e1e1d413351e
+_md5_=f11a94331ec90faf640e0c37b7ed4374
diff --git a/metadata/md5-cache/dev-tex/hevea-2.00 b/metadata/md5-cache/dev-tex/hevea-2.00
index 701fb561e8ed..421f03fb053a 100644
--- a/metadata/md5-cache/dev-tex/hevea-2.00
+++ b/metadata/md5-cache/dev-tex/hevea-2.00
@@ -4,10 +4,10 @@ DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
EAPI=2
HOMEPAGE=http://hevea.inria.fr/
IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ppc ~ppc64 ~sparc ~x86
LICENSE=QPL
RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?]
SLOT=0
SRC_URI=http://hevea.inria.fr/distri/hevea-2.00.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1428c55552f2fa64cd7b08d64c25989d
+_md5_=328ca88791794fc675e6b355b3519971
diff --git a/metadata/md5-cache/dev-util/boost-build-1.52.0 b/metadata/md5-cache/dev-util/boost-build-1.52.0
new file mode 100644
index 000000000000..c8d2741b1cf3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/boost-build-1.52.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=!=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline ) x11-proto/xproto
+DESCRIPTION=Graphical front-end for command-line debuggers
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/ddd
+IUSE=+gnuplot readline
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3 LGPL-3 FDL-1.1
+RDEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline ) x11-apps/xfontsel gnuplot? ( sci-visualization/gnuplot )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3c2064c7cfe8dca1a784572845b1ac8c
diff --git a/metadata/md5-cache/dev-util/dialog-1.1.20120706 b/metadata/md5-cache/dev-util/dialog-1.1.20120706
index 148fd4352f9e..c6aa604e0e68 100644
--- a/metadata/md5-cache/dev-util/dialog-1.1.20120706
+++ b/metadata/md5-cache/dev-util/dialog-1.1.20120706
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install prepare
-DEPEND=>=app-shells/bash-2.04-r3 !unicode? ( >=sys-libs/ncurses-5.2-r5 ) unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] ) nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DEPEND=>=sys-libs/ncurses-5.2-r5 unicode? ( sys-libs/ncurses[unicode] ) nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
DESCRIPTION=tool to display dialog boxes from a shell
EAPI=4
HOMEPAGE=http://invisible-island.net/dialog/dialog.html
IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-2
-RDEPEND=>=app-shells/bash-2.04-r3 !unicode? ( >=sys-libs/ncurses-5.2-r5 ) unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )
+RDEPEND=>=sys-libs/ncurses-5.2-r5 unicode? ( sys-libs/ncurses[unicode] )
SLOT=0
SRC_URI=ftp://invisible-island.net/dialog/dialog-1.1-20120706.tgz
-_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=126ce2f64dc485a77b69ceee6b1ca8f1
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=480cf68c5a7e04d4d29d9f1114d2ed6e
diff --git a/metadata/md5-cache/dev-util/synopsis-0.13 b/metadata/md5-cache/dev-util/synopsis-0.13
new file mode 100644
index 000000000000..302c941bf238
--- /dev/null
+++ b/metadata/md5-cache/dev-util/synopsis-0.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boehm-gc dev-libs/boehm-gc media-gfx/graphviz sys-devel/bison sys-devel/flex virtual/pkgconfig dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=General source code documentation tool
+EAPI=4
+HOMEPAGE=http://synopsis.fresco.org/index.html
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/boehm-gc media-gfx/graphviz dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://synopsis.fresco.org/download/synopsis-0.13.tar.gz
+_eclasses_=distutils-r1 f1e9639178263b24ebf7f155397aa5da eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python-r1 d6bad0368cb11a367dc1b2e75f47cb34 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bd1ae3c45c8b0d9748d11689d4adc825
diff --git a/metadata/md5-cache/games-action/chromium-bsu-0.9.15 b/metadata/md5-cache/games-action/chromium-bsu-0.9.15
index f67d7e204969..bd16c055452b 100644
--- a/metadata/md5-cache/games-action/chromium-bsu-0.9.15
+++ b/metadata/md5-cache/games-action/chromium-bsu-0.9.15
@@ -4,10 +4,10 @@ DESCRIPTION=Chromium B.S.U. - an arcade game
EAPI=2
HOMEPAGE=http://chromium-bsu.sourceforge.net/
IUSE=mixer nls +sdl
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
LICENSE=Clarified-Artistic
RDEPEND=media-fonts/dejavu media-libs/quesoglc media-libs/glpng virtual/opengl virtual/glu x11-libs/libXmu mixer? ( media-libs/sdl-mixer ) !mixer? ( media-libs/freealut media-libs/openal ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[X] media-libs/sdl-image[png] ) !sdl? ( media-libs/freeglut )
SLOT=0
SRC_URI=mirror://sourceforge/chromium-bsu/chromium-bsu-0.9.15.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 games e0a83e3f3f024b8c8ef7a8217d716cbf multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ead212a4bbc838f7c4000f6ca95fd827
+_md5_=d5927015040cd5ab990f9bb93cea8d4d
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.2.005 b/metadata/md5-cache/games-fps/urbanterror-4.2.005
new file mode 100644
index 000000000000..0aacaab95935
--- /dev/null
+++ b/metadata/md5-cache/games-fps/urbanterror-4.2.005
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!dedicated? ( virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] ) !sdl? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) dedicated? ( curl? ( net-misc/curl ) ) >=sys-apps/sed-4
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=4
+HOMEPAGE=http://www.urbanterror.info/home/
+IUSE=+curl debug dedicated openal +sdl server smp vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Q3AEULA
+RDEPEND=!dedicated? ( virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] ) !sdl? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm ) vorbis? ( media-libs/libogg media-libs/libvorbis ) )
+SLOT=0
+SRC_URI=http://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> urbanterror-4.2.003.tar.xz http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> urbanterror.svg mirror://gentoo/urbanterror-4.2.003-to-4.2.005-update.tar
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 check-reqs 0efdf29c9002a1995388968bf54e9d3d eutils d40dc948067bd3db1c8ebf7d51897313 games e0a83e3f3f024b8c8ef7a8217d716cbf gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=84d782b12f3f9f845bb5b34b9577164f
diff --git a/metadata/md5-cache/games-kids/gcompris-12.01 b/metadata/md5-cache/games-kids/gcompris-12.01
deleted file mode 100644
index eaa2dc5e2e31..000000000000
--- a/metadata/md5-cache/games-kids/gcompris-12.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
-DESCRIPTION=full featured educational application for children from 2 to 10
-EAPI=2
-HOMEPAGE=http://gcompris.net/
-IUSE=gnet python
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) media-gfx/tuxpaint sci-electronics/gnucap python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gcompris/gcompris-12.01.tar.gz
-_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 games e0a83e3f3f024b8c8ef7a8217d716cbf libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d6bc350079123efa67c96f6c0fce3809
diff --git a/metadata/md5-cache/games-kids/gcompris-12.01-r1 b/metadata/md5-cache/games-kids/gcompris-12.01-r1
deleted file mode 100644
index 0eb205c8d343..000000000000
--- a/metadata/md5-cache/games-kids/gcompris-12.01-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) dev-python/pygtk gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
-DESCRIPTION=full featured educational application for children from 2 to 10
-EAPI=2
-HOMEPAGE=http://gcompris.net/
-IUSE=gnet
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) dev-python/pygtk media-gfx/tuxpaint sci-electronics/gnucap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
-SLOT=0
-SRC_URI=mirror://sourceforge/gcompris/gcompris-12.01.tar.gz
-_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 games e0a83e3f3f024b8c8ef7a8217d716cbf libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b6d2d81d151b24bea8c260bb44c99122
diff --git a/metadata/md5-cache/gnome-base/gnome-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
index 8c630e6bd599..4b3f5228b462 100644
--- a/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=accessibility cdr cups dvdr ldap mono policykit
KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )
RDEPEND=!=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=dev-libs/libxml2-2.7.2:2 >=dev-libs/libxslt-1.1.22 >=media-libs/audiofile-0.2.7 >=x11-libs/libxklavier-5.0 >=media-libs/libart_lgpl-2.3.21 >=dev-libs/libIDL-0.8.14 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gnome-keyring-2.32.1 >=gnome-base/libgnome-keyring-2.32.0 >=app-crypt/seahorse-2.32.0 >=gnome-base/gconf-2.32.0-r1:2 >=net-libs/libsoup-2.32.1:2.4 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-extra/bug-buddy-2.32.0:2 >=gnome-base/libgnomekbd-2.32.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0:2 >=gnome-base/nautilus-2.32.1 >=media-libs/gstreamer-0.10.30.2:0.10 >=media-libs/gst-plugins-base-0.10.30.4:0.10 >=media-libs/gst-plugins-good-0.10.23:0.10 >=gnome-extra/gnome-media-2.32.0:2 =media-sound/sound-juicer-2.32.0 >=dev-libs/totem-pl-parser-2.32.1 >=media-video/totem-2.32.0 >=media-video/cheese-2.32.0 >=media-gfx/eog-2.32.1:1 >=www-client/epiphany-2.30.6 >=app-arch/file-roller-2.32.1 >=gnome-extra/gcalctool-5.32.1 >=gnome-extra/gconf-editor-2.32.0 >=gnome-base/gdm-2.20.11 >=x11-libs/gtksourceview-2.10.5:2.0 >=app-editors/gedit-2.30.4 >=app-text/evince-2.32.0 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=dev-libs/libgweather-2.30.3:2 =gnome-base/gnome-applets-2.32.0 >=gnome-base/gnome-panel-2.32.1 >=gnome-base/gnome-menus-2.30.5 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=gnome-extra/deskbar-applet-2.32.0 >=gnome-extra/hamster-applet-2.32.1 >=x11-themes/gtk-engines-2.20.2:2 >=x11-themes/gnome-backgrounds-2.32.0 >=x11-libs/vte-0.26.2:0 >=x11-terms/gnome-terminal-2.32.1 >=gnome-extra/gucharmap-2.32.1 >=gnome-extra/gnome-utils-2.32.0 >=gnome-extra/gnome-games-2.28.2 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/gnome-system-monitor-2.28.2 >=gnome-base/libgtop-2.28.2:2 >=x11-libs/startup-notification-0.10 >=gnome-extra/gnome-user-docs-2.32.0 >=gnome-extra/yelp-2.30.2 >=gnome-extra/zenity-2.32.1 >=net-analyzer/gnome-netstatus-2.28.2 >=net-analyzer/gnome-nettool-2.32.0 cdr? ( >=app-cdr/brasero-2.32.1 ) dvdr? ( >=app-cdr/brasero-2.32.1 ) >=gnome-extra/gtkhtml-3.32.1:3.14 >=mail-client/evolution-2.32.1-r1:2.0 >=gnome-extra/evolution-data-server-2.32.1-r1 >=gnome-extra/evolution-webcal-2.32.0 >=net-misc/vino-2.32.0 >=app-admin/pessulus-2.30.4 ldap? ( >=app-admin/sabayon-2.30.1 ) >=gnome-extra/gnome-screensaver-2.30.2 >=x11-misc/alacarte-0.13.2 >=gnome-extra/gnome-power-manager-2.32.0 >=net-misc/vinagre-2.30.3 >=gnome-extra/swfdec-gnome-2.30.1 accessibility? ( >=gnome-extra/libgail-gnome-1.20.3 >=gnome-extra/at-spi-1.32.0:1 >=app-accessibility/dasher-4.11 >=app-accessibility/gnome-mag-0.16.3:1 >=app-accessibility/gnome-speech-0.4.25:1 >=app-accessibility/gok-2.30.1:1 >=app-accessibility/orca-2.32.1 >=gnome-extra/mousetweaks-2.32.1 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.3 ) mono? ( >=dev-dotnet/gtk-sharp-2.12.10:2 >=app-misc/tomboy-1.4.2 ) policykit? ( gnome-extra/polkit-gnome )
SLOT=2.0
-_md5_=ab3f36e68e7c8a120fe0f20687666d35
+_md5_=1a2e08814985855448d978ce7c017a1c
diff --git a/metadata/md5-cache/gnome-base/gnome-3.2.1 b/metadata/md5-cache/gnome-base/gnome-3.2.1
index ec5b69b6aef6..5dcea326fef5 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-3.2.1
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=accessibility +bluetooth +cdr cups +extras +fallback
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=|| ( >=gnome-base/gvfs-1.10.1[udisks] >=gnome-base/gvfs-1.10.1[gdu] )
RDEPEND=>=gnome-base/gnome-core-libs-3.2.1[cups?] >=gnome-base/gnome-core-apps-3.2.1[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.2.1 >=x11-wm/mutter-3.2.1 >=gnome-base/gnome-shell-3.2.1[bluetooth?] >=x11-themes/gnome-backgrounds-3.2 >=x11-themes/gnome-icon-theme-extras-3.0.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.2.1 >=app-accessibility/at-spi2-core-2.2.1 >=app-accessibility/caribou-0.4.1 >=app-accessibility/orca-3.2.1 >=gnome-extra/mousetweaks-3.2.1 ) extras? ( >=gnome-base/gnome-extra-apps-3.2.1 ) fallback? ( >=gnome-base/gnome-applets-3.2.1 >=gnome-base/gnome-fallback-3.2.1 )
SLOT=2.0
-_md5_=b41cf9fed8a38ba66490d523a4379599
+_md5_=3b8cd7950b3833361223efe9722246e5
diff --git a/metadata/md5-cache/gnome-base/gnome-3.4.1 b/metadata/md5-cache/gnome-base/gnome-3.4.1
index f79ecbda7cce..42288ef0626f 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-3.4.1
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=accessibility +bluetooth +cdr cups +extras +fallback
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=|| ( >=gnome-base/gvfs-1.12.1[udisks] >=gnome-base/gvfs-1.12.1[gdu] )
RDEPEND=>=gnome-base/gnome-core-libs-3.4.1[cups?] >=gnome-base/gnome-core-apps-3.4.1[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.4.1 >=x11-wm/mutter-3.4.1 >=gnome-base/gnome-shell-3.4.1[bluetooth?] >=x11-themes/gnome-backgrounds-3.4.1 >=x11-themes/gnome-icon-theme-extras-3.4 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.4 >=app-accessibility/at-spi2-core-2.4.1 >=app-accessibility/caribou-0.4.2 >=app-accessibility/orca-3.4.1 >=gnome-extra/mousetweaks-3.4.1 ) extras? ( >=gnome-base/gnome-extra-apps-3.4.1 ) fallback? ( >=gnome-base/gnome-applets-3.4.1 >=gnome-base/gnome-fallback-3.4.1 )
SLOT=2.0
-_md5_=70e9267e6ee4e1fb5856a3b51f095775
+_md5_=6f3be74e532bc18bd3a137777319430b
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.2.1 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.2.1
index bc8fd9821612..faff912ec0c6 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-core-apps-3.2.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=+bluetooth +cdr cups +networkmanager
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.2.1[cups?] >=gnome-base/gnome-session-3.2.1 >=gnome-base/gnome-menus-3.2:3 >=gnome-base/gnome-settings-daemon-3.2.1[cups?] >=gnome-base/gnome-control-center-3.2.1[cups?] >=gnome-base/nautilus-3.2.1 >=gnome-base/gnome-keyring-3.2.1 >=gnome-base/libgnome-keyring-3.2 >=gnome-extra/evolution-data-server-3.2.1 >=gnome-extra/gnome-power-manager-3.2.1 >=gnome-extra/gnome-screensaver-3.2 >=app-crypt/seahorse-3.2.1 >=app-editors/gedit-3.2.1 >=app-text/evince-3.2.1 >=gnome-extra/gnome-contacts-3.2.1 >=media-gfx/eog-3.2.1 >=media-video/totem-3.2.1 >=net-im/empathy-3.2.1 >=x11-terms/gnome-terminal-3.2.1 >=gnome-extra/gnome-user-docs-3.2.1 >=gnome-extra/yelp-3.2.1 >=x11-themes/gtk-engines-2.20.2:2 >=x11-themes/gnome-icon-theme-3.2.1 >=x11-themes/gnome-icon-theme-symbolic-3.2.1 >=x11-themes/gnome-themes-standard-3.2.1 bluetooth? ( >=net-wireless/gnome-bluetooth-3.2.1 ) cdr? ( >=app-cdr/brasero-3.2 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90[bluetooth?] )
SLOT=3.0
-_md5_=9e87446970bb6b6a31e948e6b976af30
+_md5_=c20745b4c0b934b1b4d27c24815159ac
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.4.1 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.4.1
index 506f4630f456..31a87da46b64 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-core-apps-3.4.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=+bluetooth +cdr cups +networkmanager
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.4.1[cups?] >=gnome-base/gnome-session-3.4.1 >=gnome-base/gnome-menus-3.4.1:3 >=gnome-base/gnome-settings-daemon-3.4.1[cups?] >=gnome-base/gnome-control-center-3.4.1[cups?] >=app-crypt/gcr-3.4.1 >=gnome-base/nautilus-3.4.1 >=gnome-base/gnome-keyring-3.4.1 >=gnome-base/libgnome-keyring-3.4.1 >=gnome-extra/evolution-data-server-3.4.1 >=gnome-extra/gnome-power-manager-3.4 >=gnome-extra/gnome-screensaver-3.4.1 >=app-crypt/seahorse-3.4.1 >=app-editors/gedit-3.4.1 >=app-text/evince-3.4 >=gnome-extra/gnome-contacts-3.4.1 >=media-gfx/eog-3.4.1 >=media-video/totem-3.4.1 >=net-im/empathy-3.4.1 >=x11-terms/gnome-terminal-3.4.1 >=gnome-extra/gnome-user-docs-3.4.1 >=gnome-extra/yelp-3.4.1 >=x11-themes/gtk-engines-2.20.2:2 >=x11-themes/gnome-icon-theme-3.4 >=x11-themes/gnome-icon-theme-symbolic-3.4 >=x11-themes/gnome-themes-standard-3.4.1 bluetooth? ( >=net-wireless/gnome-bluetooth-3.4.1 ) cdr? ( >=app-cdr/brasero-3.4.1 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.4[bluetooth?] )
SLOT=3.0
-_md5_=edfde3e9ab4126a6bcb1c06b4236cfb9
+_md5_=d13f30cba9808d5a656982d2d239ac3a
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.2.1 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.2.1
index b8894f01c1af..a30a50a621b2 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-core-libs-3.2.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups python
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=dev-libs/glib-2.30.1:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/pango-1.29.3 >=media-libs/clutter-1.8.2:1.0 >=x11-libs/gtk+-3.2.1:3[cups?] >=dev-libs/atk-2.2 >=x11-libs/libwnck-3.2.1:3 >=gnome-base/librsvg-2.34.1[gtk] >=gnome-base/gnome-desktop-3.2.1:3 >=gnome-base/libgnomekbd-3.2 >=x11-libs/startup-notification-0.10 >=gnome-base/gvfs-1.10.1 >=gnome-base/dconf-0.10 >=media-libs/gstreamer-0.10.35:0.10 >=media-libs/gst-plugins-base-0.10.35:0.10 >=media-libs/gst-plugins-good-0.10.30:0.10 python? ( >=dev-python/pygobject-3.0.1:3 )
SLOT=3.0
-_md5_=1786d22d6ae298ebdfd4d731b3c5a6fe
+_md5_=8846a09a0f2cafb7a4987a8cc835a783
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.4.1 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.4.1
index 5d3617106a7f..8c3461fe4b28 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-core-libs-3.4.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups python
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=dev-libs/glib-2.32.1:2 >=x11-libs/gdk-pixbuf-2.26.1:2 >=x11-libs/pango-1.30 >=media-libs/clutter-1.10.2:1.0 >=x11-libs/gtk+-3.4.1:3[cups?] >=dev-libs/atk-2.4 >=x11-libs/libwnck-3.4.1:3 >=gnome-base/librsvg-2.36.1[gtk] >=gnome-base/gnome-desktop-3.4.1:3 >=gnome-base/libgnomekbd-3.4 >=x11-libs/startup-notification-0.10 >=gnome-base/gvfs-1.12.1 >=gnome-base/dconf-0.10 >=media-libs/gstreamer-0.10.35:0.10 >=media-libs/gst-plugins-base-0.10.35:0.10 >=media-libs/gst-plugins-good-0.10.30:0.10 python? ( >=dev-python/pygobject-3.2.1:3 )
SLOT=3.0
-_md5_=671776da47e0fb11854ab92bbc7cabde
+_md5_=dac1bfe2a28f355223e9fbb440f583ec
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.2.1 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.2.1
index 3c500633d93f..1c787f0f3657 100644
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.2.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=+shotwell +tracker
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.2.1 >=app-arch/file-roller-3.2.1 >=games-board/aisleriot-3.2.1 >=gnome-extra/gcalctool-6.2.0 >=gnome-extra/gconf-editor-3.0.0 >=gnome-extra/gnome-games-3.2.1 >=gnome-extra/gnome-system-monitor-3.2.1 >=gnome-extra/gnome-tweak-tool-3.2.1 >=gnome-extra/gnome-utils-3.2.1 >=gnome-extra/gucharmap-3.2.1:2.90 >=gnome-extra/sushi-0.2.1 >=mail-client/evolution-3.2.1 >=media-sound/sound-juicer-2.99 >=media-video/cheese-3.2.1 >=net-analyzer/gnome-nettool-3.0.0 >=net-misc/vinagre-3.2.1 >=net-misc/vino-3.2.1 >=www-client/epiphany-3.2.1 shotwell? ( >=media-gfx/shotwell-0.11 ) tracker? ( >=app-misc/tracker-0.12 >=gnome-extra/gnome-documents-0.2.1 )
SLOT=3.0
-_md5_=92668523df2d978528d5660e886d55e6
+_md5_=b37c66c9629b41fdca49262f8a3c9bf2
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.4.1 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.4.1
index aa4bd5661773..32d3effb80ee 100644
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.4.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=+shotwell +tracker
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.4.1 >=app-admin/gnome-system-log-3.4.1 >=app-arch/file-roller-3.4.1 >=app-dicts/gnome-dictionary-3.4 >=games-board/aisleriot-3.2.3.2 >=gnome-extra/gcalctool-6.4.1 >=gnome-extra/gconf-editor-3.0.0 >=gnome-extra/gnome-games-3.4.1 >=gnome-extra/gnome-search-tool-3.4 >=gnome-extra/gnome-system-monitor-3.4.1 >=gnome-extra/gnome-tweak-tool-3.4 >=gnome-extra/gucharmap-3.4.1:2.90 >=gnome-extra/sushi-0.4.1 >=mail-client/evolution-3.4.1 >=media-gfx/gnome-font-viewer-3.4 >=media-gfx/gnome-screenshot-3.4.1 >=media-sound/sound-juicer-3.4 >=media-video/cheese-3.4.1 >=net-analyzer/gnome-nettool-3.2 >=net-misc/vinagre-3.4.1 >=net-misc/vino-3.4.1 >=sys-apps/baobab-3.4.1 >=www-client/epiphany-3.4.1 shotwell? ( >=media-gfx/shotwell-0.12 ) tracker? ( >=app-misc/tracker-0.14.1 >=gnome-extra/gnome-documents-0.4.1 )
SLOT=3.0
-_md5_=ea71f10d6f34c6c26e6526d9539fb8f4
+_md5_=fd6a8075d8a6ffb49cc61e77bc42f420
diff --git a/metadata/md5-cache/gnome-base/gnome-fallback-3.2.1 b/metadata/md5-cache/gnome-base/gnome-fallback-3.2.1
index 2d49cd6ac2ee..8943f7b1b2c3 100644
--- a/metadata/md5-cache/gnome-base/gnome-fallback-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-fallback-3.2.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.2.1[cups?] >=x11-wm/metacity-2.34.1 >=x11-misc/notification-daemon-0.7 >=gnome-extra/polkit-gnome-0.100 >=gnome-base/gnome-panel-3.2.1
SLOT=3.0
-_md5_=337010499e8dcb452ba680bb5c9ad00d
+_md5_=4a327be1e829c251556f5791c15d222e
diff --git a/metadata/md5-cache/gnome-base/gnome-fallback-3.4.1 b/metadata/md5-cache/gnome-base/gnome-fallback-3.4.1
index da8687543127..0e5848f8090a 100644
--- a/metadata/md5-cache/gnome-base/gnome-fallback-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-fallback-3.4.1
@@ -4,7 +4,7 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=gnome-base/gnome-core-libs-3.4.1[cups?] >=x11-wm/metacity-2.34.3 >=x11-misc/notification-daemon-0.7 >=gnome-extra/polkit-gnome-0.105 >=gnome-base/gnome-panel-3.4.1
SLOT=3.0
-_md5_=55351eb88c6777d2a1b7ff7ff1c92de4
+_md5_=26cd24d6791da091a1dc33fad78e742a
diff --git a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
index fe33a2f52bf6..cf2a3291e2e7 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=+automount
KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
RDEPEND=!=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gconf-2.32.0-r1:2 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0 >=gnome-base/nautilus-2.32.1 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=gnome-base/gnome-panel-2.32.1 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=x11-terms/gnome-terminal-2.32.1 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/yelp-2.30.2
SLOT=2.0
-_md5_=d53c3ef742aeea53e83cce2ce0432ba6
+_md5_=ee2604420e1ab32b7b897ae33d9b0242
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.2.1 b/metadata/md5-cache/gnome-base/gnome-light-3.2.1
index b42b38563e91..2aded0d2695c 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.2.1
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups +fallback +gnome-shell
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=>=gnome-base/gvfs-1.10.1
RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.2.1[cups?] >=gnome-base/gnome-session-3.2.1 >=gnome-base/gnome-menus-3.2:3 >=gnome-base/gnome-settings-daemon-3.2.1[cups?] >=gnome-base/gnome-control-center-3.2.1[cups?] >=gnome-base/nautilus-3.2.1 gnome-shell? ( >=x11-wm/mutter-3.2.1 >=gnome-base/gnome-shell-3.2.1 ) fallback? ( >=gnome-base/gnome-fallback-3.2.1 ) >=x11-themes/gnome-icon-theme-3.2.1 >=x11-themes/gnome-icon-theme-symbolic-3.2.1 >=x11-themes/gnome-themes-standard-3.2.1 >=x11-terms/gnome-terminal-3.2.1
SLOT=2.0
-_md5_=376041c55cb7208ece12a53dd5d1c758
+_md5_=548240aa181533aef0876f81c899804d
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.4.1 b/metadata/md5-cache/gnome-base/gnome-light-3.4.1
index 755aa558eae2..143e1cae2a8b 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.4.1
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.4.1
@@ -4,8 +4,8 @@ EAPI=4
HOMEPAGE=http://www.gnome.org/
IUSE=cups +fallback +gnome-shell
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
PDEPEND=>=gnome-base/gvfs-1.12.1
RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.4.1[cups?] >=gnome-base/gnome-session-3.4.1 >=gnome-base/gnome-menus-3.4.1:3 >=gnome-base/gnome-settings-daemon-3.4.1[cups?] >=gnome-base/gnome-control-center-3.4.1[cups?] >=gnome-base/nautilus-3.4.1 gnome-shell? ( >=x11-wm/mutter-3.4.1 >=gnome-base/gnome-shell-3.4.1 ) fallback? ( >=gnome-base/gnome-fallback-3.4.1 ) >=x11-themes/gnome-icon-theme-3.4 >=x11-themes/gnome-icon-theme-symbolic-3.4 >=x11-themes/gnome-themes-standard-3.4.1 >=x11-terms/gnome-terminal-3.4.1
SLOT=2.0
-_md5_=fd1a043d17cbc67a71b9fef3f2f6b7ea
+_md5_=ebd82c93488ee2ff9adf336649241236
diff --git a/metadata/md5-cache/gnome-extra/at-spi-2.0.0 b/metadata/md5-cache/gnome-extra/at-spi-2.0.0
index 820f243edf1c..32f5894ca2f7 100644
--- a/metadata/md5-cache/gnome-extra/at-spi-2.0.0
+++ b/metadata/md5-cache/gnome-extra/at-spi-2.0.0
@@ -3,7 +3,7 @@ DESCRIPTION=The Gnome Accessibility Toolkit
EAPI=3
HOMEPAGE=http://projects.gnome.org/accessibility/
KEYWORDS=~amd64 ~x86
-LICENSE=as-is
+LICENSE=metapackage
RDEPEND=>=app-accessibility/at-spi2-atk-2.0.0:2 >=app-accessibility/at-spi2-core-2.0.0:2 >=dev-python/pyatspi-2.0.0 !=app-accessibility/at-spi2-atk-2.2.0:2 >=app-accessibility/at-spi2-core-2.2.0:2 >=dev-python/pyatspi-2.2.0 !=app-accessibility/at-spi2-atk-2.4.0:2 >=app-accessibility/at-spi2-core-2.4.0:2 >=dev-python/pyatspi-2.4.0 !=mail-filter/spamassassin-3.1.0
DESCRIPTION=A milter for SpamAssassin
EAPI=4
@@ -9,4 +9,4 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) >=mail-filter/spamassassi
SLOT=0
SRC_URI=http://savannah.nongnu.org/download/spamass-milt/spamass-milter-0.3.2.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cfe671a8659f0887f6037ee51c2696e2
+_md5_=50acbe9cf25f434e148c622798dd7d1c
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.3 b/metadata/md5-cache/media-libs/opencv-2.4.3
new file mode 100644
index 000000000000..21ef576df55f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-2.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/bzip2 dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/glu ) png? ( media-libs/libpng ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=4
+HOMEPAGE=http://opencv.willowgarage.com
+IUSE=cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/glu ) png? ( media-libs/libpng ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-test:4 opengl? ( x11-libs/qt-opengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.4.3.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils d9d351169c1d554e8f47f1a19f17becd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1e21f556c4e8731e93dc534a6de576a4
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.6 b/metadata/md5-cache/media-sound/lilypond-2.17.6
new file mode 100644
index 000000000000..36b369d8fb8e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=GNU Music Typesetter
+EAPI=5
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs profile vim-syntax
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) =dev-lang/python-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.6.tar.gz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f elisp-common cdb887d0e278ea6e82ea2a5d4792c52a eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d5882c3e36d2be31b4cdfaf02ea09c1c
diff --git a/metadata/md5-cache/media-sound/qmmp-0.6.4 b/metadata/md5-cache/media-sound/qmmp-0.6.4
new file mode 100644
index 000000000000..0a900a92de52
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-0.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
+EAPI=2
+HOMEPAGE=http://qmmp.ylsoftware.com/index_en.php
+IUSE=aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/qt-qt3support:4 media-libs/taglib alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio ) dbus? ( sys-apps/dbus ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm x11-libs/qt-opengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) udev? ( sys-fs/udisks:0 )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.6.4.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils d9d351169c1d554e8f47f1a19f17becd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4e3cb61879b4343e5e2a1510987c63f7
diff --git a/metadata/md5-cache/net-misc/openssh-5.5_p1-r2 b/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
index fd0d7d9c6347..48e26c570281 100644
--- a/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-5.5_p1-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.5p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.5p1-hpn13v9.diff.gz mirror://gentoo/openssh-5.5p1-hpn13v9.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.4p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.5p1+x509-6.2.3.diff.gz ) hpn? ( X509? ( mirror://gentoo/openssh-5.4p1-hpn13v7-x509variant.diff.gz ) )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be56064daee2b4d1806dda8a4d385d77
+_md5_=b5d4f98624d3cf4efca3c6faa594d7ce
diff --git a/metadata/md5-cache/net-misc/openssh-5.6_p1-r2 b/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
index e9f826bbcfa2..71b0f0d5278a 100644
--- a/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-5.6_p1-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.6p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.6p1-hpn13v10.diff.gz mirror://gentoo/openssh-5.6p1-hpn13v10.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.6p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.6p1+x509-6.2.3.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9dc5afa8340421bc06033e52435cde2d
+_md5_=3553da89721be6c3cb3a49cfdfd91515
diff --git a/metadata/md5-cache/net-misc/openssh-5.7_p1-r1 b/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
index 024992068cb9..c7e22d0de6ca 100644
--- a/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.7_p1-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.7p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.7p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.7p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.7p1+x509-6.2.4.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be8dfb60fdfd8c50ed3405dafc5339af
+_md5_=2854a3e785716ac10088abe9cb724a4a
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p1-r1 b/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
index c1df14663ef4..97ffeba239dd 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p1-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.8p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5b4ac1fa0b0c5231e12eb81269694dcc
+_md5_=054f648a5a963b0cada87d62dfa79d42
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p2 b/metadata/md5-cache/net-misc/openssh-5.8_p2
index 3ab35232f9d0..483ab45cb5e0 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p2
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p2
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e66b2295e45901ce28c598fae3708493
+_md5_=4e57ccdada1cda4a703bf3708bee9dc5
diff --git a/metadata/md5-cache/net-misc/openssh-5.8_p2-r1 b/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
index 7a972a396fb6..ef7c2ecdf197 100644
--- a/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
+++ b/metadata/md5-cache/net-misc/openssh-5.8_p2-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b52e7d6bdb8145a6c86a4e3e9ef83819
+_md5_=4a30bb1059b618bfcea1cec154e0b23a
diff --git a/metadata/md5-cache/net-misc/openssh-5.9_p1-r3 b/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
index c87b3978a2e9..deb8498d61ff 100644
--- a/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
+++ b/metadata/md5-cache/net-misc/openssh-5.9_p1-r3
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ced70236668f799811e11e079443784f
+_md5_=0dc1071898f83a93dae567b8ac2cd9f7
diff --git a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4 b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
index 884f39897e55..e6c85e4a2f6a 100644
--- a/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-5.9_p1-r4
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f029355764cc2f9aba504000e5038369
+_md5_=0a727e7ba1b6a1a1b4d4b70cd8f96d38
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1 b/metadata/md5-cache/net-misc/openssh-6.0_p1
index fa640c70796d..81a9348ea0a1 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v12.diff.gz mirror://gentoo/openssh-6.0p1-hpn13v12.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f92596ee380af27fdaef757de689ae9
+_md5_=5988a03aa938c883fad594e6a2f98125
diff --git a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1 b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
index 21a045c4580e..a368f63f47e3 100644
--- a/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-6.0_p1-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.0p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.0p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.0p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.0p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.1/openssh-6.0p1+x509-7.1.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=40c1f3c4ac64ac2d9c2bbbced9cdb704
+_md5_=2da4d62ec17b09393d29221f4fd52aef
diff --git a/metadata/md5-cache/net-misc/openssh-6.1_p1 b/metadata/md5-cache/net-misc/openssh-6.1_p1
index a091814096ce..94f3ef70c1f9 100644
--- a/metadata/md5-cache/net-misc/openssh-6.1_p1
+++ b/metadata/md5-cache/net-misc/openssh-6.1_p1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Port of OpenBSD's free SSH release
EAPI=2
HOMEPAGE=http://www.openssh.org/
-IUSE=+hpn kerberos ldap libedit pam selinux skey static tcpd X X509
+IUSE=bindist +hpn kerberos ldap libedit pam selinux skey static tcpd X X509
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD
-RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
+RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
SLOT=0
SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.1p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-6.1p1-hpn13v11.diff.bz2 mirror://gentoo/openssh-6.1p1-hpn13v11.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.1p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.2.1/openssh-6.1p1+x509-7.2.1.diff.gz )
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd fc2fa698095b76894d4516729da4337b toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=21ee8e1b2f726b80471725730842abdd
+_md5_=650aba72119327caa83d486c62a8c357
diff --git a/metadata/md5-cache/net-news/liferea-1.8.8 b/metadata/md5-cache/net-news/liferea-1.8.8
index 7aeb329cbaa6..40f8b4377837 100644
--- a/metadata/md5-cache/net-news/liferea-1.8.8
+++ b/metadata/md5-cache/net-news/liferea-1.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
EAPI=4
HOMEPAGE=http://liferea.sourceforge.net/
IUSE=ayatana libnotify
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.18.0:2 >=dev-libs/glib-2.24.0:2 >=x11-libs/pango-1.4.0 >=gnome-base/gconf-1.1.9:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.7.0:3 >=net-libs/libsoup-2.28.2:2.4 dev-libs/libunique:1 >=net-libs/webkit-gtk-1.2.2:2 dev-libs/json-glib ayatana? ( dev-libs/libindicate ) libnotify? ( >=x11-libs/libnotify-0.3.2 )
SLOT=0
SRC_URI=mirror://sourceforge/liferea/liferea-1.8.8.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 15aa463585bf2d9974b9235ea20ccb94 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=efaf39b042f13fd7962f9bb7bcc4fbbf
+_md5_=7075ffd719bd1590821a4a6433452f33
diff --git a/metadata/md5-cache/sci-calculators/units-2.00 b/metadata/md5-cache/sci-calculators/units-2.00
index c4d40b277ac4..3fc5199f4607 100644
--- a/metadata/md5-cache/sci-calculators/units-2.00
+++ b/metadata/md5-cache/sci-calculators/units-2.00
@@ -1,12 +1,12 @@
DEFINED_PHASES=install prepare
-DEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
+DEPEND=>=sys-libs/readline-4.1-r2
DESCRIPTION=Unit conversion program
EAPI=4
HOMEPAGE=http://www.gnu.org/software/units/units.html
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
-RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
+RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2
SLOT=0
SRC_URI=mirror://gnu/units/units-2.00.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=32b1b85afc493503d0dc87c799633647
+_md5_=ede2000c47b0a69d68cb99a26e605cbc
diff --git a/metadata/md5-cache/sci-calculators/units-2.01 b/metadata/md5-cache/sci-calculators/units-2.01
index b85c462e0839..951cb7573c8c 100644
--- a/metadata/md5-cache/sci-calculators/units-2.01
+++ b/metadata/md5-cache/sci-calculators/units-2.01
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
+DEFINED_PHASES=prepare
+DEPEND=>=sys-libs/readline-4.1-r2 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Unit conversion program
EAPI=4
HOMEPAGE=http://www.gnu.org/software/units/units.html
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
-RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
+RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2
SLOT=0
SRC_URI=mirror://gnu/units/units-2.01.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7b0b74f0b90d6028007ebcce17df4366
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cbac18edae4d626a61911b0232dd0b13
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10.4 b/metadata/md5-cache/sys-apps/openrc-0.10.4
deleted file mode 100644
index 9845ac8c6f4a..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=4
+HOMEPAGE=http://gkernel.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/gkernel/rng-tools-4.tar.gz
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=50544cf44dfbf0c99ccdbea88ed85248
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.6.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.6.6
new file mode 100644
index 000000000000..fe30f75cd13b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.6.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.6 kernel tree
+EAPI=3
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.6.6
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-8.base.tar.bz2 mirror://gentoo/genpatches-3.6-8.extras.tar.bz2
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=8145c6d6ab7a1178e96b5a4778958b4f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.51 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.51
new file mode 100644
index 000000000000..65099eb32562
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.51
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=2
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.0.51
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.51.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=0f347d4263c4893c8bb9c5b7a9f5ed46
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.18
new file mode 100644
index 000000000000..0a66c2f0c33b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=2
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.18
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.18.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=ed11682bc267d086e3e8580209dea21d
diff --git a/metadata/md5-cache/www-client/torbrowser-13.0-r1 b/metadata/md5-cache/www-client/torbrowser-13.0-r1
deleted file mode 100644
index af93188096dc..000000000000
--- a/metadata/md5-cache/www-client/torbrowser-13.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 virtual/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Torbrowser without vidalia or tor
-EAPI=3
-HOMEPAGE=https://www.torproject.org/projects/torbrowser.html.en
-IUSE=bindist +crashreporter +ipc pgo selinux system-sqlite +torprofile +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) BSD CCPL-Attribution-3.0
-PDEPEND=torprofile? ( www-misc/torbrowser-profile )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.5 >=dev-libs/nspr-4.9.1 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.9[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-13.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//13.0/source/firefox-13.0.source.tar.bz2 http://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:/build-scripts/branding/default256.png -> torbrowser256.png
-_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f check-reqs 0efdf29c9002a1995388968bf54e9d3d eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac mozconfig-3 37a2d0fa93bf68d83459c380e047903b mozcoreconf-2 43f9c2a313b66eae6591721fd343a0a5 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3b51c75fdc596f78e6af8f2d76156163
diff --git a/metadata/md5-cache/www-misc/torbrowser-profile-2.3.12_alpha2 b/metadata/md5-cache/www-misc/torbrowser-profile-2.3.12_alpha2
deleted file mode 100644
index d3011b2e6cdc..000000000000
--- a/metadata/md5-cache/www-misc/torbrowser-profile-2.3.12_alpha2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Profile folder from the torbrowser bundle
-EAPI=4
-HOMEPAGE=https://www.torproject.org/dist/torbrowser/linux/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 MIT
-RDEPEND=www-client/torbrowser
-SLOT=0
-SRC_URI=amd64? ( https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.3.12-alpha-2-dev-en-US.tar.gz ) x86? ( https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.3.12-alpha-2-dev-en-US.tar.gz )
-_md5_=3d83923b7f38d2a949ad58a156ff8368
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.4.4 b/metadata/md5-cache/x11-libs/gtk+-3.4.4
index ff0cf5e7a901..f7077a4c5b2e 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.4.4
+++ b/metadata/md5-cache/x11-libs/gtk+-3.4.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) virtual/pkgconfig X? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto xinerama? ( x11-proto/xineramaproto ) ) >=dev-util/gtk-doc-am-1.11 test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) virtual/pkgconfig X? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto xinerama? ( x11-proto/xineramaproto ) ) >=dev-libs/gobject-introspection-common-1.32 >=dev-util/gtk-doc-am-1.11 test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Gimp ToolKit +
EAPI=4
HOMEPAGE=http://www.gtk.org/
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/l
REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
SLOT=3
SRC_URI=mirror://gnome/sources/gtk+/3.4/gtk+-3.4.4.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6db170de000fb27a923b54dec4e4d327
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7237958bf0d53cc2141d4da6d1ac5ec9
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.40 b/metadata/md5-cache/x11-libs/libdrm-2.4.40
new file mode 100644
index 000000000000..7a833c5a0d3a
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X.Org libdrm library
+EAPI=4
+HOMEPAGE=http://dri.freedesktop.org/
+IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.40.tar.bz2
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f autotools-utils b65ac5ba56a20f3d7a01c67b7b3c9b01 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 ff8fcdb08e36af162e7cfd65dd10be44
+_md5_=ca64b3de96d085a0bc2d976a24c1f1c2
diff --git a/metadata/md5-cache/x11-wm/spectrwm-1.2.0 b/metadata/md5-cache/x11-wm/spectrwm-2.1.0
similarity index 73%
rename from metadata/md5-cache/x11-wm/spectrwm-1.2.0
rename to metadata/md5-cache/x11-wm/spectrwm-2.1.0
index 8015cc912935..cebdb8b2544b 100644
--- a/metadata/md5-cache/x11-wm/spectrwm-1.2.0
+++ b/metadata/md5-cache/x11-wm/spectrwm-2.1.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXtst x11-libs/xcb-util !x11-wm/scrotwm
+DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXtst x11-libs/xcb-util !x11-wm/scrotwm
DESCRIPTION=Small dynamic tiling window manager for X11
EAPI=4
HOMEPAGE=https://opensource.conformal.com/wiki/spectrwm
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=ISC
RDEPEND=x11-misc/dmenu
SLOT=0
-SRC_URI=http://opensource.conformal.com/snapshots/spectrwm/spectrwm-1.2.0.tgz
+SRC_URI=http://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.1.0.tgz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f3ff2000f20fa216547e76e016cba4c5
+_md5_=499605e0a7d979905e4eebc572a7b717
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1bfee9d975ca..c90e8e6428a3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Nov 2012 17:07:03 +0000
+Tue, 06 Nov 2012 06:07:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 90b4860b587b..540aa6b87d4a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Nov 5 17:07:01 UTC 2012
+Tue Nov 6 06:07:01 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index beb8dfbddc34..962aeab8a1d1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Nov 2012 17:30:01 +0000
+Tue, 06 Nov 2012 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5f5a23255895..c8a827064475 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1352135101 Mon Nov 5 17:05:01 2012 UTC
+1352181901 Tue Nov 6 06:05:01 2012 UTC
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 9bc4723df20e..50003365a5c8 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -27,6 +27,6 @@ DIST openssh-lpk-5.4p1-0.3.13.patch.gz 18105 SHA256 4e5dbe769e487c914ecc5b104866
DIST openssh-lpk-5.6p1-0.3.13.patch.gz 18376 SHA256 42a76b67c390c3ed28efd6e1734ca5a7edfefc635c35086dbd610999130678e9 SHA512 b492fdae831fd93d34075d8656d85fb032993686e3341cb880c47c48e2b9b72c82b92f4e78d5ae649c536b4806a916236de3b158f7f43a1de816bd05de8bbb44 WHIRLPOOL cc02e5e0831bafab354fe7e3e63f51aefc2e1f81aefd5e5f0ba90dbd45e7fad979e04c6b3dce63899e0cdabcd65839c2e2f214b39a17c425a113dccd8af308a1
DIST openssh-lpk-5.7p1-0.3.13.patch.gz 18392 SHA256 739fa32e267f2c30362bb953d597bcbb55b58d76e13f644004fa63ded81522f7 SHA512 8ff9e0561275bcfa6bdda203bde9be7b7512d3ecc8040157da3709878d4a64496ce60a6e2cd24179713a9cb84a27251229f7beddc81be5734c9444894298ab17 WHIRLPOOL bb4977e0d629e781e1b2838590579329865d503e7f36d2dadeab99dbf5232771c375b91f14115bcdc25160988a983b30b7a378edf16121493ace7ec167cd3f6f
DIST openssh-lpk-5.8p2-0.3.14.patch.gz 18656 SHA256 adac5e13a4918e14e4d349f4360d9c740ae6f69de4e64520e8d51e8d39f969ad
-DIST openssh-lpk-5.9p1-0.3.14.patch.gz 18335 SHA256 1a922d57a2e7020bf597135437a57080d7d046c9f41a7a53559945ddddbe0892
+DIST openssh-lpk-5.9p1-0.3.14.patch.gz 18335 SHA256 1a922d57a2e7020bf597135437a57080d7d046c9f41a7a53559945ddddbe0892 SHA512 eb4641d30e221eaa409d22ab423e38c1a31dd9dfeacbf978c94827194cb838cc0f832bf96aa4c494a71a5d5d1b90fc6789e8469e35d82ffcaf54305f07ccdb9b WHIRLPOOL 6748426d6d0cda07729744d8993d96a762134a61acf757afc1618ada5cbd9752d9211a89be831e5a4f1744f70cc4fc643b5f745d1f785b53a4e1dbf9d7c92680
DIST openssh-lpk-6.0p1-0.3.14.patch.gz 18401 SHA256 d0f3d55fd92ecc45aa6120d6ea919c903e4828ce0c2b07612c742a2aa7648beb SHA512 ebf680b90bc289c0d69c22fd6fd666032cdcf4c3850ecdf03e264200d60c50a12f4a5254907c6ab850727216e7837176be5564ae22b68d9b80a67c62f372a9dd WHIRLPOOL 4f8b32c77fc2a9205d283109ccd787a3f37757c18060da39c63147ff09f6b922f4a57ca1ba8d0cdc692f3f1eaba3e5e88eb4287f728ddaaf544d2d425c0cca91
DIST openssh-lpk-6.1p1-0.3.14.patch.gz 18458 SHA256 2d0e40116e021913668519a42743f89b8fb77f8d5beed863d620cc79999b0b79 SHA512 9cfd83e650cedbc3950b8cf80d0b36fbb7dff8fbe7d017378f9a2ae18189fa6e459e323dae6cd1fa1d82ff948f628563892d0a0f30113b3a8ba5269fe051e784 WHIRLPOOL c1ee5570f0bfb3191c602d575e0e05cabe7d42183bd78c07cac19a2743a59f110728e309fcee6f0b6abc7b141ae8c701d92d010d2b7737739b4cac92406552fa
diff --git a/net-misc/openssh/openssh-5.5_p1-r2.ebuild b/net-misc/openssh/openssh-5.5_p1-r2.ebuild
index 1ed9e2301dea..261027f3fe9c 100644
--- a/net-misc/openssh/openssh-5.5_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.5_p1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.5_p1-r2.ebuild,v 1.15 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.5_p1-r2.ebuild,v 1.17 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -27,7 +27,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -35,7 +35,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.6_p1-r2.ebuild b/net-misc/openssh/openssh-5.6_p1-r2.ebuild
index 30f7b7d2529b..6ad23e4eb293 100644
--- a/net-misc/openssh/openssh-5.6_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.6_p1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.6_p1-r2.ebuild,v 1.17 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.6_p1-r2.ebuild,v 1.19 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.7_p1-r1.ebuild b/net-misc/openssh/openssh-5.7_p1-r1.ebuild
index 3b90bc09d3d6..a3f776694194 100644
--- a/net-misc/openssh/openssh-5.7_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.7_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.7_p1-r1.ebuild,v 1.10 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.7_p1-r1.ebuild,v 1.12 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.8_p1-r1.ebuild b/net-misc/openssh/openssh-5.8_p1-r1.ebuild
index be96fc093baa..c3ee219edfb7 100644
--- a/net-misc/openssh/openssh-5.8_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.8_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1-r1.ebuild,v 1.12 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p1-r1.ebuild,v 1.14 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.8_p2-r1.ebuild b/net-misc/openssh/openssh-5.8_p2-r1.ebuild
index ef4cd2d96048..a3d6e0c4aa60 100644
--- a/net-misc/openssh/openssh-5.8_p2-r1.ebuild
+++ b/net-misc/openssh/openssh-5.8_p2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2-r1.ebuild,v 1.7 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2-r1.ebuild,v 1.9 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.8_p2.ebuild b/net-misc/openssh/openssh-5.8_p2.ebuild
index 36cb4423f2c3..0a96d91606ee 100644
--- a/net-misc/openssh/openssh-5.8_p2.ebuild
+++ b/net-misc/openssh/openssh-5.8_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2.ebuild,v 1.8 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2.ebuild,v 1.10 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.9_p1-r3.ebuild b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
index d11251599afe..53e18a8133d3 100644
--- a/net-misc/openssh/openssh-5.9_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.11 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.13 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-5.9_p1-r4.ebuild b/net-misc/openssh/openssh-5.9_p1-r4.ebuild
index aff066b6f82e..9e80263e1ff9 100644
--- a/net-misc/openssh/openssh-5.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r4.ebuild,v 1.11 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r4.ebuild,v 1.13 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-6.0_p1-r1.ebuild b/net-misc/openssh/openssh-6.0_p1-r1.ebuild
index a7b5d28ecdc8..c0357417f420 100644
--- a/net-misc/openssh/openssh-6.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1-r1.ebuild,v 1.2 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1-r1.ebuild,v 1.4 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-6.0_p1.ebuild b/net-misc/openssh/openssh-6.0_p1.ebuild
index 8cb4fed6479e..1fef848b587f 100644
--- a/net-misc/openssh/openssh-6.0_p1.ebuild
+++ b/net-misc/openssh/openssh-6.0_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.8 2012/09/25 12:29:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.10 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-misc/openssh/openssh-6.1_p1.ebuild b/net-misc/openssh/openssh-6.1_p1.ebuild
index 4e5ac9b05cb9..ad641005fa8d 100644
--- a/net-misc/openssh/openssh-6.1_p1.ebuild
+++ b/net-misc/openssh/openssh-6.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.3 2012/10/12 19:09:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.5 2012/11/06 02:44:11 floppym Exp $
EAPI="2"
inherit eutils user flag-o-matic multilib autotools pam systemd
@@ -24,7 +24,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
+IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
RDEPEND="pam? ( virtual/pam )
kerberos? ( virtual/krb5 )
@@ -32,7 +32,7 @@ RDEPEND="pam? ( virtual/pam )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? ( net-nds/openldap )
libedit? ( dev-libs/libedit )
- >=dev-libs/openssl-0.9.6d
+ >=dev-libs/openssl-0.9.6d:0[bindist=]
>=sys-libs/zlib-1.2.3
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
X? ( x11-apps/xauth )
diff --git a/net-news/liferea/liferea-1.8.8.ebuild b/net-news/liferea/liferea-1.8.8.ebuild
index d73be2b72cc7..575f74fa2153 100644
--- a/net-news/liferea/liferea-1.8.8.ebuild
+++ b/net-news/liferea/liferea-1.8.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.8.8.ebuild,v 1.1 2012/09/15 15:17:22 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.8.8.ebuild,v 1.2 2012/11/05 19:39:51 blueness Exp $
EAPI=4
@@ -15,7 +15,7 @@ HOMEPAGE="http://liferea.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE="ayatana libnotify"
RDEPEND=">=x11-libs/gtk+-2.18.0:2
diff --git a/profiles/package.mask b/profiles/package.mask
index 832b11e34f53..1fbedd81e5a1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14193 2012/11/05 16:26:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14195 2012/11/05 23:31:09 hasufell Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Diego Elio Petten嘆 (05 Nov 2012)
+# Masked for testing
+>=dev-libs/boost-1.52.0
+
# Joerg Bornkessel ( 2012/11/04 )
# masked for testing, bug #422605
=media-plugins/vdr-softdevice-0.5.0.20110417
@@ -391,12 +395,6 @@ dev-libs/mpatrol
# as replacements. Removal in a month.
app-arch/macutil
-# Julian Ospald (12 Sep 2012)
-# outdated security package
-# removal at 05 Nov 2012
-www-client/torbrowser
-www-misc/torbrowser-profile
-
# Rick Farina (10 Sep 2012)
# Unclear licensing issues, upstream is distributing a file
# under the MS-RSL license which forbids redistribution
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 79b50cb0ed57..e1bb708403d0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -229,6 +229,7 @@ app-arch/rpm5:pkcs11 - Build token data management utilities based on OpenCrypto
app-arch/rpm5:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid)
app-arch/rpm5:webdav-neon - Include support for net-libs/neon
app-arch/rpm5:xar - Build support for xar archives using app-arch/xar
+app-arch/tar:minimal - just install `tar`
app-arch/unzip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
app-arch/zip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
app-backup/amanda:devpay - Support for using Amazon DevPay with S3
@@ -2734,6 +2735,7 @@ media-libs/openal:alstream - Build and install the FFmpeg based alstream example
media-libs/opencv:cuda - Enable NVIDIA Cuda computations support
media-libs/opencv:eigen - Enable usage of dev-cpp/eigen for computations
media-libs/opencv:ipp - Enable Intel Integrated Primitive support
+media-libs/opencv:opencl - Add support for OpenCL
media-libs/opencv:sse3 - Enable optimization for SSE3 capable chips
media-libs/opencv:ssse3 - faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)
media-libs/opencv:tbb - Add support for the Intel threadingbuildingblocks library
@@ -5726,14 +5728,6 @@ www-client/seamonkey:methodjit - Enable JIT for JavaScript using MethodJIT for f
www-client/seamonkey:roaming - Build roaming extension support (default on)
www-client/seamonkey:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
www-client/seamonkey:webm - Use system media-libs/libvpx for HTML5 WebM video support.
-www-client/torbrowser:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream.
-www-client/torbrowser:crashreporter - Enable crashreporter for mozilla upstream, debugging symbols are not required for reporting crashes.
-www-client/torbrowser:custom-optimization - Fine-tune custom compiler optimizations, setting this is not recommended.
-www-client/torbrowser:ipc - Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes
-www-client/torbrowser:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
-www-client/torbrowser:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
-www-client/torbrowser:torprofile - Install pre-configured profile folder by upstream into "/usr/share/torbrowser/profile" (you still have to copy it in place)
-www-client/torbrowser:webm - Use system media-libs/libvpx for HTML5 WebM video support.
www-client/uget:aria2 - Enable support for net-misc/aria2 through xmlrpc. You'll find the plugin in the app's settings.
www-client/uget:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
www-client/uget:hide-temp-files - Make temporary files that are used while downloading hidden.
diff --git a/sci-calculators/units/files/units-2.01-install.patch b/sci-calculators/units/files/units-2.01-install.patch
new file mode 100644
index 000000000000..c48cdbefbabc
--- /dev/null
+++ b/sci-calculators/units/files/units-2.01-install.patch
@@ -0,0 +1,58 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,7 @@
+
+ AC_C_CONST
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+
+ dnl Checks for libraries.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,6 +31,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++MKDIR_P = @MKDIR_P@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
+@@ -84,24 +85,24 @@
+ sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
+
+ install-support: definitions.units currency.units units_cur_inst
+- $(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir)
++ $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir)
+ $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
+ $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
+ $(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT@locale.map
+ $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+
+ install: units@EXEEXT@ install-doc install-support
+- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++ $(MKDIR_P) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+
+ install-strip: units@EXEEXT@ install-doc install-support
+- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++ $(MKDIR_P) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) -s units@EXEEXT@ $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'`
+
+ install-doc: install-man install-info
+
+ install-man: units.1
+- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++ $(MKDIR_P) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) units.1 $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1
+
+ units.man: units.texinfo texi2man
+@@ -114,7 +115,7 @@
+
+ $(DESTDIR)$(infodir)/units.info: units.info
+ $(POST_INSTALL)
+- $(srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
++ $(MKDIR_P) $(DESTDIR)$(infodir)
+ # There may be a newer info file in . than in srcdir.
+ -if test -f units.info; then d=.; \
+ else d=$(srcdir); fi; \
diff --git a/sci-calculators/units/units-2.00.ebuild b/sci-calculators/units/units-2.00.ebuild
index 3c4ed173af48..ca76842b97d9 100644
--- a/sci-calculators/units/units-2.00.ebuild
+++ b/sci-calculators/units/units-2.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.00.ebuild,v 1.3 2012/08/04 22:20:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.00.ebuild,v 1.4 2012/11/05 19:33:03 jer Exp $
EAPI=4
inherit eutils
@@ -16,7 +16,6 @@ IUSE=""
DEPEND="
>=sys-libs/readline-4.1-r2
- >=sys-libs/ncurses-5.2-r3
"
RDEPEND="
|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 )
diff --git a/sci-calculators/units/units-2.01.ebuild b/sci-calculators/units/units-2.01.ebuild
index 5227b8019028..6a8da3a4b601 100644
--- a/sci-calculators/units/units-2.01.ebuild
+++ b/sci-calculators/units/units-2.01.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.01.ebuild,v 1.1 2012/10/24 16:13:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.01.ebuild,v 1.3 2012/11/05 20:10:01 jer Exp $
EAPI=4
-inherit eutils
+inherit autotools eutils
DESCRIPTION="Unit conversion program"
HOMEPAGE="http://www.gnu.org/software/units/units.html"
@@ -16,19 +16,19 @@ IUSE=""
DEPEND="
>=sys-libs/readline-4.1-r2
- >=sys-libs/ncurses-5.2-r3
"
RDEPEND="
|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 )
${DEPEND}
"
+DOCS=( ChangeLog NEWS README )
+
src_prepare() {
+ # Fix parallel make install
+ epatch "${FILESDIR}"/${P}-install.patch
+ eautoreconf
+
# Fix shebang for python2
sed -i units_cur -e '1s|$|2|' || die
}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- dodoc ChangeLog NEWS README
-}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7e0664626a79..470fa9baa493 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,4 +1,3 @@
-DIST openrc-0.10.4.tar.bz2 171717 SHA256 002341b5fbdf2077fb246a6fa155861d7b21cef9f51cb298171ba9d164e2ba03 SHA512 480453698c49c2fcda92c6d9afe6f7eba38957831b3bea63de124fb85de3c7830dd2b881d1aa517c560e1b73f6b4c7b3b0fb2ff99a5b76e555b52edd3b3ceacc WHIRLPOOL fcec0b01cad4fb7b8fce9729da09618457cec57ac61b92b53ea70c50a00b21e2c88bb0a34f16f7065f6e349feee1014a84982b09c7bc2a6954ae270f8ed31f27
DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c SHA512 f855d5f1b115cc4387585b9533fba78d22b7c54379a26e3d26995c1ff5b3bbe11bb6e6adc715d35710fcff77449d23bcdbbd4fbb5ea74e66a2ba224dfe2746e3 WHIRLPOOL f39a88e1f44f741f8eb31db07e5bb199253912d5c3cc7d9006467d52e07d5b814c1e3d2d652e1b503a5a81b953be094d2c95a50397812301f76abef6e44c608f
-DIST openrc-0.11.2.tar.bz2 174272 SHA256 227892c4d64b5e231d3c11696954ece114051846d0524bb1585a2a45f51e822f SHA512 a91aa32d54b77cefba7ec0c8a90f78d7f833d8d59f5efd5955b879e9571b3722e7bd912d895cf69eb431f4bcca222b16c2da80bceed059702ddd3018b9965271 WHIRLPOOL ce15d29b0bd332a6aab9c7e2aed7cc8dcbbec7833f321bb2ab90205025a41d7e1bb38a7682c7222b08d8bb2eb39f05b79668af19e4bcf6dfbc980af6b491a17d
+DIST openrc-0.11.4.tar.bz2 174529 SHA256 d5ed44d6169d32032e71e3081c30cc2d7b2224fc0c2068d01be9963285d9d9b8 SHA512 eb221b85315068db9288154d377c40adf3de6580f4447a63f189c70c099002d63be07370ebc12f3a1c782b7987665fd17fe26fb4d295ec520495c1fd56477875 WHIRLPOOL 3b295b235caa13afeb5a6c23621659d3df5909daad2f55143ea8882c03d2ec7cf9f4d2068ef2180d7a3dd7b1e1abe4b94528329f1d97a90c8b4c343dd982ead7
DIST openrc-0.9.8.4.tar.bz2 166843 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533 SHA512 27227fb0fcf0c830ddc39e6c91e5adb5d1e56cb2a50ca0148bb22c5ea587c7e492a50e066d1f34c7cd4f7869a12edcd71f25602468b838aed8fbc1ddafc9ac6e WHIRLPOOL db183bf0d5a041a95f0cc5b636f16b90b7a57c9e696b7ed67f4e31dde2731ffb2383eaffa8e6ad9955785a6632e8e44089cb900fc6c1a848149b3f37fddc30fa
diff --git a/sys-apps/openrc/openrc-0.10.4.ebuild b/sys-apps/openrc/openrc-0.10.4.ebuild
deleted file mode 100644
index dc0de9203768..000000000000
--- a/sys-apps/openrc/openrc-0.10.4.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.10.4.ebuild,v 1.1 2012/07/02 20:56:33 williamh Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
-[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
-inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
-if [[ ${PV} != "9999" ]] ; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
- elibc_glibc? ( >=sys-libs/glibc-2.5 )
- ncurses? ( sys-libs/ncurses )
- pam? ( sys-auth/pambase )
- >=sys-apps/baselayout-2.1-r1
- kernel_linux? (
- sys-process/psmisc
- )
- !