Sync with portage [Wed Feb 8 10:13:09 MSK 2012].

2012-02-08 10:13:10 +04:00 · 2012-02-08 10:13:10 +04:00 · d340a884f2
commit d340a884f2
parent 9da2c724f3
28769 changed files with 421998 additions and 275430 deletions
--- a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.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-accessibility/freetts/freetts-1.2.1-r2.ebuild,v 1.1 2011/03/23 17:15:06 cbrannon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.1-r2.ebuild,v 1.2 2012/02/02 17:00:54 ago Exp $

 inherit eutils java-pkg-2 java-ant-2

@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.4

 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc jsapi mbrola"

 src_unpack() {
--- a/app-admin/ccze/ccze-0.2.1-r3.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@ -1,6 +1,8 @@
-# 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/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.3 2010/10/31 22:23:39 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.6 2012/02/04 20:54:59 ranger Exp $
+
+EAPI=4

 inherit fixheadtails autotools eutils toolchain-funcs

@ -12,38 +14,31 @@ RESTRICT="test"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""

-DEPEND="dev-libs/libpcre"
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses"

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND="${DEPEND}"

-	epatch "${FILESDIR}"/ccze-fbsd.patch || die "epatch ccze-fbsd.patch failed"
-	epatch "${FILESDIR}"/ccze-segfault.patch || die "epatch ccze-segfault.patch"
-	epatch "${FILESDIR}"/ccze-ldflags.patch || die "epatch ccze-ldflags.patch"
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/ccze-fbsd.patch
+	epatch "${FILESDIR}"/ccze-segfault.patch
+	epatch "${FILESDIR}"/ccze-ldflags.patch

 	# GCC 4.x fixes
 	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
-	    -i src/Makefile.in
+	    -i src/Makefile.in || die
 	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
-	    -i configure.ac
+	    -i configure.ac || die

 	eautoreconf

 	ht_fix_file Rules.mk.in
-}

-src_compile() {
-	# Bug #243314
 	tc-export CC
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ
 }
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@ -1,2 +1,3 @@
 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c
 DIST collectd-5.0.1.tar.bz2 1331938 RMD160 26911d3d2c528df43be4ef50dde6e6a6d009132d SHA1 43c61e2aadb4fe648a24a690163a34cd7da76af2 SHA256 23968cf17ef509832bd7c206de5247571b5120418fc537a14d7c26ebd714d86b
+DIST collectd-5.0.2.tar.bz2 1313812 RMD160 b0e5470111ec8c0a4c336f7457ef70b8dca738af SHA1 d52d7cedb9d14d030a03107a7e2f0f66e81262d6 SHA256 65c1a0dcea7eca65acb4a52dfae62ed6dba488089d7710ca5ff1cc4225a59dcb
--- a/app-admin/collectd/collectd-5.0.2.ebuild
+++ b/app-admin/collectd/collectd-5.0.2.ebuild
@ -0,0 +1,357 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.2.ebuild,v 1.2 2012/02/08 05:22:11 mr_bones_ Exp $
+
+EAPI=4
+
+inherit eutils base linux-info perl-app autotools
+
+DESCRIPTION="A small daemon which collects system performance statistics - with a near-infinite number of plugins"
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors tape zfs_arc modbus amqp genericjmx lpar redis threshold write_redis v5upgrade"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch
+	cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy exec filecount fscache gmond
+	hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec
+	memcached memory multimeter mysql netlink network nfs nginx ntpd nut olsrd
+	onewire openvpn perl ping postgresql powerdns processes protocols python
+	rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal
+	tokyotyrant uptime users varnish vmem vserver wireless csv exec logfile network
+	notify_desktop notify_email oracle perl python routeros rrdcached rrdtool syslog unixsock
+	write_http match_empty_counter match_hashed match_regex match_timediff match_value
+	target_notification target_replace target_scale target_set uuid"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt
+	sys-devel/libtool
+	perl?					( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
+	collectd_plugins_apache?		( net-misc/curl )
+	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
+	collectd_plugins_bind?			( dev-libs/libxml2 )
+	collectd_plugins_curl?			( net-misc/curl )
+	collectd_plugins_curl_json?		( net-misc/curl dev-libs/yajl )
+	collectd_plugins_curl_xml?		( net-misc/curl dev-libs/libxml2 )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.9.1-r2 )
+	collectd_plugins_java?			( virtual/jre dev-java/java-config-wrapper )
+	collectd_plugins_libvirt?		( app-emulation/libvirt dev-libs/libxml2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_mysql?			( >=virtual/mysql-5.0 )
+	collectd_plugins_netlink?		( >=sys-apps/iproute2-2.6.34 )
+	collectd_plugins_nginx?			( net-misc/curl )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
+	collectd_plugins_notify_email?		( >=net-libs/libesmtp-1.0.4 dev-libs/openssl )
+	collectd_plugins_nut?			( sys-power/nut )
+	collectd_plugins_onewire?		( sys-fs/owfs )
+	collectd_plugins_oracle?		( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 )
+	collectd_plugins_perl?			( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
+	collectd_plugins_ping?			( net-libs/liboping )
+	collectd_plugins_postgresql?		( >=dev-db/postgresql-base-8.2 )
+	collectd_plugins_python?		( =dev-lang/python-2* )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
+	collectd_plugins_rrdtool?		( >=net-analyzer/rrdtool-1.2.27 )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
+	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_write_http?		( net-misc/curl )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_interface?	( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_load?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_memory?	( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_swap?		( >=sys-libs/libstatgrab-0.16 )
+		collectd_plugins_users?		( >=sys-libs/libstatgrab-0.16 )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	kernel_linux? (
+		collectd_plugins_vserver?	( sys-kernel/vserver-sources )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_syslog?		( virtual/logger )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch
+	"${FILESDIR}/${PN}-4.10.2"-{libocci,nohal}.patch
+	"${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch
+	"${FILESDIR}/${PN}-5.0.1"-varnish.patch
+	"${FILESDIR}/${PN}-5.0.2"-irq.patch
+	)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then return 0; fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	linux-info_pkg_setup
+
+	# battery.c:/proc/pmu/battery_%i
+	# battery.c:/proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# nfs.c:/proc/net/rpc/nfs
+	# nfs.c:/proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c:/proc/tty/driver/serial
+	# serial.c:/proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c:/proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c:/proc/acpi/thermal_zone
+	# thermal.c:/sys/class/thermal
+	collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# vmem.c:/proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# uuid.c:/sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c:/proc/net/wireless
+	collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	rm -r libltdl || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="battery cpu cpufreq disk entropy interface iptables ipvs irq load
+		memory netlink nfs processes serial swap tcpconns thermal users vmem vserver
+		wireless"
+
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	# Do we debug?
+	local myconf="$(use_enable debug)"
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	# Need JAVA_HOME for java.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	if ! use collectd_plugins_iptables; then
+		myconf+=" --with-libiptc=no"
+	fi
+
+	# The perl bindings
+	myconf+=" $(use_with perl perl-bindings)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	fixlocalpod
+
+	find "${D}/usr/" -name "*.la" -exec rm -f {} +
+	rm "${D}/usr/$(get_libdir)"/collectd/*.a
+
+	# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
+	# we cannot do this yet
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" collectd
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+	if (use collectd_plugins_${1} && ! has_version "${2}"); then
+		elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+	fi
+}
+
+pkg_postinst() {
+	collectd_rdeps apcups sys-power/apcupsd
+	collectd_rdeps hddtemp app-admin/hddtemp
+	collectd_rdeps mbmon sys-apps/xmbmon
+	collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+	collectd_rdeps ntpd net-misc/ntp
+	collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+
+	echo
+	elog "collectd is now started as unprivileged user by default."
+	elog "You may want to recheck the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+
+	if [[ ${REPLACING_VERSIONS} < 5 ]]; then
+		ewarn "Version 5 of collectd uses a database format different from version 4. You will"
+		ewarn "have to migrate your database after the upgrade, following the guide at"
+		ewarn "   http://www.collectd.org/wiki/index.php/V4_to_v5_migration_guide"
+	fi
+}
--- a/app-admin/collectd/files/collectd-5.0.2-irq.patch
+++ b/app-admin/collectd/files/collectd-5.0.2-irq.patch
@ -0,0 +1,76 @@
+From c72720c41bb2577b1b9db9e12b299869708491c7 Mon Sep 17 00:00:00 2001
+From: Bostjan Skufca <bostjan@a2o.si>
+Date: Fri, 3 Feb 2012 03:10:08 +0100
+Subject: [PATCH] Changes in irq plugin:
+ - fixes errors described here: http://mailman.verplant.org/pipermail/collectd/2011-July/004638.html
+ - refactored parsing code in order to make it a bit more intuitive
+ - added a few additional comments
+
+---
+ src/irq.c |   24 +++++++++++++++++++++---
+ 1 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/src/irq.c b/src/irq.c
+index 96bf7f0..f3d5730 100644
+--- a/src/irq.c
+++ b/src/irq.c
+@@ -94,6 +94,8 @@ static int irq_read (void)
+ {
+ 	FILE *fh;
+ 	char buffer[1024];
+	int  cpu_count;
+	char *fields[64];
+ 
+ 	fh = fopen ("/proc/interrupts", "r");
+ 	if (fh == NULL)
+@@ -104,20 +106,36 @@ static int irq_read (void)
+ 		return (-1);
+ 	}
+ 
+	/* Get CPU count from the first line */
+	if(fgets (buffer, sizeof (buffer), fh) != NULL) {
+		cpu_count = strsplit (buffer, fields, 64);
+	} else {
+		ERROR ("irq plugin: unable to get CPU count from first line of /proc/interrupts");
+		return (-1);
+	}
+
+ 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
+ 	{
+ 		char *irq_name;
+ 		size_t irq_name_len;
+ 		derive_t irq_value;
+ 		int i;
+-
+-		char *fields[64];
+ 		int fields_num;
+		int irq_values_to_parse;
+ 
+ 		fields_num = strsplit (buffer, fields, 64);
+ 		if (fields_num < 2)
+ 			continue;
+ 
+		/* Parse this many numeric fields, skip the rest
+		 * (+1 because first there is a name of irq in each line) */
+		if (fields_num >= cpu_count+1) {
+			irq_values_to_parse = cpu_count;
+		} else {
+			irq_values_to_parse = fields_num - 1;
+		}
+
+		/* First field is irq name */
+ 		irq_name = fields[0];
+ 		irq_name_len = strlen (irq_name);
+ 		if (irq_name_len < 2)
+@@ -132,7 +150,7 @@ static int irq_read (void)
+ 		irq_name_len--;
+ 
+ 		irq_value = 0;
+-		for (i = 1; i < fields_num; i++)
+		for (i = 1; i <= irq_values_to_parse; i++)
+ 		{
+ 			/* Per-CPU value */
+ 			value_t v;
+-- 
+1.7.3.4
+
--- a/app-admin/collectd/files/collectd.initd
+++ b/app-admin/collectd/files/collectd.initd
@ -1,14 +1,14 @@
 #!/sbin/runscript
-# 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-admin/collectd/files/collectd.initd,v 1.5 2011/08/25 21:02:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.6 2012/02/07 20:12:03 dilfridge Exp $

 : ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'}
 : ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
 : ${COLLECTD_NICELVL:='5'}
 : ${COLLECTD_USER:='collectd'}

-opts="${opts} configtest"
+extra_commands="configtest"

 depend() {
 	use net
@ -58,4 +58,3 @@ stop() {
 		--pidfile "${COLLECTD_PIDFILE}"
 	eend $? "Failed to stop collectd"
 }
-
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@ -77,6 +77,7 @@
 		<flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> 
 		<flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> 
 		<flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
+		<flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag>
 		<flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> 
 		<flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> 
 		<flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> 
--- a/app-admin/conky/conky-1.8.1-r6.ebuild
+++ b/app-admin/conky/conky-1.8.1-r6.ebuild
@ -0,0 +1,133 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.4 2012/02/01 17:01:09 ranger Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2 )
+		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
+		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 )
+		nvidia? ( media-video/nvidia-settings )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+		xmms2? ( media-sound/xmms2 )
+	)
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	portmon? ( dev-libs/glib )
+	lua? ( >=dev-lang/lua-5.1 )
+	ncurses? ( sys-libs/ncurses )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	virtual/libiconv
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	dev-util/pkgconfig
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-nvidia-x.patch" \
+		"${FILESDIR}/${P}-xmms2.patch" \
+		"${FILESDIR}/${P}-secunia-SA43225.patch" \
+		"${FILESDIR}/${P}-acpitemp.patch" \
+		"${FILESDIR}/${P}-curl-headers.patch" \
+		"${FILESDIR}/${P}-maxinterfaces.patch" \
+		"${FILESDIR}/${P}-utf8-scroll.patch" \
+		"${FILESDIR}/${P}-battery-time.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use X; then
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+		myconf="${myconf} --enable-argb --enable-own-window"
+		myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
+		myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
+		myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
+		myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
+	else
+		myconf="--disable-x11 --disable-own-window --disable-argb"
+		myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
+		myconf="${myconf} --disable-audacious --disable-xmms2"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable apcupsd) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable eve) \
+		$(use_enable hddtemp) \
+		$(use_enable iostats) \
+		$(use_enable lua) \
+		$(use_enable thinkpad ibm) \
+		$(use_enable math) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable ncurses) \
+		$(use_enable portmon) \
+		$(use_enable rss) \
+		$(use_enable weather-metar) \
+		$(use_enable weather-xoap) \
+		$(use_enable wifi wlan)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog AUTHORS TODO || die
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim || die
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc || die
+	fi
+}
+
+pkg_postinst() {
+	elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
+	elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
+	elog
+	elog "For more info on Conky's features please look at the Changelog in"
+	elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
+	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
+	elog
+	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+	elog
+}
--- a/app-admin/conky/files/conky-1.8.1-battery-time.patch
+++ b/app-admin/conky/files/conky-1.8.1-battery-time.patch
@ -0,0 +1,11 @@
+--- a/src/linux.c.old	2012-01-12 08:18:58.525502553 -0500
+++ b/src/linux.c	2012-01-12 08:19:29.786069277 -0500
+@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns
+  			the tradition! */
+  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
+  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
+			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
+				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
+  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@ -0,0 +1 @@
+DIST elektra-0.7.1.tar.gz 1347524 RMD160 2b9153b508a535c80fef2795955eb98a8dfeb968 SHA1 bcc733cab0b391e5790c05635ab7161d9bdcaffa SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c
--- a/app-admin/elektra/elektra-0.7.1.ebuild
+++ b/app-admin/elektra/elektra-0.7.1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.2 2012/02/08 04:43:23 xmw Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://sourceforge.net/projects/elektra/"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="iconv static-libs test"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/libxml2[static-libs] )"
+
+src_prepare() {
+	einfo 'Removing bundled libltdl'
+	rm -rf libltdl || die
+
+	epatch "${FILESDIR}"/${P}-{ltdl,test}.patch
+
+	touch config.rpath
+	eautoreconf
+}
+
+src_configure() {
+	# berkeleydb, daemon, fstab, gconf, python do not work
+	econf \
+		--enable-filesys \
+		--enable-hosts \
+		--enable-ini \
+		--enable-passwd \
+		--disable-berkeleydb \
+		--disable-fstab \
+		--disable-gconf \
+		--disable-daemon \
+		--enable-cpp \
+		--disable-python \
+		--enable-gcov \
+		$(use_enable iconv) \
+		$(use_enable static-libs static) \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-develdocdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
--- a/app-admin/elektra/files/elektra-0.7.1-ltdl.patch
+++ b/app-admin/elektra/files/elektra-0.7.1-ltdl.patch
@ -0,0 +1,18 @@
+--- elektra-0.7.1/Makefile.am
+++ elektra-0.7.1/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = libltdl src doc benchmarks examples scripts xmlschema tests
+SUBDIRS =  src doc benchmarks examples scripts xmlschema tests
+ EXTRA_DIST=elektra.pc elektratools.pc elektracpp.pc elektra.spec elektra.mandriva.spec elektra.xml
+ 
+ pkgconfigdir = $(ulibdir)/pkgconfig
+--- elektra-0.7.1/doc/Makefile.am
+++ elektra-0.7.1/doc/Makefile.am
+@@ -1,4 +1,5 @@
+ # $Id: elektra-0.7.1-ltdl.patch,v 1.1 2012/02/08 04:43:23 xmw Exp $
+develdocDATA_INSTALL = install
+ 
+ EXTRA_DIST=kdb.1.xml elektra.7.xml elektra.5.xml
+ EXTRA_DIST+=author.xml bestpract.xml rgexample.xml rgcmd.xml storage.xml overview.xml apiexample.xml api.xml compared.xml garbage.xml html-params.xsl html-titlepage-layout.tpl society.xml storage.xml UPLOAD
--- a/app-admin/elektra/files/elektra-0.7.1-test.patch
+++ b/app-admin/elektra/files/elektra-0.7.1-test.patch
@ -0,0 +1,123 @@
+--- elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp
+++ elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
+#include <stdio.h>
+ 
+ void test_kdbGetSet()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp
+++ elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
+#include <stdio.h>
+ 
+ void test_ksnew()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp
+++ elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
+#include <stdio.h>
+ 
+ void test_keynew()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/Makefile.am
+++ elektra-0.7.1/src/bindings/cpp/tests/Makefile.am
+@@ -10,13 +10,13 @@
+ endif
+ 
+ test_key_SOURCES = test_key.cpp tests.h tests.cpp
+-test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
+test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ test_ks_SOURCES = test_ks.cpp tests.h tests.cpp
+-test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
+test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ test_kdb_SOURCES = test_kdb.cpp tests.h tests.cpp
+-test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
+test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ ../libelektra-cpp.a:
+ 	cd .. && $(MAKE) libelektra-cpp.a
+--- elektra-0.7.1/tests/Makefile.am
+++ elektra-0.7.1/tests/Makefile.am
+@@ -1,10 +1,10 @@
+ AM_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL)
+ 
+-TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_script.sh test_type
+TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_script.sh test_type
+ #TESTS = test_backendhelpers
+ 
+-check_PROGRAMS    = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_type print_info
+check_PROGRAMS    = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_type print_info
+ #check_PROGRAMS    = test_backendhelpers
+ 
+ if VALGRINDTESTS
+@@ -19,49 +19,49 @@
+ 	rm -f *.gcno *.gcda *.gcno
+ 
+ test_key_SOURCES = test_key.c tests.h tests.c
+-test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a 
+test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_ks_SOURCES = test_ks.c tests.h tests.c
+-test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a 
+test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_kdb_SOURCES = test_kdb.c tests.h tests.c
+-test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_xml_SOURCES = test_xml.c tests.h tests.c
+-test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_getset_SOURCES = test_getset.c tests.h tests.c
+-test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_trie_SOURCES = test_trie.c tests.h tests.c
+-test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_mount_SOURCES = test_mount.c tests.h tests.c
+-test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_cap_SOURCES = test_cap.c tests.h tests.c
+-test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_stream_SOURCES = test_stream.c tests.h tests.c
+-test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_serialize_SOURCES = test_serialize.c tests.h tests.c
+-test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_split_SOURCES = test_split.c tests.h tests.c
+-test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_internals_SOURCES = test_internals.c tests.h tests.c
+-test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_backendhelpers_SOURCES = test_backendhelpers.c tests.h tests.c
+-test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_type_SOURCES = test_type.c tests.h tests.c
+-test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ print_info_SOURCES = print_info.c tests.h tests.c
+-print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
+print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ ../src/libelektra/libelektra.a:
+ 	cd ../src/libelektra && $(MAKE) libelektra.a
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
--- a/app-admin/emacs-updater/emacs-updater-1.9.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.9.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-admin/emacs-updater/emacs-updater-1.9.ebuild,v 1.1 2011/08/24 18:43:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.9.ebuild,v 1.6 2012/02/07 15:53:57 jer Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 RDEPEND="!<=app-admin/eselect-emacs-1.5
--- a/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild
+++ b/app-admin/eselect-ecj/eselect-ecj-0.7.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-admin/eselect-ecj/eselect-ecj-0.7.ebuild,v 1.2 2011/12/31 11:04:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild,v 1.3 2012/01/15 15:44:15 phajdan.jr Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND=">=app-admin/eselect-1.2.3"
--- a/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild
+++ b/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild,v 1.8 2009/10/11 23:24:18 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild,v 1.9 2012/02/05 18:38:15 armin76 Exp $

 DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org."
 HOMEPAGE="http://www.gentoo.org/"
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""

 RDEPEND=">=app-admin/eselect-1.0.2"
--- a/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-admin/eselect-oodict/eselect-oodict-20100228.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/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.1 2010/03/01 00:03:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.3 2012/01/16 14:50:34 ago Exp $

 DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org."
 HOMEPAGE="http://www.gentoo.org/"
@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""

 RDEPEND=">=app-admin/eselect-1.2"
--- a/app-admin/eselect-opencl/Manifest
+++ b/app-admin/eselect-opencl/Manifest
@ -0,0 +1,8 @@
+DIST cl.h.1.1.xz 6940 RMD160 697d52b04bba416c233433ff5b9cba47d7327631 SHA1 2092a622e1494f0a31c1371147bc87478226b44b SHA256 11b0249ec6c35000686cfe775b1789fa010b6d058e123b00c720e8408881f13f
+DIST cl.hpp.1.1.xz 14764 RMD160 009ff35d03da82b8271785077d94f046193f91d6 SHA1 096b0e0fd42d841effa24c6323cf109aa2f6ecce SHA256 5d90ef4d964a6365d8e9305913c85dd0ffe6916df0a151a116b1b58b0e6c7ef4
+DIST cl_ext.h.1.1.xz 2740 RMD160 f2debb481b3f3c94cbca5a50bb77fb571c9538dd SHA1 f7c759f6d8077e6d1eb222d1acb4a9638bee4741 SHA256 aeb729345004bf67d2564e1dc55feb326ff017f3b291ffb8e1391de353e09620
+DIST cl_gl.h.1.1.xz 1856 RMD160 e92b5e843322c9e78f3fe72da43c1502109dc1f5 SHA1 3c4ad063ea5e4ee232b273cecbb85abf17dbf112 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d402fad5d78b29f925a
+DIST cl_gl_ext.h.1.1.xz 1356 RMD160 0ba4c5d6f3c1d119d7a8844abd43b83db987b565 SHA1 829ae549cdd0de3878626858fb041d5a424ebd96 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02
+DIST cl_platform.h.1.1.xz 5584 RMD160 034d4be552aa3ddb6cc45718c5aa7a195d7f3f59 SHA1 bdc027789de959d1aa33e70de8af90dd103780d3 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53
+DIST eselect-opencl-1.1.0.tar.xz 3272 RMD160 e6538d2207823487288dabce18e1baf8bd59ddf3 SHA1 fef7bf2949fb9b9f9f73a8fd30fca2f063abeb51 SHA256 0b49d847d4475119f969fc7bbcdc4ceb1905e37e102b10d0bdad4f8e6010bbbe
+DIST opencl.h.1.1.xz 944 RMD160 d9c8ee867a0068fbb05624d48d9e236d0f43acd3 SHA1 2b94aff101b7a3ee4261957b6d46edd6b81faf24 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096
--- a/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild
+++ b/app-admin/eselect-opencl/eselect-opencl-1.1.0.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-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild,v 1.1 2012/01/21 09:23:17 xarthisius Exp $
+
+EAPI=4
+CL_ABI=1.1
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenCL implementation being used"
+HOMEPAGE="http://www.gentoo.org/"
+
+# Source:
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
+
+MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/"
+SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz
+	${MIRROR}/cl_platform.h.${CL_ABI}.xz
+	${MIRROR}/cl.h.${CL_ABI}.xz
+	${MIRROR}/cl_ext.h.${CL_ABI}.xz
+	${MIRROR}/cl_gl.h.${CL_ABI}.xz
+	${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz
+	${MIRROR}/cl.hpp.${CL_ABI}.xz
+	${MIRROR}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+pkg_postinst() {
+	local impl="$(eselect opencl show)"
+	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
+		eselect opencl set "${impl}"
+	fi
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins opencl.eselect
+	#doman opencl.eselect.5
+
+	local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
+	insinto /usr/$(get_libdir)/OpenCL/global/include/CL
+	cd "${WORKDIR}"
+	for f in ${headers[@]}; do
+		newins ${f}.${CL_ABI} ${f}
+	done
+}
--- a/app-admin/eselect-opencl/metadata.xml
+++ b/app-admin/eselect-opencl/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xarthisius@gentoo.org</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
+	<longdescription>
+		Utility to switch OpenCL implementations between various providers.
+	</longdescription>
+</pkgmetadata>
--- a/app-admin/eselect-qtgraphicssystem/Manifest
+++ b/app-admin/eselect-qtgraphicssystem/Manifest
@ -0,0 +1,2 @@
+DIST eselect-qtgraphicssystem-1.0.tar.bz2 1296 RMD160 4095cfd2a3c42fe80fb5d16e2cca469413a7afb4 SHA1 62f51796e58da15ac00d43dc5db77a69cc6c415b SHA256 e0e903813927da3065f75c2f8ecb8c87f92cbc044ed427c7424d4eb88f478af8
+DIST eselect-qtgraphicssystem-1.1.1.tar.bz2 1621 RMD160 2242743a21739ad44b04ba319a23c75ff6303e0d SHA1 9d587c8ea001ad8f886b54c82fe2b5bd143eb351 SHA256 00195d3dc0959b1f396cceaa5320d945fd9bf28680b7b7ce6317915288a627cf
--- a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild
+++ b/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild,v 1.1 2012/01/29 16:19:55 wired Exp $
+
+EAPI=4
+
+DESCRIPTION="Utility to change the active Qt Graphics System"
+HOMEPAGE="https://gitorious.org/gentoo-qt/eselect-qtgraphicssystem"
+SRC_URI="http://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+src_install() {
+	insinto "/usr/share/eselect/modules"
+	doins qtgraphicssystem.eselect
+}
--- a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
+++ b/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild,v 1.1 2012/02/05 12:58:19 wired Exp $
+
+EAPI=4
+
+DESCRIPTION="Utility to change the active Qt Graphics System"
+HOMEPAGE="https://gitorious.org/gentoo-qt/eselect-qtgraphicssystem"
+SRC_URI="http://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+src_install() {
+	insinto "/usr/share/eselect/modules"
+	doins qtgraphicssystem.eselect
+}
--- a/app-admin/eselect-qtgraphicssystem/metadata.xml
+++ b/app-admin/eselect-qtgraphicssystem/metadata.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+</pkgmetadata>
+
--- a/app-admin/eselect-ruby/Manifest
+++ b/app-admin/eselect-ruby/Manifest
@ -1 +1,2 @@
 DIST ruby.eselect-20100603.bz2 1869 RMD160 d21882dda42657d14224ff4d58ca838123a62e03 SHA1 5db469b52b095ff288780f9eff6a144f07554a5f SHA256 043313957e9bf489b7db8fcfe198ea7851e421f1021f7d4b3758fc90efb5a69f
+DIST ruby.eselect-20120106.bz2 1898 RMD160 e65684dd3d308e25dc93dda5fea77f1fb6c29800 SHA1 35a637dd62fdd66896dc5b1fc8869239c2acc69e SHA256 439875e9cd632aecce973ecb579c6f3f7b2554e303e12515286eb96ae47e28e9
--- a/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
+++ b/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild,v 1.1 2012/01/06 22:02:43 a3li Exp $
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.a3li.li/gentoo/distfiles/ruby.eselect-${PVR}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
+}
--- a/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-admin/eselect-timidity/eselect-timidity-20110513.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-admin/eselect-timidity/eselect-timidity-20110513.ebuild,v 1.2 2011/12/16 14:54:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild,v 1.6 2012/02/05 17:43:27 armin76 Exp $

 DESCRIPTION="Manages configuration of TiMidity++ patchsets"
 HOMEPAGE="http://www.gentoo.org/"
@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=app-admin/eselect-1.2.3"
--- a/app-admin/eselect-unison/eselect-unison-0.1.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.1.ebuild,v 1.8 2008/06/30 20:37:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.1.ebuild,v 1.9 2012/02/05 18:46:17 armin76 Exp $

 inherit eutils

@ -10,7 +10,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc x86"

 IUSE=""
 DEPEND=""
--- a/app-admin/eselect-unison/eselect-unison-0.2.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.2.ebuild,v 1.1 2009/11/22 17:39:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.2.ebuild,v 1.2 2012/02/05 18:46:17 armin76 Exp $

 inherit eutils

@ -10,7 +10,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/eselect-unison/eselect-unison-0.3.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.3.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-admin/eselect-unison/eselect-unison-0.3.ebuild,v 1.3 2011/11/28 11:48:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.3.ebuild,v 1.5 2012/02/06 17:14:22 ranger Exp $

 inherit eutils

@ -10,7 +10,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND=""
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@ -1,3 +1,3 @@
 DIST eselect-1.2.15.tar.bz2 169358 RMD160 9b5c2174786466f6a32e8b823eb4140e2581f945 SHA1 4875545e001904ab6f9a5a8c96150739ee1cff29 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7
-DIST eselect-1.2.17.tar.bz2 169990 RMD160 c97c8a147f3d737de12c4aa4993a17734464d85d SHA1 fd5721e49eb4705b66bda387eb70fe45ca3b72ba SHA256 37724f875bb13b8998f699bf56a59c55a0d9987943216ab784926a550aa8d138
 DIST eselect-1.2.18.tar.bz2 170120 RMD160 0a2dc01f0c50c03f81b6079b91190859d820ff61 SHA1 5ac5a5049e99d09063da9d99096a146cb22953cd SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c
+DIST eselect-1.3.tar.xz 163724 RMD160 45e30b66e4258ce607a57230956b057dc32c1ba5 SHA1 c63330bede6b6e5f86fa3392feb3abd9f7f23d8d SHA256 1700cc381eb7acbb49204157038be16fb63d9291b7b23612db32897566be506e
--- a/app-admin/eselect/eselect-1.2.18.ebuild
+++ b/app-admin/eselect/eselect-1.2.18.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-admin/eselect/eselect-1.2.18.ebuild,v 1.1 2011/09/25 16:24:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.18.ebuild,v 1.6 2012/02/07 16:05:16 jer Exp $

 EAPI=2

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~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="doc"

 RDEPEND="sys-apps/sed
@ -51,6 +51,8 @@ src_install() {

 	# needed by news module
 	keepdir /var/lib/gentoo/news
+	fowners root:portage /var/lib/gentoo/news || die
+	fperms g+w /var/lib/gentoo/news || die
 }

 pkg_postinst() {
--- a/app-admin/eselect/eselect-1.3.ebuild
+++ b/app-admin/eselect/eselect-1.3.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.ebuild,v 1.1 2012/01/21 19:02:55 ulm Exp $
+
+EAPI=3
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~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="doc"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	doc? ( dev-python/docutils )"
+RDEPEND="!app-admin/eselect-news
+	${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses"
+
+# Commented out: only few users of eselect will edit its source
+#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
+#	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake || die
+
+	if use doc; then
+		emake html || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newbashcomp misc/${PN}.bashcomp ${PN} || die
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
+
+	if use doc; then
+		dohtml *.html doc/* || die
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	fowners root:portage /var/lib/gentoo/news || die
+	fperms g+w /var/lib/gentoo/news || die
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
+	chgrp portage "${EROOT}/var/lib/gentoo/news" \
+		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+}
--- a/app-admin/evtxtools/metadata.xml
+++ b/app-admin/evtxtools/metadata.xml
@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-	<email>spamslepnoga@inbox.ru</email>
+	<email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
 	<email>maksbotan@gentoo.org</email>
--- a/app-admin/fam/fam-2.7.0-r6.ebuild
+++ b/app-admin/fam/fam-2.7.0-r6.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-admin/fam/fam-2.7.0-r6.ebuild,v 1.2 2011/01/06 11:03:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.9 2012/01/22 15:15:18 armin76 Exp $

 EAPI="2"

@ -14,7 +14,7 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
 IUSE="static-libs"

 DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
@ -35,6 +35,9 @@ src_configure() {

 src_install() {
 	emake install DESTDIR="${D}" || die
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/libfam.la
+	fi

 	sed -i "${D}"/etc/fam.conf \
 		-e "s:local_only = false:local_only = true:g" \
--- a/app-admin/fam/files/famd
+++ b/app-admin/fam/files/famd
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.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-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.2 2011/11/18 22:21:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.4 2012/01/14 15:57:32 maekke Exp $

 EAPI="3"
 GCONF_DEBUG="no"
@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/gst/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
 IUSE="nfs policykit samba"

 RDEPEND="
--- a/app-admin/grubconfig/grubconfig-1.28-r1.ebuild
+++ b/app-admin/grubconfig/grubconfig-1.28-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconfig/grubconfig-1.28-r1.ebuild,v 1.1 2008/04/07 05:34:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconfig/grubconfig-1.28-r1.ebuild,v 1.3 2012/01/15 15:31:16 phajdan.jr Exp $

 inherit multilib

@ -10,7 +10,7 @@ SRC_URI="http://www.tux.org/pub/people/kent-robotti/looplinux/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""

 DEPEND=">=dev-util/dialog-0.7"
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@ -3,3 +3,4 @@ DIST haskell-updater-1.1.0.0.tar.gz 22691 RMD160 8db8459cdb5fbbc87920b42900c6b07
 DIST haskell-updater-1.1.3.0.tar.gz 22981 RMD160 07f18a193ae11c069f11d10408fd4cb81af6a5a6 SHA1 4ef474a9460917348bb2fff02b52540f50206ee6 SHA256 5bd2f931c490c114f655204d671feb677a9abdc472bbfe554cbf448cc216fd3a
 DIST haskell-updater-1.2.0.0.tar.gz 22813 RMD160 2967cf410a37124501f26ea9efdd580678dfb9fd SHA1 d9ff5a8ee38004d84ec76e40ac69fa0a1b79741d SHA256 18da33a9de5f424a557d513dd2888773a55cdea578526428906897a96bb77a08
 DIST haskell-updater-1.2.0.1.tar.gz 22974 RMD160 2a416e517e917cc23b3e52a2f4d83a6e419e7308 SHA1 511fa8f9fe94599eb05703e1313efd42ea670f78 SHA256 aa7f5e2965db2f6f2464650289bcd9bd0f72e1762bcc6e2e90d53fe517dfd0e5
+DIST haskell-updater-1.2.0.3.tar.gz 23338 RMD160 455630ce4068e9a95b89fa099038440c0e559d2a SHA1 b58ed0d4f2a9ce72a37cb339924b3ca3454a7fc2 SHA256 9142daaf1e8dff5ff060f95abe0f82189e04c8ee94753afb9fa00102391dc244
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild,v 1.1 2012/01/02 15:50:42 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="bin nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+			  sys-apps/pkgcore
+			  sys-apps/paludis )"
+
+src_prepare() {
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+		    "${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+		    "${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure --bindir="${EPREFIX}/usr/sbin"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@ -66,3 +66,24 @@
 "WDC WD10EADS-00M2B0"						194 C "Western Digital Caviar Green 1TB SATA2 5400RPM 32MB"
 "WDC WD20EARS-00S8B1"						194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
 "WDC WD3200BEKT-00F3T0"						194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
+"WDC WD5000AADS"						194 C "Western Digital Caviar Green 500GB SATA2 IntelliPower 32MB"
+"WDC WD7500AARX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD3200AZDX"						194 C "Western Digital Caviar Green 320GB SATA3 IntelliPower 32MB"
+"WDC WD5000AZDX"						194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 32MB"
+"WDC WD7500AZRX"						194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD10EARS"							194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
+"WDC WD20EARS"							194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD10EZRX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD25EZRX"							194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
+"WDC WD30EZRX"							194 C "Western Digital Caviar Green 3TB SATA3 IntelliPower 64MB"
+"WDC WD10EARX"							194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD15EARX"							194 C "Western Digital Caviar Green 1.5TB SATA3 IntelliPower 64MB"
+"WDC WD20EARX"							194 C "Western Digital Caviar Green 2TB SATA3 IntelliPower 64MB"
+"ST250DM000"							194 C "Seagate Barracuda 7200.14 250GB SATA3 7200RPM 16MB"
+"ST320DM000"							194 C "Seagate Barracuda 7200.14 320GB SATA3 7200RPM 16MB"
+"ST500DM002"							194 C "Seagate Barracuda 7200.14 500GB SATA3 7200RPM 16MB"
+"ST750DM003"							194 C "Seagate Barracuda 7200.14 750GB SATA3 7200RPM 64MB"
+"ST1000DM003"							194 C "Seagate Barracuda 7200.14 1TB SATA3 7200RPM 64MB"
+"ST1500DM003"							194 C "Seagate Barracuda 7200.14 1.5TB SATA3 7200RPM 64MB"
+"ST2000DM001"							194 C "Seagate Barracuda 7200.14 2TB SATA3 7200RPM 64MB"
+"ST3000DM001"							194 C "Seagate Barracuda 7200.14 3TB SATA3 7200RPM 64MB"
--- a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.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-admin/ide-smart/ide-smart-1.4-r1.ebuild,v 1.4 2011/03/20 18:23:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4-r1.ebuild,v 1.5 2012/01/05 22:12:11 xmw Exp $

 inherit toolchain-funcs

@ -10,7 +10,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""

 src_compile() {
--- a/app-admin/killproc/killproc-2.13.ebuild
+++ b/app-admin/killproc/killproc-2.13.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13.ebuild,v 1.2 2009/09/04 18:02:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13.ebuild,v 1.4 2012/02/05 13:44:44 ranger Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc ~x86"
 IUSE=""

 src_prepare() {
--- a/app-admin/logcheck/logcheck-1.3.13.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.13.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.13.ebuild,v 1.3 2010/10/14 15:17:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.13.ebuild,v 1.4 2011/12/18 17:49:04 armin76 Exp $

 inherit eutils

@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/logcheck/logcheck-1.3.14.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.14.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-admin/logcheck/logcheck-1.3.14.ebuild,v 1.1 2011/09/14 19:06:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.3 2012/01/25 23:04:20 hwoarang Exp $

 inherit eutils

@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/logrotate/logrotate-3.8.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.1.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-admin/logrotate/logrotate-3.8.1.ebuild,v 1.1 2011/10/12 16:29:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.1.ebuild,v 1.6 2012/01/31 18:49:00 jer Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="acl selinux"

 RDEPEND="
--- a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
+++ b/app-admin/lsat/lsat-0.9.7.1-r1.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/app-admin/lsat/lsat-0.9.7.1-r1.ebuild,v 1.1 2010/08/27 05:35:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.7.1-r1.ebuild,v 1.3 2012/02/05 21:36:54 ranger Exp $

 inherit eutils toolchain-funcs

@ -10,7 +10,7 @@ SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="minimal"

 DEPEND="dev-lang/perl" # pod2man
--- a/app-admin/lsyncd/lsyncd-2.0.5.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.0.5.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-admin/lsyncd/lsyncd-2.0.5.ebuild,v 1.1 2011/11/14 21:23:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.5.ebuild,v 1.2 2012/01/27 19:12:08 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://lsyncd.googlecode.com/files/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND="dev-lang/lua"
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@ -1,6 +1,3 @@
-DIST monit-4.10.1.tar.gz 606273 RMD160 6c517b19bc43f4023dfca4de1df09272b41af02d SHA1 c87aa0c6e0b1d13f46b7e9d84937191e25a907a6 SHA256 f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
 DIST monit-5.1.1.tar.gz 615924 RMD160 1b4fed4e039adfd626f3c49436702c0272948327 SHA1 cad2ff02a2f6dbfb5773d13e42506adb2165d15c SHA256 bf789e0660410e8c63f4b3dc2eeab9889347e6494a6dc1c0e764343cae0dc1ba
-DIST monit-5.2.1.tar.gz 619180 RMD160 9bb4fdb25b2cb1769b95574ee41a463c876518e1 SHA1 15bc783014b1ee8886e5d8f0c28f953b581d05ec SHA256 31b37dd4a6f6b48e6d6926d97bfe5ad998a2a0611af0586525a5dd1b5847e41e
-DIST monit-5.2.2.tar.gz 610419 RMD160 f94c3811d2ecd4ac4693c64463d63a9625ae2b35 SHA1 7838fc4b0dffa052bf3e4f892b280b9c2b7336fd SHA256 addfa9131ca6b0a3a6073aeb9290d34e5fec203ee7c2fff934db54a06b699268
 DIST monit-5.2.3.tar.gz 618139 RMD160 6e82619df575c1bc372edc76db92a211adff9634 SHA1 dae1a63fca9a44cf1bda53691711b8273efe3935 SHA256 920f50e752cbdc8e2c7f009e1c54bfd46f5646ea22bbab96c58eb5d1a19a0d8c
 DIST monit-5.2.5.tar.gz 608861 RMD160 68cc1ce013626da10e421303840c9c768128f015 SHA1 41954b62a08663527d497084bd16d08b9a7b21bc SHA256 3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d
--- a/app-admin/monit/files/monit.initd-5.0
+++ b/app-admin/monit/files/monit.initd-5.0
@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.1 2008/08/29 20:13:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.2 2011/12/31 16:28:50 idl0r Exp $

-opts="${opts} reload"
+extra_started_commands="reload"

 depend() {
 	use net
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.1 2011/04/13 15:40:32 patrick Exp $
-
-opts="${opts} reload configtest"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $

+extra_commands="configtest"
+extra_started_commands="reload"

 depend() {
 	use net
@ -19,6 +19,7 @@ configtest() {
        fi
        return $ret
 }
+
 start() {
 	ebegin "Starting monit"
 	start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
--- a/app-admin/monit/monit-5.1.1-r1.ebuild
+++ b/app-admin/monit/monit-5.1.1-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.1.1-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
+
+EAPI="2"
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGES.txt README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
+	newinitd "${FILESDIR}"/monit.initd-5.0 monit || die "newinitd failed"
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
--- a/app-admin/monit/monit-5.2.3-r2.ebuild
+++ b/app-admin/monit/monit-5.2.3-r2.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.3-r2.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
+
+EAPI="2"
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGES.txt README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
--- a/app-admin/monit/monit-5.2.5-r1.ebuild
+++ b/app-admin/monit/monit-5.2.5-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.5-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
+
+EAPI="2"
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGES.txt README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
--- a/app-admin/moodss/Manifest
+++ b/app-admin/moodss/Manifest
@ -1,3 +1 @@
-DIST moodss-20.0.tar.bz2 1693533 RMD160 8e6337773f6ed663f527a6d04d81af9ab971a530 SHA1 c0d8995465ab72f6143a4dc44063341f44e0d676 SHA256 5b4d2517b36bf5c6c465786c6fd90d4b6bd825e76c47c2e024a5958fd659588d
-DIST moodss-20.2.tar.bz2 1697188 RMD160 7a525dbcfe2850e439a54cf00a6da1ffbd2988af SHA1 c052590997d6a6f67f8773f19aba959475f413b7 SHA256 aab0a71cc372ad50b15bf2f03db12a889a9d370316be8d55a069e292225405d8
 DIST moodss-21.5.tar.bz2 1963647 RMD160 d9478c6bbc3fd509fe898cf44f1efba62e7b51ba SHA1 debde88696c53ea79f2edfa8461de6951052906d SHA256 f44799ff6d485b332bb5b2c72413e3e8e8b79797eed4e5ffb9a1f3bcc436c6c7
--- a/app-admin/moodss/metadata.xml
+++ b/app-admin/moodss/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>
--- a/app-admin/moodss/moodss-21.5.ebuild
+++ b/app-admin/moodss/moodss-21.5.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-admin/moodss/moodss-21.5.ebuild,v 1.5 2011/05/23 07:19:23 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.6 2012/01/07 21:06:57 xarthisius Exp $

 EAPI="3"

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/moodss/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="mysql perl python"

 DEPEND=">=dev-lang/tcl-8.4[threads]"
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.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-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild,v 1.1 2011/08/02 05:45:11 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND="dev-libs/dbus-glib
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.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-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild,v 1.1 2011/09/05 15:01:03 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND="dev-libs/dbus-glib
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.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-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild,v 1.1 2011/10/06 19:25:27 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND="dev-libs/dbus-glib
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.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-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild,v 1.1 2011/11/07 13:28:20 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND="dev-libs/dbus-glib
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.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-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild,v 1.2 2011/09/05 20:05:15 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild,v 1.3 2012/01/28 17:13:20 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND=">=x11-libs/qt-core-4.4.0
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.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-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.4 2011/09/06 10:31:52 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.5 2012/01/28 17:13:20 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND=">=x11-libs/qt-core-4.4.0
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.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-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild,v 1.1 2011/10/06 19:25:40 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild,v 1.2 2012/01/28 17:13:20 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND=">=x11-libs/qt-core-4.4.0
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.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-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild,v 1.1 2011/11/07 13:28:43 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild,v 1.2 2012/01/28 17:16:08 lxnay Exp $

 EAPI="3"

@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 RDEPEND=">=x11-libs/qt-core-4.4.0
--- a/app-admin/packagekit/packagekit-0.6.17.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.17.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-admin/packagekit/packagekit-0.6.17.ebuild,v 1.1 2011/08/02 05:45:49 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.17.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $

 EAPI="3"

@ -13,7 +13,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt4"

 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
--- a/app-admin/packagekit/packagekit-0.6.18.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.18.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-admin/packagekit/packagekit-0.6.18.ebuild,v 1.1 2011/09/05 15:03:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.18.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $

 EAPI="3"

@ -13,7 +13,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt4"

 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
--- a/app-admin/packagekit/packagekit-0.6.19.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.19.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-admin/packagekit/packagekit-0.6.19.ebuild,v 1.1 2011/10/06 19:26:39 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.19.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $

 EAPI="3"

@ -13,7 +13,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt4"

 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
--- a/app-admin/packagekit/packagekit-0.6.20.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.20.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-admin/packagekit/packagekit-0.6.20.ebuild,v 1.1 2011/11/07 13:29:17 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.20.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $

 EAPI="3"

@ -13,7 +13,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk qt4"

 RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
--- a/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.10.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-admin/perl-cleaner/perl-cleaner-2.10.ebuild,v 1.2 2011/08/06 15:09:29 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild,v 1.3 2012/01/06 23:02:27 vapier Exp $

 DESCRIPTION="User land tool for cleaning up old perl installs"
 HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
@ -14,7 +14,7 @@ IUSE=""

 DEPEND="app-shells/bash"
 RDEPEND="${DEPEND}
-	|| ( app-misc/realpath sys-freebsd/freebsd-bin )
+	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
 	dev-lang/perl"

 src_install() {
--- a/app-admin/prelude-lml/files/gentoo.init
+++ b/app-admin/prelude-lml/files/gentoo.init
--- a/app-admin/psmon/psmon-1.39.ebuild
+++ b/app-admin/psmon/psmon-1.39.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/psmon/psmon-1.39.ebuild,v 1.2 2011/12/18 11:47:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/psmon/psmon-1.39.ebuild,v 1.3 2011/12/18 20:02:02 phajdan.jr Exp $

 inherit perl-app

@ -9,7 +9,7 @@ HOMEPAGE="http://www.psmon.com/"
 SRC_URI="http://www.psmon.com/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""

 DEPEND=">=dev-lang/perl-5.6.0
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@ -1 +1,2 @@
+DIST python-updater-0.10.tar.bz2 9245 RMD160 664a6e0ceecb3cd8f5bbcf1fd3774b87791bf2af SHA1 bd62b25d58fc16f640be92aaf9843644360fb767 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520
 DIST python-updater-0.9.tar.bz2 7789 RMD160 5da6945368186fd7eb9efb37b6b81ebe7660fc58 SHA1 f64e11d4f106088c7a4bf866ba0be1a2b831cd9f SHA256 a4b065c264e1909e1d6a7f9a0d5dacce224f946468313e34e8775df0b6689384
--- a/app-admin/python-updater/python-updater-0.10.ebuild
+++ b/app-admin/python-updater/python-updater-0.10.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10.ebuild,v 1.5 2012/02/01 22:21:40 ranger Exp $
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit subversion
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
+else
+	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
+RDEPEND="dev-lang/python
+	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+
+src_compile() {
+	if [[ "${PV}" == "9999" ]]; then
+		emake ${PN}.1 || die "Generation of man page failed"
+	fi
+}
+
+src_install() {
+	dosbin ${PN} || die "dosbin failed"
+	doman ${PN}.1 || die "doman failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
--- a/app-admin/python-updater/python-updater-9999.ebuild
+++ b/app-admin/python-updater/python-updater-9999.ebuild
@ -1,25 +1,33 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.7 2011/08/06 16:59:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.8 2011/12/30 17:41:45 maksbotan Exp $

-inherit subversion
+if [[ "${PV}" == "9999" ]]; then
+	inherit subversion
+fi

 DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
 HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-SRC_URI=""
-ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/${PN}/trunk"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
+else
+	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
+fi

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE=""

-DEPEND="sys-apps/help2man"
+DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
 RDEPEND="dev-lang/python
 	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"

 src_compile() {
+	if [[ "${PV}" == "9999" ]]; then
 		emake ${PN}.1 || die "Generation of man page failed"
+	fi
 }

 src_install() {
--- a/app-admin/radmind/radmind-1.14.1.ebuild
+++ b/app-admin/radmind/radmind-1.14.1.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-admin/radmind/radmind-1.14.1.ebuild,v 1.1 2011/08/16 21:03:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.14.1.ebuild,v 1.2 2012/01/28 14:45:49 phajdan.jr Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"

 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""

 DEPEND="dev-libs/openssl"
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,2 +1,3 @@
 DIST rsyslog-5.8.5.tar.gz 2364874 RMD160 46b20433e0e5feb807b4777bb8141221fe5dd65b SHA1 a5dc735714b573f577db2892f596dcb0ef35c747 SHA256 a519704c06de1026847f69d99f31a2a32783e9547f5249dddefe805bfbc3ea50
+DIST rsyslog-5.8.6.tar.gz 2373078 RMD160 96beddd94eea0c635c41409f92c897d3620182c0 SHA1 1afe39077253dc9f636f676e8374d09a101a9c94 SHA256 c51206e3b11c7b4cddf92607b9d6ddd07430ff7dd8d06849804c9ea1c9191825
 DIST rsyslog-zeromq.tar.gz 22223 RMD160 632a1888d3972da4ce623c8f6973c72b026b035c SHA1 e6f02c25af19022d0cc9d4782f58db3fc27a9f0f SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@ -1,9 +1,9 @@
 #!/sbin/runscript
-# 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-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $

-opts="reload"
+extra_started_commands="reload"

 depend() {
 	provide logger
--- a/app-admin/rsyslog/rsyslog-5.8.6.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
@ -0,0 +1,253 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.3 2012/01/24 20:32:58 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+HOMEPAGE="http://www.rsyslog.com/"
+SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
+SLOT="0"
+IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
+
+RDEPEND="dbi? ( dev-db/libdbi )
+	extras? ( net-libs/libnet )
+	kerberos? ( virtual/krb5 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	relp? ( >=dev-libs/librelp-0.1.3 )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( net-libs/gnutls )
+	zeromq? ( net-libs/zeromq )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+BRANCH="5-stable"
+
+# need access to certain device nodes
+RESTRICT="test"
+
+# Maitainer note : open a bug to upstream
+# showing that building in a separate dir fails
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+
+src_prepare() {
+	# Maintainer notes:
+	# ZeroMQ support, for now it is done by hand until upstream process bug.
+	# Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
+	if use zeromq; then
+		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
+		epatch ${ZEROPATH}/rsyslog-zeromq.patch
+		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
+	fi
+
+	# Don't force '-g' CFLAG
+	sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * rfc3195 needs a library and development of that library
+	#   is suspended, so we disable it
+	# * About the java GUI:
+	#   The maintainer says there is no real installation support
+	#   for the java GUI, so we disable it for now.
+	local myeconfargs=(
+		--disable-gui
+		--disable-rfc3195
+		--enable-largefile
+		--enable-unlimited-select
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imtemplate
+		--enable-imptcp
+		--enable-mail
+		--enable-omprog
+		--enable-omstdout
+		--enable-omtemplate
+		--enable-omdbalerting
+		--enable-omuxsock
+		--enable-pmlastmsg
+		--enable-pmrfc3164sd
+		--enable-pmcisconames
+		--enable-pmaixforwardedfrom
+		--enable-pmsnare
+		$(use_enable extras omudpspoof)
+		$(use_enable zlib)
+		$(use_enable mysql)
+		$(use_enable dbi libdbi)
+		$(use_enable postgres pgsql)
+		$(use_enable oracle oracle)
+		$(use_enable ssl gnutls)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable relp)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable debug)
+		$(use_enable debug rtinst)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug valgrind)
+	)
+
+	use zeromq && myeconfargs=(
+		${myeconfargs[@]-}
+		$(use_enable zeromq imzeromq)
+		$(use_enable zeromq omzeromq)
+	)
+
+	systemd_to_myeconfargs
+	autotools-utils_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=(doc/)
+	autotools-utils_src_install
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	use static-libs || find "${D}" -name '*.la' -delete || die
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+}
+
+pkg_postinst() {
+	if use mysql || use postgres; then
+		echo
+		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+		elog "  /usr/share/doc/${PF}/scripts"
+	fi
+
+	if use ssl; then
+		echo
+		elog "To create a default CA and certificates for your server and clients, run:"
+		elog "  emerge --config =${PF}"
+		elog "on your logging server. You can run it several times,"
+		elog "once for each logging client. The client certificates will be signed"
+		elog "using the CA certificate generated during the first run."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	CERTDIR="${ROOT}/etc/ssl/${PN}"
+	if [ ! -d "${CERTDIR}" ]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<_EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<_EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<_EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>spamslepnoga@inbox.ru</email>
+  <email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
  <email>maksbotan@gentoo.org</email>
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>spamslepnoga@inbox.ru</email>
+  <email>andreis.vinogradovs@gmail.com</email>
 </maintainer>
 <maintainer>
  <email>maksbotan@gentoo.org</email>
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@ -1,5 +1 @@
-DIST sshguard-1.0.tar.bz2 118988 RMD160 436516e14a72845e7eb5325d6f55496eec9d1762 SHA1 968275288a1aec06737e70cde61fe99063081adc SHA256 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08
-DIST sshguard-1.1.tar.bz2 233308 RMD160 e6e7d6e54b32d67583b0f4140ef8905ef5f5567f SHA1 912c151232bc6b23ce400ef92270c9a7f87a60d1 SHA256 c1b2fcd7c402725958e62808829c82bb4445dcf6a9b27ee07e2ab8a3417bb96f
-DIST sshguard-1.3.tar.bz2 140745 RMD160 792431d6d1c7437734bccca4ec6e1ae1b9c4891c SHA1 4c073086406901bbd55ab669b295a3f12f67994e SHA256 1ff0ea3349c67fdab8f8046eeae6a96046a752ae7458c2259cb31b78c2de08ac
-DIST sshguard-1.4.tar.bz2 152303 RMD160 1a34d29d8849ea279049a8eb24ddef839dafdbf7 SHA1 afd1134199ba41721b3d4032239529040e5dd367 SHA256 d9228c9399c0fffa847ea25d3b4b59c0f23dd72c7cf89b52380fee46e92a0ecf
 DIST sshguard-1.5.tar.bz2 303767 RMD160 7b4625b3b2e0cf974bc935d868b89bd0d8c189e8 SHA1 f8f713bfb3f5c9877b34f6821426a22a7eec8df3 SHA256 b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19
--- a/app-admin/sshguard/sshguard-1.5-r1.ebuild
+++ b/app-admin/sshguard/sshguard-1.5-r1.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-admin/sshguard/sshguard-1.5-r1.ebuild,v 1.1 2011/04/25 04:59:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.5-r1.ebuild,v 1.3 2012/01/15 15:41:08 phajdan.jr Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="ipfilter kernel_FreeBSD kernel_linux"

 CDEPEND="kernel_linux? ( net-firewall/iptables )
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@ -1,2 +1,3 @@
 DIST stow-1.3.3.tar.gz 139417 RMD160 ab192c3c709c11e0a7d39ec8de268ee6be3265f3 SHA1 570c501f8663feb26360db25df0be342278b7b99 SHA256 0cdc7fb7861e83785edd2de127268f8a72ed9ae524ddc4beca236cfd63d1f8b0
 DIST stow-2.1.1.tar.gz 458329 RMD160 1665e6f24b1c1e926e5afe8c80c65f22055dd739 SHA1 9db6f3ad6a181509db3f599adf52dbfaeafe210f SHA256 d88e1b022383ea58147f05587561b3052cadd6dc369f806c16492c159cc06c8e
+DIST stow-2.1.2.tar.gz 460706 RMD160 b1eb20b3c5a8e45e70cdd74686b2a98a963ead0d SHA1 fa59c8a4701cd7fa2842c2ae72cbd99601440e02 SHA256 d523afab21eed8c0a96f1e865439cd42194e9ed42c1adc9c22cf9a50f78a24a6
--- a/app-admin/stow/stow-2.1.2.ebuild
+++ b/app-admin/stow/stow-2.1.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-2.1.2.ebuild,v 1.1 2011/12/19 13:43:12 maksbotan Exp $
+
+EAPI="2"
+
+DESCRIPTION="Manage installation of software in /var/lib/"
+HOMEPAGE="http://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# create new STOWDIR
+	dodir /var/lib/stow
+
+	# install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99stow || die "doenvd failed"
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/stow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264 for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/stow/bin."
+}
--- a/app-admin/sud/files/sud.rc6
+++ b/app-admin/sud/files/sud.rc6
@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/files/sud.rc6,v 1.1 2004/10/26 23:49:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/files/sud.rc6,v 1.2 2011/12/31 18:19:38 idl0r Exp $

 depend() {
 	need net
@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting sud"
 	start-stop-daemon --start --quiet --pidfile /var/run/sud.pid \
-		--startas /usr/sbin/sud
+		--exec /usr/sbin/sud
 	eend $?
 }

--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/sud-1.3-r1.ebuild,v 1.1 2011/12/31 18:19:38 idl0r Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="a daemon to execute processes with special (and customizable) privileges in a nosuid environment."
+HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
+SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+src_prepare() {
+	sed -i -e \
+		's/install-data-hook:$/& install-exec/' \
+		-e \
+		's:chmod 500 $(sbindir)/ilogin:chmod 500 $(DESTDIR)$(sbindir)/ilogin:' \
+		"${S}"/login/Makefile.in || die "sed failed."
+	sed -i -e \
+		's/install-data-hook:$/& install-exec/' \
+		-e \
+		's:chmod 555 $(bindir)/suz:chmod 500 $(DESTDIR)$(bindir)/suz:' \
+		"${S}"/su/Makefile.in || die "sed failed."
+	sed -i -e \
+		's/install-data-hook:$/& install-exec/' \
+		-e \
+		's:chmod 500 $(sbindir)/sud:chmod 500 $(DESTDIR)$(sbindir)/sud:' \
+		"${S}"/sud/Makefile.in || die "sed failed."
+}
+
+src_configure() {
+	append-flags -D_GNU_SOURCE
+	default_src_configure
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog* README NEWS TODO
+	doman ilogin.1 sud.1 suz.1
+	insinto /etc
+	doins miscs/sud.conf*
+	newinitd "${FILESDIR}"/sud.rc6 sud
+}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -2,3 +2,4 @@ DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d
 DIST sudo-1.8.1p2.tar.gz 1238804 RMD160 165029d462e737c885b1d32accb9b2b19411a0fb SHA1 b743b3d7bdb06de68ea24eedfe13530e8fbcae09 SHA256 281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb
 DIST sudo-1.8.2.tar.gz 1465051 RMD160 daebd7f67fff6429c3cb85260e9b11f0c3e28e3c SHA1 6a9400ba3e40394fd9c913219e3b6bb102bb3906 SHA256 37fe6ee670329bc45937fbe402e847f80b3a0a1c8fc9a66487e92b4b810152b0
 DIST sudo-1.8.3p1.tar.gz 1536465 RMD160 7809cbde339220d7dc10ae8da504d5c4e219b55c SHA1 2a7ad912aa8a31706796e5bff8813e4fc7505333 SHA256 1a22635bc5a0a84df273a893c624d45f628c78668317c5bc442dac11db55bb82
+DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
--- a/app-admin/sudo/sudo-1.7.4_p5.ebuild
+++ b/app-admin/sudo/sudo-1.7.4_p5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p5.ebuild,v 1.8 2011/08/11 10:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p5.ebuild,v 1.9 2011/12/29 21:33:54 ulm Exp $

 inherit eutils pam

@ -35,7 +35,7 @@ DEPEND="pam? ( virtual/pam )
 		dev-libs/cyrus-sasl
 	)
 	!pam? ( skey? ( >=sys-auth/skey-1.1.5-r1 ) )
-	app-misc/editor-wrapper
+	>=app-misc/editor-wrapper-3
 	virtual/editor
 	virtual/mta"
 RDEPEND="selinux? ( sec-policy/selinux-sudo )
@ -168,7 +168,7 @@ src_compile() {
 	# audit: somebody got to explain me how I can test this before I
 	# enable it.. — Diego
 	econf --with-secure-path="${ROOTPATH}" \
-		--with-editor=/usr/libexec/gentoo-editor \
+		--with-editor=/usr/libexec/editor \
 		--with-env-editor \
 		$(use_with offensive insults) \
 		$(use_with offensive all-insults) \
--- a/app-admin/sudo/sudo-1.8.1_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_p2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p2.ebuild,v 1.9 2011/09/03 16:08:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p2.ebuild,v 1.10 2011/12/29 20:55:14 halcy0n Exp $

 EAPI=4

@ -28,7 +28,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="as-is BSD"

 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="pam offensive ldap selinux skey"

 DEPEND="pam? ( virtual/pam )
--- a/app-admin/sudo/sudo-1.8.2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.2-r1.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-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.1 2011/10/12 18:50:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.5 2012/01/22 15:35:39 armin76 Exp $

 EAPI=4

@ -28,7 +28,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="as-is BSD"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="pam offensive ldap selinux skey"

 DEPEND="pam? ( virtual/pam )
--- a/app-admin/sudo/sudo-1.8.3_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.3_p2.ebuild
@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p2.ebuild,v 1.7 2012/02/04 15:31:59 armin76 Exp $
+
+EAPI="4"
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="pam offensive ldap selinux skey"
+
+DEPEND="pam? ( virtual/pam )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	virtual/mta"
+DEPEND="${DEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.3_p1-linguas.patch
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . /etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	econf \
+		--enable-zlib=system \
+		--with-secure-path="${ROOTPATH}" \
+		--with-editor=/usr/libexec/editor \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		--without-opie \
+		--without-linux-audit \
+		--with-timedir=/var/db/sudo \
+		--with-plugindir=/usr/$(get_libdir)/sudo \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use ldap ; then
+		dodoc README.LDAP doc/schema.OpenLDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo
+	fperms 0700 /var/db/sudo
+}
+
+pkg_postinst() {
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
--- a/app-admin/sulfur/Manifest
+++ b/app-admin/sulfur/Manifest
@ -4,3 +4,4 @@ DIST entropy-1.0_rc53.tar.bz2 1675138 RMD160 b4ee06b5a9545e9aebb189f984335dd3213
 DIST entropy-1.0_rc59.tar.bz2 1678091 RMD160 ca2c9d7b5b2594ae96a2cb629ae64d97ecee4bde SHA1 c924cfee89464a12e2aa5d66f56164015581c230 SHA256 f41b48bd7ddd4207143c50da244b806e27a7318101f78955e40a054e0fca75ec
 DIST entropy-1.0_rc76.tar.bz2 1717076 RMD160 e25035b9ee93bff9a96aee2bf1f3136038b1df28 SHA1 3440adb1394069cf2aa042cdc9b8f4a7cee6437a SHA256 cc86adba32d27a774bf562d849d3e2bccd37dd0cbc9a3e7386dd5d72168d9d67
 DIST entropy-1.0_rc77.tar.bz2 1718649 RMD160 88a5ec354dfe6f4d00caa89e6f486ec6b448d075 SHA1 c9816883fa8780c2312b3e93d0896e131af3929b SHA256 87df5e618b6cd22ec340980b773331032c786ae0bd173fea8e54a8b091a0532c
+DIST entropy-1.0_rc80.tar.bz2 1721422 RMD160 4dd440f0f9194316ed7d2e114ae7beada242def6 SHA1 2ff10e4980be0cf70e5378165d3d1a7ca3f2d6ac SHA256 26594aa001d129e6d705fc01dd3076283ce071c094da3a14eed7881daeff436e
--- a/app-admin/sulfur/sulfur-1.0_rc80.ebuild
+++ b/app-admin/sulfur/sulfur-1.0_rc80.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sulfur/sulfur-1.0_rc80.ebuild,v 1.1 2011/12/22 17:52:04 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils gnome2-utils fdo-mime python
+
+DESCRIPTION="Sulfur, the Entropy Package Manager Store"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/sulfur"
+
+RDEPEND="dev-python/pygtk:2
+	~sys-apps/entropy-${PV}
+	sys-apps/file[python]
+	sys-devel/gettext
+	x11-libs/vte:0[python]
+	x11-misc/xdg-utils"
+DEPEND="sys-devel/gettext"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	dodir /etc/gconf/schemas
+	insinto /etc/gconf/schemas
+	doins "${S}/misc/entropy-handler.schemas"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	gnome2_gconf_savelist
+	gnome2_gconf_install
+	python_mod_optimize "/usr/lib/entropy/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/${PN}"
+	gnome2_gconf_savelist
+	gnome2_gconf_uninstall
+}
--- a/app-admin/swatch/swatch-3.2.3-r1.ebuild
+++ b/app-admin/swatch/swatch-3.2.3-r1.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-admin/swatch/swatch-3.2.3-r1.ebuild,v 1.3 2011/08/22 14:23:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.2.3-r1.ebuild,v 1.4 2012/02/06 18:58:11 ranger Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 RDEPEND="
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -1,4 +1,3 @@
 DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
 DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a834 SHA1 5541cd6711b7a9d983601d8047b9a27d98ecbe9b SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89
-DIST syslog-ng_3.3.1.tar.gz 2405280 RMD160 f337db97ff445d8bb8a087d1894103443d8d2c2c SHA1 f084d66754c7fa1eada56946f77ef3066faa27a1 SHA256 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
-DIST syslog-ng_3.3.3.tar.gz 2417218 RMD160 b585c9aac9e8f279956054ee7894afb0ecd1bcd2 SHA1 e2ec8ba4bde24809630a7675bf5d97f00be467f8 SHA256 eaea7e42829999925d9f628b1b8b09ef47864c58f61d604a9b6b45f8af9e2d4a
+DIST syslog-ng_3.3.4.tar.gz 2475254 RMD160 234a94e89a47f0520236c8a9a3d586d609a50476 SHA1 3437a50af027f281747087ab47a45aa5fbabbf14 SHA256 a7045694cd079a8efcfd73ca45cb7576f005ba26e6c83ccdfaf3cf81fa4e58aa
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.1-filter.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.1-filter.patch
@ -1,76 +0,0 @@
-commit 4b438115f6387eb52b6c39c1f751ecf0c4a5ac5f
-Author: Balazs Scheidler <bazsi@balabit.hu>
-Date:   Sun Oct 23 20:19:58 2011 +0200
-
-    filters: fixed filter() evaluation when embedded as an AND/OR subexpression
-    
-    When introducing the "init" method for filters one case was omitted: even
-    though AND and OR expressions don't want to do anything on init, their
-    subexpressions might, so this patch adds an init function to AND and OR
-    which does nothing but calls the same for its "left" and "right"
-    subexpression.
-    
-    This patch fixes filter("xxx") expression evaluation when that is
-    not a single expression, but rather included in an AND or OR.
-    
-    Reported-By: Leonid Isaev <lisaev@umail.iu.edu>
-    Cc: <syslog-ng-stable@balabit.hu>
-    Signed-off-by: Balazs Scheidler <bazsi@balabit.hu>
-
--- a/lib/filter.c
-+++ b/lib/filter.c
-@@ -84,6 +84,17 @@ typedef struct _FilterOp
- } FilterOp;
- 
- static void
-+fop_init(FilterExprNode *s, GlobalConfig *cfg)
-+{
-+  FilterOp *self = (FilterOp *) s;
-+
-+  if (self->left && self->left->init)
-+    self->left->init(self->left, cfg);
-+  if (self->right && self->right->init)
-+    self->right->init(self->right, cfg);
-+}
-+
-+static void
- fop_free(FilterExprNode *s)
- {
-   FilterOp *self = (FilterOp *) s;
-@@ -92,6 +103,14 @@ fop_free(FilterExprNode *s)
-   filter_expr_unref(self->right);
- }
- 
-+static void
-+fop_init_instance(FilterOp *self)
-+{
-+  filter_expr_node_init(&self->super);
-+  self->super.init = fop_init;
-+  self->super.free_fn = fop_free;
-+}
-+
- static gboolean
- fop_or_eval(FilterExprNode *s, LogMessage *msg)
- {
-@@ -105,9 +124,8 @@ fop_or_new(FilterExprNode *e1, FilterExprNode *e2)
- {
-   FilterOp *self = g_new0(FilterOp, 1);
-   
-  filter_expr_node_init(&self->super);
-+  fop_init_instance(self);
-   self->super.eval = fop_or_eval;
-  self->super.free_fn = fop_free;
-   self->super.modify = e1->modify || e2->modify;
-   self->left = e1;
-   self->right = e2;
-@@ -128,9 +146,8 @@ fop_and_new(FilterExprNode *e1, FilterExprNode *e2)
- {
-   FilterOp *self = g_new0(FilterOp, 1);
-   
-  filter_expr_node_init(&self->super);
-+  fop_init_instance(self);
-   self->super.eval = fop_and_eval;
-  self->super.free_fn = fop_free;
-   self->super.modify = e1->modify || e2->modify;
-   self->left = e1;
-   self->right = e2;
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
@ -1,85 +0,0 @@
-While most places where OpenSSL was used were guarded by ENABLE_SSL
-ifs, some were not. This patch adds those guards to lib/crypto.c,
-modules/afsql/afsql.c and tests/loggen/loggen.c.
-
-It also makes sure that OPENSSL_LIBS gets emptied when enable_ssl is
-set to no.
-
-Signed-off-by: Gergely Nagy <algernon@balabit.hu>
---
- configure.in          |    4 ++++
- lib/crypto.c          |    4 ++++
- modules/afsql/afsql.c |    3 +++
- tests/loggen/loggen.c |    3 +++
- 4 files changed, 14 insertions(+), 0 deletions(-)
-
--- a/configure.in
-+++ b/configure.in
-@@ -679,6 +679,10 @@ else
-         enable_ssl="no"
- fi
- 
-+if test "x$enable_ssl" = "xno"; then
-+	OPENSSL_LIBS=""
-+fi
-+
- dnl
- dnl Right now, openssl is never linked statically as it is only used by the
- dnl TLS build of the afsocket plugin which is loaded dynamically anyway.
--- a/lib/crypto.c
-+++ b/lib/crypto.c
-@@ -29,6 +29,8 @@
- #include "crypto.h"
- #include "apphook.h"
- 
-+#if ENABLE_SSL
-+
- #include <openssl/rand.h>
- #include <openssl/ssl.h>
- #include <stdio.h>
-@@ -124,3 +126,5 @@ crypto_init(void)
- }
- 
- /* the crypto options (seed) are handled in main.c */
-+
-+#endif
--- a/modules/afsql/afsql.c
-+++ b/modules/afsql/afsql.c
-@@ -35,7 +35,10 @@
- 
- #include <dbi/dbi.h>
- #include <string.h>
-+
-+#if ENABLE_SSL
- #include <openssl/md5.h>
-+#endif
- 
- /* field flags */
- enum
--- a/tests/loggen/loggen.c
-+++ b/tests/loggen/loggen.c
-@@ -14,11 +14,14 @@
- #include <glib.h>
- #include <signal.h>
- 
-+#if ENABLE_SSL
- #include <openssl/crypto.h>
- #include <openssl/x509.h>
- #include <openssl/pem.h>
- #include <openssl/ssl.h>
- #include <openssl/err.h>
-+#endif
-+
- #include <unistd.h>
- 
- #define MAX_MESSAGE_LENGTH 8192
-- 
-1.7.0.4
-
-
-______________________________________________________________________________
-Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
-Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
-FAQ: http://www.balabit.com/wiki/syslog-ng-faq
-
-
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
@ -0,0 +1,10 @@
+--- ./lib/scratch-buffers.c.orig	2012-01-20 17:44:43.871103296 -0500
+++ ./lib/scratch-buffers.c	2012-01-20 17:44:56.313552034 -0500
+@@ -24,6 +24,7 @@
+ 
+ #include "tls-support.h"
+ #include "scratch-buffers.h"
+#include "misc.h"
+ 
+ TLS_BLOCK_START
+ {
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST elektra-0.7.1.tar.gz 1347524 RMD160 2b9153b508a535c80fef2795955eb98a8dfeb968 SHA1 bcc733cab0b391e5790c05635ab7161d9bdcaffa SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c`