Added nozomi ebuild. Rmoved oboslete ebuilds

2026-03-16 16:43:34 +01:00 · 2010-03-27 10:31:06 +01:00
parent 58e78d874f
commit 1007f22387
84 changed files with 139 additions and 11697 deletions
--- a/app-dicts/ydpdict/Manifest
+++ b/app-dicts/ydpdict/Manifest
@@ -1,8 +0,0 @@
 DIST ydpdict-0.66.tar.gz 69328 RMD160 b8d49f79e5ab0428f0d76dd583d30036218bea78 SHA1 48f44041694604f27a99fe14b656eecc43440125 SHA256 3481cc092be8fff571aa7e5de23bf23bb77a4bcc1d9bda8651b559e116aeb5fa
 EBUILD ydpdict-0.66-r1.ebuild 146 RMD160 ebdd14d8b4dffd6d79d8de8e8490b7ccd5b2f78c SHA1 ba26886b26fe842b094c12393935ed491f5dd325 SHA256 dee96b8ab7ca5120249b3a1f209cc28fbdf67ef121d36210b420eac8510783fc
 MD5 b7a51f9ad22b8a7415c1825a63371d95 ydpdict-0.66-r1.ebuild 146
 RMD160 ebdd14d8b4dffd6d79d8de8e8490b7ccd5b2f78c ydpdict-0.66-r1.ebuild 146
 SHA256 dee96b8ab7ca5120249b3a1f209cc28fbdf67ef121d36210b420eac8510783fc ydpdict-0.66-r1.ebuild 146
 MD5 a46788a6e204894a53165df3ed99dabb files/digest-ydpdict-0.66-r1 235
 RMD160 25b3076e657c9bade345c3911e520df0c0eb6912 files/digest-ydpdict-0.66-r1 235
 SHA256 8a289b81af3978e2ff56747f6d86994ee9499afea1842a10e1aaf205b450b3a2 files/digest-ydpdict-0.66-r1 235
--- a/app-dicts/ydpdict/files/digest-ydpdict-0.66-r1
+++ b/app-dicts/ydpdict/files/digest-ydpdict-0.66-r1
@@ -1,3 +0,0 @@
 MD5 df6bf6196f15cde40bf71591948f61bf ydpdict-0.66.tar.gz 69328
 RMD160 b8d49f79e5ab0428f0d76dd583d30036218bea78 ydpdict-0.66.tar.gz 69328
 SHA256 3481cc092be8fff571aa7e5de23bf23bb77a4bcc1d9bda8651b559e116aeb5fa ydpdict-0.66.tar.gz 69328
--- a/app-dicts/ydpdict/ydpdict-0.66-r1.ebuild
+++ b/app-dicts/ydpdict/ydpdict-0.66-r1.ebuild
@@ -1,8 +0,0 @@
 SRC_URI="http://toxygen.net/ydpdict/${P}.tar.gz"
 src_compile() {
 	econf || die 
 	emake || die "emake failed"
 }
 src_install() {
 	einstall || die
 }
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,10 +0,0 @@
 DIST darkplacesengine20070412.zip 7553215 RMD160 83cb59e5fc9b50d9b5aeff2daa90ea73a22c8464 SHA1 54fe69e533785e9c0e8652456caebc0ba498decd SHA256 c7955b8e4ecdacf0318c32b6d3084d48d95f07f6b635b6e4f02cce966ae66ebc
 DIST fuhquake-lits.rar 8388829 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 SHA1 1e9199c8ac7c9162e43c621487b712551711a45e SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
 DIST id1.pk3 350470 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c SHA1 f83c25b74f666665369783b0f08949d480b382a8 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
 EBUILD darkplaces-20070412.ebuild 4995 RMD160 93d977ffbd916444a465663e9cbc5742eaaf275d SHA1 92c41cf6d928c1b764af62a492ceb008c364c3ac SHA256 e53e28499802dfc577ae2cf4063997c7a29d28f078798e444b05ebab0d01f922
 MD5 1fbda38ae8b9f952232aad3b801eb6da darkplaces-20070412.ebuild 4995
 RMD160 93d977ffbd916444a465663e9cbc5742eaaf275d darkplaces-20070412.ebuild 4995
 SHA256 e53e28499802dfc577ae2cf4063997c7a29d28f078798e444b05ebab0d01f922 darkplaces-20070412.ebuild 4995
 MD5 f4480610e4ff23f99123aa5140c62fe2 files/digest-darkplaces-20070412 705
 RMD160 9780705f402d66268673006db7a391d8940dd86b files/digest-darkplaces-20070412 705
 SHA256 c06a73eeafd61bbb02c90c1faad8cb70917fad203b8938fa2ecf5ff4cc12767f files/digest-darkplaces-20070412 705
--- a/games-fps/darkplaces/darkplaces-20070412.ebuild
+++ b/games-fps/darkplaces/darkplaces-20070412.ebuild
@@ -1,200 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 inherit eutils flag-o-matic games
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
 MY_PV=${PV/_beta/beta}
 MY_ENGINE="${PN}engine${MY_PV}.zip"
 # Different Quake 1 engines expect the lights in different directories
 # http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
 MY_LIGHTS="fuhquake-lits.rar"
 DESCRIPTION="Enhanced engine for iD Software's Quake 1"
 HOMEPAGE="http://icculus.org/twilight/darkplaces/"
 SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 	lights? (
 		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
 		http://www.kgbsyndicate.com/romi/id1.pk3 )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo doe lights opengl oss sdl skins soa textures"
 UIRDEPEND="media-libs/jpeg
 	media-libs/libogg
 	media-libs/libvorbis
 	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
 	sdl? ( media-libs/libsdl )
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
 	x11-libs/libXxf86dga
 	x11-libs/libXxf86vm"
 UIDEPEND="x11-proto/xextproto
 	x11-proto/xf86dgaproto
 	x11-proto/xf86vidmodeproto
 	x11-proto/xproto"
 RDEPEND="net-misc/curl
 	cdinstall? ( games-fps/quake1-data )
 	demo? ( games-fps/quake1-demodata )
 	doe? ( games-fps/quake1-doe )
 	skins? ( games-fps/quake1-skins )
 	soa? ( games-fps/quake1-soa )
 	textures? ( >=games-fps/quake1-textures-20050820 )
 	opengl? ( ${UIRDEPEND} )
 	!opengl? ( sdl? ( ${UIRDEPEND} ) )
 	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
 DEPEND="lights? ( || (
 			app-arch/unrar
 			app-arch/rar ) )
 	opengl? (
 		${UIRDEPEND}
 		${UIDEPEND} )
 	!opengl? ( sdl? (
 		${UIRDEPEND}
 		${UIDEPEND} ) )
 	!opengl? ( !sdl? ( !dedicated? (
 		${UIRDEPEND}
 		${UIDEPEND} ) ) )
 	dev-util/pkgconfig
 	app-arch/unzip"
 S=${WORKDIR}/${PN}
 dir=${GAMES_DATADIR}/quake1
 opengl_client() {
 	if use opengl || ( ! use dedicated && ! use sdl ) ; then
 		# Build OpenGL client
 		return 0
 	fi
 	return 1
 }
 pkg_setup() {
 	games_pkg_setup
 	if opengl_client && ! use opengl ; then
 		ewarn "Defaulting to OpenGL client"
 	fi
 }
 src_unpack() {
 	if use lights ; then
 		unpack "${MY_LIGHTS}"
 		unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
 		mv *.lit maps/ || die
 		mv ReadMe.txt rtlights.txt
 	fi
 	unpack "${MY_ENGINE}"
 	unpack ./${PN}*.zip
 	rm README-SDL.txt
 	cd "${S}"
 	rm mingw_note.txt
 	# Only additional CFLAGS optimization is the -march flag
 	local march=$(get-flag -march)
 	sed -i \
 		-e '/^CC=/d' \
 		-e "s:-lasound:$(pkg-config --libs alsa):" \
 		-e "s:CPUOPTIMIZATIONS=:CPUOPTIMIZATIONS=${march}:" \
 		-e "s:strip:#strip:" \
 		makefile.inc || die "sed makefile.inc failed"
 	if ! use cdsound ; then
 		# Turn the CD accesses off
 		sed -i \
 			-e "s:/dev/cdrom:/dev/null:" \
 			cd_linux.c || die "sed cd_linux.c failed"
 		sed -i \
 			-e 's:COM_CheckParm("-nocdaudio"):1:' \
 			cd_shared.c || die "sed cd_shared.c failed"
 	fi
 }
 src_compile() {
 	local opts="DP_FS_BASEDIR=\"${dir}\""
 	# Preferred sound is alsa
 	local sound_api="NULL"
 	use oss && sound_api="OSS"
 	use alsa && sound_api="ALSA"
 	opts="${opts} DP_SOUND_API=${sound_api}"
 	local type="release"
 	use debug && type="debug"
 	# Only compile a maximum of 1 client
 	if use sdl ; then
 		emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed"
 	elif opengl_client ; then
 		emake ${opts} "cl-${type}" || die "emake cl-${type} failed"
 	fi
 	if use dedicated ; then
 		emake ${opts} "sv-${type}" || die "emake sv-${type} failed"
 	fi
 }
 src_install() {
 	if opengl_client || use sdl ; then
 		local type="glx"
 		use sdl && type="sdl"
 		# darkplaces executable is needed, even just for demo
 		newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed"
 		newicon darkplaces72x72.png ${PN}.png || die "newicon failed"
 		if use demo ; then
 			# Install command-line for demo, even if not desktop entry
 			games_make_wrapper ${PN}-demo "${PN} -game demo"
 		fi
 		if use demo && ! use cdinstall ; then
 			make_desktop_entry ${PN}-demo "Dark Places (Demo)"
 		else
 			# Full version takes precedence over demo
 			make_desktop_entry ${PN} "Dark Places"
 		fi
 		# The wrapper & desktop entry for doe & soe are in their own ebuilds
 	fi
 	if use dedicated ; then
 		newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
 	fi
 	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
 	if use lights ; then
 		insinto "${dir}"/id1
 		doins -r "${WORKDIR}"/{cubemaps,maps} \
 			|| die "doins cubemaps maps failed"
 		if use demo ; then
 			# Set up symlinks, for the demo levels to include the lights
 			local d
 			for d in cubemaps maps ; do
 				dosym "${dir}/id1/${d}" "${dir}/demo/${d}" || die
 			done
 		fi
 	fi
 	prepgamesdirs
 }
 pkg_postinst() {
 	games_pkg_postinst
 	if ! use cdinstall && ! use demo ; then
 		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
 	fi
 	if use sdl ; then
 		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
 	fi
 }
--- a/games-fps/darkplaces/files/digest-darkplaces-20070412
+++ b/games-fps/darkplaces/files/digest-darkplaces-20070412
@@ -1,9 +0,0 @@
 MD5 4916a8e9c5b027872e9b76a2b62ec3b7 darkplacesengine20070412.zip 7553215
 RMD160 83cb59e5fc9b50d9b5aeff2daa90ea73a22c8464 darkplacesengine20070412.zip 7553215
 SHA256 c7955b8e4ecdacf0318c32b6d3084d48d95f07f6b635b6e4f02cce966ae66ebc darkplacesengine20070412.zip 7553215
 MD5 9e345bee7f331652c2e926e705d25b19 fuhquake-lits.rar 8388829
 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 fuhquake-lits.rar 8388829
 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c fuhquake-lits.rar 8388829
 MD5 b3121016aef3532703a5465dd9960808 id1.pk3 350470
 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c id1.pk3 350470
 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc id1.pk3 350470
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,22 +0,0 @@
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 AUX gdm-2.13.0.7-gdm-dmx-intllibs.patch 894 RMD160 a53dfd904b01ac6e265bf8ac23db69e476c4695a SHA1 835c5f990608df12aa1039f1efa04c961a2213b0 SHA256 d90f0004ccb88efb00498fcec0a1839cb1a167e5a30d1369dc234a1d7c8068f6
 MD5 7335514ee6ae656202ed2b442524a5ed files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
 RMD160 a53dfd904b01ac6e265bf8ac23db69e476c4695a files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
 SHA256 d90f0004ccb88efb00498fcec0a1839cb1a167e5a30d1369dc234a1d7c8068f6 files/gdm-2.13.0.7-gdm-dmx-intllibs.patch 894
 AUX gdm-2.16.2-gksu.patch 584 RMD160 2a5a15de412910c1f30c22bcd78190b2cb75921c SHA1 5918109f2ad28e909bc5488d25deacb932a98163 SHA256 3208bc0025bb9e02104bb1b1dd6a3de550a4cd6e0be6546c3bae60ab5af08f8d
 MD5 e7b6239a767727a16557ddf5ae59b13a files/gdm-2.16.2-gksu.patch 584
 RMD160 2a5a15de412910c1f30c22bcd78190b2cb75921c files/gdm-2.16.2-gksu.patch 584
 SHA256 3208bc0025bb9e02104bb1b1dd6a3de550a4cd6e0be6546c3bae60ab5af08f8d files/gdm-2.16.2-gksu.patch 584
 DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.16.7.ebuild 4834 RMD160 aa52289986a32ea6d5b35afc5c9a73986e1f7b0e SHA1 d92fa40f25a9eae80c45895dda5da94442ba192e SHA256 0cbd538029d080a651ebeb93c499c2f8354f38f581406146f8e28c51d21ebfa6
 MD5 cad8ff10238e5fc110a7a4b5a0335a18 gdm-2.16.7.ebuild 4834
 RMD160 aa52289986a32ea6d5b35afc5c9a73986e1f7b0e gdm-2.16.7.ebuild 4834
 SHA256 0cbd538029d080a651ebeb93c499c2f8354f38f581406146f8e28c51d21ebfa6 gdm-2.16.7.ebuild 4834
 MD5 fd4e9b38373f89e0b184a0d5a3f6fb06 files/digest-gdm-2.16.7 768
 RMD160 fae6c3d2d91fddd3c572330a4cd5bc47ab2f7c06 files/digest-gdm-2.16.7 768
 SHA256 ce9e9e188f04b6e2057146e034b6777c85c58675ea9375c7ec849c2e72347f10 files/digest-gdm-2.16.7 768
--- a/gnome-base/gdm/files/digest-gdm-2.16.7
+++ b/gnome-base/gdm/files/digest-gdm-2.16.7
@@ -1,9 +0,0 @@
 MD5 5d3634071a117113b27b28446d7a285a gdm-2.16.7.tar.bz2 3152229
 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 gdm-2.16.7.tar.bz2 3152229
 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881 gdm-2.16.7.tar.bz2 3152229
 MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
 MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
--- a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
+++ b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
@@ -1,24 +0,0 @@
 diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure gdm-2.13.0.1/configure
 --- gdm-2.13.0.1.orig/configure	2005-11-14 17:34:33.000000000 -0500
 +++ gdm-2.13.0.1/configure	2005-11-18 14:59:31.000000000 -0500
@@ -31700,7 +31700,7 @@
 #define HAVE_SELINUX 1
 _ACEOF
 -	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
 +	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
 fi
 #
 diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac
 --- gdm-2.13.0.1.orig/configure.ac	2005-11-14 17:13:40.000000000 -0500
 +++ gdm-2.13.0.1/configure.ac	2005-11-18 14:59:23.000000000 -0500
@@ -750,7 +750,7 @@
 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
 	AC_DEFINE(HAVE_SELINUX)
 -	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
 +	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
 fi
 #
--- a/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
+++ b/gnome-base/gdm/files/gdm-2.13.0.7-gdm-dmx-intllibs.patch
@@ -1,22 +0,0 @@
 diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c
 --- gdm-2.13.0.7.orig/utils/gdm-dmx-reconnect-proxy.c	2006-01-18 18:33:17.000000000 -0500
 +++ gdm-2.13.0.7/utils/gdm-dmx-reconnect-proxy.c	2006-01-31 15:59:04.000000000 -0500
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 +#include <locale.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dmxext.h>
 diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.7.orig/utils/Makefile.am gdm-2.13.0.7/utils/Makefile.am
 --- gdm-2.13.0.7.orig/utils/Makefile.am	2006-01-15 16:26:35.000000000 -0500
 +++ gdm-2.13.0.7/utils/Makefile.am	2006-01-31 15:51:20.000000000 -0500
@@ -52,6 +52,7 @@
 	gdm-dmx-reconnect-proxy.c
 gdm_dmx_reconnect_proxy_LDADD = \
 +	$(INTLLIBS)		\
 	$(GLIB_LIBS) \
 	$(X_EXTRA_LIBS) \
 	$(X_LIBS) \
--- a/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
+++ b/gnome-base/gdm/files/gdm-2.16.2-gksu.patch
@@ -1,14 +0,0 @@
 diff --exclude-from=/home/dang/.diffrc -up -ruN gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in gdm-2.16.1/gui/gdmsetup.desktop.in.in
 --- gdm-2.16.1.orig/gui/gdmsetup.desktop.in.in	2006-04-17 14:38:19.000000000 -0400
 +++ gdm-2.16.1/gui/gdmsetup.desktop.in.in	2006-11-06 15:44:18.000000000 -0500
@@ -3,8 +3,8 @@ Encoding=UTF-8
 _Name=Login Window
 _GenericName=Login Window Preferences
 _Comment=Configure the login window (GNOME Display Manager)
 -TryExec=@sbindir@/gdmsetup
 -Exec=gdmsetup
 +TryExec=@sbindir@/gdmsetup
 +Exec=gksu gdmsetup
 Icon=gdm-setup
 StartupNotify=true
 Terminal=false
--- a/gnome-base/gdm/gdm-2.16.7.ebuild
+++ b/gnome-base/gdm/gdm-2.16.7.ebuild
@@ -1,180 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.16.7.ebuild,v 1.7 2007/08/11 15:14:31 beandog Exp $
 inherit eutils pam gnome2
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="http://www.gnome.org/projects/gdm/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="accessibility ipv6 pam selinux tcpd xinerama"
 # Name of the tarball with gentoo specific files
 GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
 SRC_URI="${SRC_URI}
 	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
 	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
 RDEPEND="pam? ( virtual/pam )
 	!pam? ( kernel_linux? ( sys-apps/shadow ) )
 	>=dev-libs/glib-2.8
 	>=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.3
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/librsvg-1.1.1
 	>=dev-libs/libxml2-2.4.12
 	>=media-libs/libart_lgpl-2.3.11
 	selinux? ( sys-libs/libselinux )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	x11-libs/libX11
 	x11-libs/libXdmcp
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXinerama
 	x11-libs/libdmx
 	x11-libs/libXau
 	x11-apps/sessreg
 	accessibility? ( x11-libs/libXevie )"
 DEPEND="${RDEPEND}
 	x11-proto/inputproto
 	x11-proto/dmxproto
 	x11-libs/gksu
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
 	>=app-text/scrollkeeper-0.1.4"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
 pkg_setup() {
 	G2CONF="--sysconfdir=/etc/X11         \
 		--localstatedir=/var              \
 		--with-xdmcp                      \
 		--with-pam-prefix=/etc            \
 		$(use_enable accessibility xevie) \
 		$(use_enable ipv6)                \
 		$(use_with selinux)               \
 		$(use_with tcpd tcp-wrappers)     \
 		$(use_with xinerama)"
 	if use pam; then
 		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
 	else
 		G2CONF="${G2CONF} --enable-console-helper=no \
 			--enable-authentication-scheme=shadow"
 	fi
 	enewgroup gdm
 	enewuser gdm -1 -1 /var/lib/gdm gdm
 }
 src_unpack() {
 	gnome2_src_unpack
 	# remove unneeded linker directive for selinux (#41022)
 	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
 	# Fix missing intllib
 	epatch ${FILESDIR}/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
 	# Add gksu to gdmsetup menu entry
 	epatch ${FILESDIR}/${PN}-2.16.2-gksu.patch
 }
 src_install() {
 	gnome2_src_install
 	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
 	# gdm-binary should be gdm to work with our init (#5598)
 	rm -f ${D}/usr/sbin/gdm
 	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
 	# our x11's scripts point to /usr/bin/gdm
 	dosym /usr/sbin/gdm-binary /usr/bin/gdm
 	# log, etc.
 	keepdir /var/log/gdm
 	keepdir /var/gdm
 	chown root:gdm ${D}/var/gdm
 	chmod 1770 ${D}/var/gdm
 	# use our own session script
 	rm -f ${D}/etc/X11/gdm/Xsession
 	exeinto /etc/X11/gdm
 	doexe ${gentoodir}/Xsession
 	# add a custom xsession .desktop by default (#44537)
 	exeinto /etc/X11/dm/Sessions
 	doexe ${gentoodir}/custom.desktop
 	# We replace the pam stuff by our own
 	rm -rf ${D}/etc/pam.d
 	dopamd ${gentoodir}/pam.d/*
 	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
 	# use graphical greeter local
 	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
 		/usr/share/gdm/defaults.conf
 	# list available users
 	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
 	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
 	# Fix old X11R6 paths
 	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
 	# Move Gentoo theme in
 	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
 }
 pkg_postinst() {
 	gnome2_pkg_postinst
 	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
 	elog "and then execute 'rc-update add xdm default'."
 	elog "GDM has changed the location of its configuration file.  Please"
 	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
 	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
 	elog "See README.install for more information about the change."
 	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
 		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
 		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
 		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
 	fi
 	# Soft restart, assumes Gentoo defaults for file locations
 	# Do restart after gdm.conf move above
 	FIFOFILE=/var/gdm/.gdmfifo
 	PIDFILE=/var/run/gdm.pid
 	if [ -w ${FIFOFILE} ] ; then
 		if [ -f ${PIDFILE} ] ; then
 			if kill -0 `cat ${PIDFILE}`; then
 				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
 			fi
 		fi
 	fi
 }
 pkg_postrm() {
 	gnome2_pkg_postrm
 	elog "To remove GDM from startup please execute"
 	elog "'rc-update del xdm default'"
 }
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,310 +0,0 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.83 2006/07/25 10:20:01 leonardop Exp $
 *libglade-2.6.0 (25 Jul 2006)
  25 Jul 2006; Leonardo Boshell <leonardop@gentoo.org>
  +libglade-2.6.0.ebuild:
  New release.
  18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> libglade-2.5.1.ebuild:
  Add ~x86-fbsd keyword.
  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
  Marked stable on amd64 for bug #139612
  09 Oct 2005; Hardave Riar <hardave@gentoo.org> libglade-2.5.1.ebuild:
  Stable on mips.
  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> libglade-2.5.1.ebuild:
  Mark 2.5.1 stable on alpha
  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> libglade-2.5.1.ebuild:
  stable on ia64
  08 Aug 2005; Markus Rothe <corsair@gentoo.org> libglade-2.5.1.ebuild:
  Stable on ppc64
  02 Aug 2005; Simon Stelling <blubb@gentoo.org> libglade-2.5.1.ebuild:
  stable on amd64
  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
  libglade-2.5.1.ebuild:
  ppc stable
  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> libglade-2.5.1.ebuild:
  Stable on hppa.
  26 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> libglade-2.5.1.ebuild:
  Stable on sparc
  25 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> libglade-2.5.1.ebuild:
  Stable on x86.
  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> libglade-2.5.0.ebuild:
  stable on mips
  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> libglade-2.5.0.ebuild:
  Stable on alpha.
  25 Jun 2005; Guy Martin <gmsoft@gentoo.org> libglade-2.5.0.ebuild:
  Stable on hppa.
  13 Jun 2005; Markus Rothe <corsair@gentoo.org> libglade-2.5.0.ebuild:
  Stable on ppc64
  12 Jun 2005; Olivier Crête <tester@gentoo.org> libglade-2.5.0.ebuild:
  Stable on amd64
  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
  libglade-2.5.0.ebuild:
  Stable on ppc.
  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> libglade-2.5.0.ebuild:
  Stable on sparc
  18 May 2005; Jason Wever <weeve@gentoo.org> libglade-2.4.2.ebuild:
  Stable on SPARC.
  12 May 2005; Leonardo Boshell <leonardop@gentoo.org> libglade-0.17-r6.ebuild,
  libglade-2.0.1.ebuild, libglade-2.3.6.ebuild:
  Corrected small typo in DESCRIPTION. Removed outdated ebuilds.
  11 May 2005; Guy Martin <gmsoft@gentoo.org> libglade-2.4.2.ebuild:
  Stable on hppa.
  08 May 2005; Herbie Hopkins <herbs@gentoo.org> libglade-2.4.2.ebuild:
  Stable on amd64.
  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libglade-2.4.2.ebuild:
  Stable on alpha + ia64.
  25 Apr 2005; Mike Gardiner <obz@gentoo.org> libglade-2.4.2.ebuild:
  Keyworded ppc x86
 *libglade-2.5.1 (20 Mar 2005)
  20 Mar 2005; Joe McCann <joem@gentoo.org> +libglade-2.5.1.ebuild:
  new version
 *libglade-2.5.0 (08 Mar 2005)
  08 Mar 2005; Joe McCann <joem@gentoo.org> +libglade-2.5.0.ebuild:
  gnome-2.10 release
 *libglade-2.4.2 (12 Feb 2005)
  12 Feb 2005; Joe McCann <joem@gentoo.org>
  -files/Makefile.in.am-2.4.1-xmlcatalog.patch,
  +files/Makefile.in.am-2.4.2-xmlcatalog.patch, -libglade-2.4.1.ebuild,
  +libglade-2.4.2.ebuild:
  Bug fix release. Fixes toolbar breakage from previous release.
  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
  Change encoding to UTF-8 for GLEP 31 compliance
  16 Dec 2004; Markus Rothe <corsair@gentoo.org> libglade-0.17-r6.ebuild:
  Stable on ppc64
 *libglade-2.4.1 (06 Dec 2004)
  06 Dec 2004; Mike Gardiner <obz@gentoo.org> +libglade-2.4.1.ebuild:
  New version, had to rework the patch slightly to fit the new Makefile.am/in
  05 Nov 2004; Markus Rothe <corsair@gentoo.org> libglade-0.17-r6.ebuild:
  Marked ~ppc64; bug #69450
  01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> libglade-2.4.0.ebuild:
  stable on mips
  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> libglade-2.4.0.ebuild:
  Stable on alpha.
  07 Aug 2004; Travis Tilley <lv@gentoo.org> libglade-2.4.0.ebuild:
  stable on amd64
  08 Aug 2004; Tom Martin <slarti@gentoo.org> libglade-0.17-r6.ebuild:
  Typo in DESCRIPTION: tuntime -> runtime. Bug 59717.
  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> libglade-2.4.0.ebuild:
  Stable on sparc
  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> libglade-2.4.0.ebuild:
  Stable on hppa.
  31 Jul 2004; <spider@gentoo.org> libglade-2.4.0.ebuild:
  stable on x86 for gnome 2.6.2
  13 Jul 2004; Tom Gall <tgall@gentoo.org> libglade-2.4.0.ebuild:
  stable on ppc64 bug #58191
  13 Jul 2004; Tom Gall <tgall@gentoo.org> libglade-2.4.0.ebuild:
  ~ppc64 bug #54807
  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> libglade-2.3.6.ebuild:
  Stable on alpha.
  19 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> libglade-2.3.6.ebuild:
  Stable on sparc
  04 Jun 2004; Stephen P. Becker <geoman@gentoo.org> libglade-2.3.6.ebuild:
  Stable on mips.
 *libglade-2.4.0 (30 May 2004)
  30 May 2004; foser <foser@gentoo.org> libglade-2.4.0.ebuild :
  New release
  29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
  libglade-2.3.6.ebuild:
  Masked libglade-2.3.6.ebuild stable for ppc
  25 May 2004; Guy Martin <gmsoft@gentoo.org> libglade-2.3.6.ebuild:
  Marked stable on hppa.
  13 May 2004; Stephen P. Becker <geoman@gentoo.org> libglade-0.17-r6.ebuild:
  Keyworded mips to satisfy repoman deps for xmms.
  13 May 2004; Stephen P. Becker <geoman@gentoo.org> libglade-2.0.1.ebuild:
  Added gnuconfig_update configure fix for mips.
  13 May 2004; Stephen P. Becker <geoman@gentoo.org> libglade-2.0.1.ebuild:
  Stable on mips.
 *libglade-2.3.6 (20 Mar 2004)
  20 Mar 2004; foser <foser@gentoo.org> libglade-2.3.6.ebuild :
  Gnome 2.6 commit
  Fix license
  14 Mar 2004; Stephen P. Becker <geoman@gentoo.org> libglade-2.0.1.ebuild:
  Added ~mips keyword.
  10 Jan 2004; <agriffis@gentoo.org> libglade-0.17-r6.ebuild:
  stable on ia64
  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> libglade-2.0.1.ebuild:
  Stable on ia64
  29 Sep 2003; foser <foser@gentoo.org> libglade-0.17-r6.ebuild :
  And fix this SRC_URI back, gnome.org doesn't work correctly (#29983)
  28 Sep 2003; foser <foser@gentoo.org> libglade-*.ebuild :
  Removed SRC_URIs in favour of gnome.org eclass handling (#29831)
  10 Sep 2003; Mike Gardiner <obz@gentoo.org> libglade-2.0.1.ebuild,
  files/Makefile.in.am-xmlcatalog.patch:
  Added a patch to disable xmlcatalog, re bug: #26216
  29 Aug 2003; Alastair Tse <liquidx@gentoo.org> libglade-2.0.0.ebuild,
  libglade-2.0.1.ebuild:
  renamed pyxml
  04 Feb 2003; Aron Griffis <agriffis@gentoo.org> libglade-0.17-r6.ebuild :
  Mark stable on alpha
  16 Dec 2002; Aron Griffis <agriffis@gentoo.org> libglade-0.17-r6.ebuild :
  Added ~alpha to KEYWORDS
  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 *libglade-2.0.1 (06 Sep 2002)
  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> libglade-2.0.1.ebuild :
  Added hppa to KEYWORDS.
  13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
  libglade-2.0.1.ebuild:
  gettext is only required if you use nls
  06 Sep 2002 ; Spider <spider@gentoo.org> libglade-2.0.1.ebuild :
  new version
 *libglade-2.0.0-r1 (05 Aug 2002)
  05 Aug 2002; Spider <spider@gentoo.org> libglade-2.0.0-r1.ebuild :
  updated to use gnome2.eclass
  mirror://  generally cleaner and hopefully this gets rid of the libtool related bugs we had
 *libglade-2.0.0 (6 June 2002)
  23 Jul 2002; Mark Guertin <gerk@gentoo.org> :
  Added ppc to keywords
  06 June 2002; Gabriele Giorgetti <stroke@gentoo.org> libglade-2.0.0.ebuild :  
  new version
 libglade-1.99.12-r2 (28 May 2002)
  23 Jul 2002; Mark Guertin <gerk@gentoo.org> :
  Added ppc to keywords
  28 May 2002; Spider <spider@gentoo.org> libglade-1.99.12-r2.ebuild :
  make it depend on dev-python/PyXML, that verifies it to build
  libglade-convert and no rebuild of python after expat is installed is
  needed. great!
 libglade-1.99.12-r1 (12 May 2002)
  12 May 2002; Spider <spider@gentoo.org> libglade-1.99.12-r1.ebuild :
  Update a dependency on app-text/docbook-xml-dtd as to not make the xml catalog installation bail out
 libglade-1.99.12-r1 (12 May 2002) 
  12 May 2002; Spider <spider@gentoo.org> libglade-1.99.12-r1.ebuild :
  use doc
  lintool fixes
 *libglade-1.99.12 (12 May 2002)
  12 May 2002; Spider <spider@gentoo.org> libglade-1.99.12.ebuild :
  Updated version, copy the old one 
 *libglade-1.99.11 (29 Apr 2002) 
  29 Apr 2002; Spider <spider@gentoo.org> libglade-1.99.11.ebuild :
  new version (.10 too, forgot the changelog)
  a patch for xml stuff as to not break sandbox
  lintool fixes
 *libglade-0.17-r6 (25 Apr 2002)
  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> libglade-0.17-r6.ebuild :
  Added hppa to KEYWORDS.
  08 Dec 2002; Martin Holzer <mholzer@gentoo.org> libglade-0.17-r6.ebuild Changelog :
  Fixed SRC_URI.
  01 Oct 2002; Martin Schlemmer <azarah@gentoo.org> libglade-0.17-r6.ebuild :
  Libtoolize in hopes of fixing bug #7915.
 *libglade-0.17-r5 (24 Apr 2002)
  24 Apr 2002; Spider <spider@gentoo.org> libglade-0.17-r5.ebuild :
  SLOTify
 *libglade-0.17-r5 (9 Apr 2002)
  9 Apr 2002; M.Schlemmer <azarah@gentoo.org> libglade-0.17-r5.ebuild
  Fix build in console.  Add gnome-libs back as a perm depend again, as
  libglade needs gnome-libs.
 *libglade-0.17-r4 (30 Mar 2002)
  30 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libglade-0.17-r4.ebuild :
  OK, I tried to be clever and separate out gnome support from a library that
  actually comes from GNOME.  Therefore, if gnome-libs is installed now, 
  gnome support will happen automatically.
 *libglade-0.17-r4 (29 Mar 2002)
  29 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libglade-0.17-r4.ebuild :
  gnome is now an optional dependency, and USE dependent bonobo support
  is now compilable, because the libglade dependency in gnome-print has been
  sorted out.  This means the end of circular dependencies, hopefully.
 *libglade-0.17-r3 (1 Feb 2002)
  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
  Added initial ChangeLog which should be updated whenever the package is
  updated in any way. This changelog is targetted to users. This means that the
  comments should well explained and written in clean English. The details about
  writing correct changelogs are explained in the skel.ChangeLog file which you
  can find in the root directory of the portage repository.
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,16 +0,0 @@
 DIST libglade-0.17.tar.gz 418921 RMD160 d401764bbb5c8b6af9b9c1fbd6e9c6b3483f27c8 SHA1 66dbb90ffcfe80c551d2f3a296729ceab527cbc0 SHA256 d65a4909298e6ac33210f513b50d9ea8e0b201742566a218f31d4f685133a48c
 EBUILD libglade-0.17-r6.ebuild 1518 RMD160 82aafb9fd0a155dbaf843458c4312d6fe21c722d SHA1 b987fa9186b72a41856e298dc365be8e198b271e SHA256 bfdae8fe759697aed47f41216fb6eb59f5c3c025ef9a1889df359f0c5138f9c8
 MD5 f47baad5df40e8ebd1a1d1b80123a112 libglade-0.17-r6.ebuild 1518
 RMD160 82aafb9fd0a155dbaf843458c4312d6fe21c722d libglade-0.17-r6.ebuild 1518
 SHA256 bfdae8fe759697aed47f41216fb6eb59f5c3c025ef9a1889df359f0c5138f9c8 libglade-0.17-r6.ebuild 1518
 MISC ChangeLog 10346 RMD160 f12cf1607f6f23e3d3b8054d7f42bc0f26697d8c SHA1 4f6c83979734a0b4db8ed28d1ad5a09f1f1866ce SHA256 ca86b48540a4477eb3fd495b99eebf7aba52f3b4ebb146be4a64b1e695521dc4
 MD5 620127a119e67c5153e99ddc5d46525f ChangeLog 10346
 RMD160 f12cf1607f6f23e3d3b8054d7f42bc0f26697d8c ChangeLog 10346
 SHA256 ca86b48540a4477eb3fd495b99eebf7aba52f3b4ebb146be4a64b1e695521dc4 ChangeLog 10346
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
 MD5 667d7076e87f153969ec4346d73d3059 files/digest-libglade-0.17-r6 241
 RMD160 b8d5c9113162fe48aadb1ee1f4d120a829b5355f files/digest-libglade-0.17-r6 241
 SHA256 b7597aa8c981ccc92e29bc70c175f846077cc3a86320a9bf733049540fc1f3cb files/digest-libglade-0.17-r6 241
--- a/gnome-base/libglade/files/digest-libglade-0.17-r6
+++ b/gnome-base/libglade/files/digest-libglade-0.17-r6
@@ -1,3 +0,0 @@
 MD5 38b2e2cfd813783fe157617813bfe3b3 libglade-0.17.tar.gz 418921
 RMD160 d401764bbb5c8b6af9b9c1fbd6e9c6b3483f27c8 libglade-0.17.tar.gz 418921
 SHA256 d65a4909298e6ac33210f513b50d9ea8e0b201742566a218f31d4f685133a48c libglade-0.17.tar.gz 418921
--- a/gnome-base/libglade/files/digest-libglade-2.5.1
+++ b/gnome-base/libglade/files/digest-libglade-2.5.1
@@ -1,3 +0,0 @@
 MD5 e4734a59f1f2308d7714dc0ebf8163f1 libglade-2.5.1.tar.bz2 317524
 RMD160 9d8b8720453b9764833facc5ca0abab6f4c9fa41 libglade-2.5.1.tar.bz2 317524
 SHA256 15e4c95402caa3c97394189a6b1b693eced23d80e292fcca12585317434adc2e libglade-2.5.1.tar.bz2 317524
--- a/gnome-base/libglade/files/digest-libglade-2.6.0
+++ b/gnome-base/libglade/files/digest-libglade-2.6.0
@@ -1,3 +0,0 @@
 MD5 81d7b2b64871ce23a5fae1e5da0b1f6e libglade-2.6.0.tar.bz2 319004
 RMD160 4aac5a50cc1672e03684648c190185f35397604d libglade-2.6.0.tar.bz2 319004
 SHA256 6533dcc2e29895a41288543855159035133980ea627121ab867cb9352f620dcf libglade-2.6.0.tar.bz2 319004
--- a/gnome-base/libglade/libglade-0.17-r6.ebuild
+++ b/gnome-base/libglade/libglade-0.17-r6.ebuild
@@ -1,57 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-0.17-r6.ebuild,v 1.31 2006/07/05 05:40:18 vapier Exp $
 #provide Xmake and Xemake
 inherit libtool virtualx gnome.org multilib
 DESCRIPTION="Allow programs to load their UIs from an XML description at runtime."
 HOMEPAGE="http://developer.gnome.org/doc/API/libglade/libglade.html"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="nls bonobo"
 #please dont add gnome-libs as an optional DEPEND, as
 #it causes too many problems.
 RDEPEND=">=dev-libs/libxml-1.8.15
 	 >=gnome-base/gnome-libs-1.4.1.2-r1
 	 bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 src_compile() {
 	elibtoolize
 	local myconf=""
 	use bonobo && myconf="${myconf} --enable-bonobo"
 	use bonobo || myconf="${myconf} --disable-bonobo --disable-bonobotest"
 	use nls    || myconf="${myconf} --disable-nls"
 	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--libdir=/usr/$(get_libdir) \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
 		--disable-gnomedb \
 		${myconf} || die
 	Xemake || die
 }
 src_install() {
 	make prefix="${D}"/usr \
 	     libdir="${D}"/usr/$(get_libdir) \
 	     sysconfdir="${D}"/etc \
 	     localstatedir="${D}"/var/lib \
 	     install || die
 	dodoc AUTHORS ChangeLog NEWS
 	dodoc doc/*.txt
 }
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,40 +0,0 @@
 AUX sylpheed-1.0-namespace.diff 469 RMD160 53b94f4dd57a05e45cb849cfdf85d6d2c56815af SHA1 2c72ea30bf151b32528dd32c59514af1b08c5b79 SHA256 b69cb581466387bbeeec8974fb8db73ab5060da37da8b0793c7c0560fa8b6897
 MD5 f61096b312b38b3482c888702632f999 files/sylpheed-1.0-namespace.diff 469
 RMD160 53b94f4dd57a05e45cb849cfdf85d6d2c56815af files/sylpheed-1.0-namespace.diff 469
 SHA256 b69cb581466387bbeeec8974fb8db73ab5060da37da8b0793c7c0560fa8b6897 files/sylpheed-1.0-namespace.diff 469
 AUX sylpheed-1.0-procmime.diff 1041 RMD160 fb2fbbf485bde9b04a3c9bd25f73ffac4b39d04f SHA1 acb91b47683f99507b457af12cd293a1fb212ee2 SHA256 d161cc446380f6bfacb9160a40ba200793f9b330ea628eece01f2577636b8e22
 MD5 ff1e6b6893175ecf49f217329ab880cd files/sylpheed-1.0-procmime.diff 1041
 RMD160 fb2fbbf485bde9b04a3c9bd25f73ffac4b39d04f files/sylpheed-1.0-procmime.diff 1041
 SHA256 d161cc446380f6bfacb9160a40ba200793f9b330ea628eece01f2577636b8e22 files/sylpheed-1.0-procmime.diff 1041
 AUX sylpheed-2.1-shared-mime-info.diff 1637 RMD160 8439c41dbd570dfc37f7a0c268a47c1d263c6dcc SHA1 851f35dd097a26fc245a43117f95839c01f1ff1d SHA256 f1a8ee5c6597a8b31eb8abfdcd5775a56d0c2b4f1fe180abf9c04805d067ea72
 MD5 01498a2c484618f1d4c663eac986c55e files/sylpheed-2.1-shared-mime-info.diff 1637
 RMD160 8439c41dbd570dfc37f7a0c268a47c1d263c6dcc files/sylpheed-2.1-shared-mime-info.diff 1637
 SHA256 f1a8ee5c6597a8b31eb8abfdcd5775a56d0c2b4f1fe180abf9c04805d067ea72 files/sylpheed-2.1-shared-mime-info.diff 1637
 AUX sylpheed-2.2-replace-aspell-with-enchant.diff 3197 RMD160 4ddb9215a1c1f95ce00c71884309594403426089 SHA1 0caa97f42a7698b98af47826320a3fb9695298e3 SHA256 69dff1c6b72d83459e3e89b27ceacea4acd5fa9cb6f5a63293593decd9a73277
 MD5 0f4074345f62ede519f0b65730e4b762 files/sylpheed-2.2-replace-aspell-with-enchant.diff 3197
 RMD160 4ddb9215a1c1f95ce00c71884309594403426089 files/sylpheed-2.2-replace-aspell-with-enchant.diff 3197
 SHA256 69dff1c6b72d83459e3e89b27ceacea4acd5fa9cb6f5a63293593decd9a73277 files/sylpheed-2.2-replace-aspell-with-enchant.diff 3197
 AUX sylpheed-2.4-firefox.diff 612 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 SHA1 499d8de33f4daf252efeadb362ebceb52217b648 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8
 MD5 fc1e34a1f4b7245c479aee0d895d40a2 files/sylpheed-2.4-firefox.diff 612
 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 files/sylpheed-2.4-firefox.diff 612
 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8 files/sylpheed-2.4-firefox.diff 612
 DIST sylpheed-1.0.6.tar.gz 3532006 RMD160 be2dad0ea9ff2fafdf16efae4d22a903c2665f68 SHA1 580ac9417e0034c64e0e4ed69afe64d955a3ead8 SHA256 a35c0f49f7c595ea98b94fb7e1b1ca6f64e46e485e8b4eeb50fb9c10c050aef8
 DIST sylpheed-2.4.2.tar.bz2 2726890 RMD160 12f740c12b6811629ff90761a2820de0f55d907e SHA1 01b5272b680f9badb04500023449e4abebe4915d SHA256 056318815de84ac38c0ff8efaae2d964d0750988a19982d69162e477019eba19
 EBUILD sylpheed-1.0.6.ebuild 1453 RMD160 3ba019ae039410016ea79c920116cb1c6737030c SHA1 48794e7c14b6358883e370b8f49eeceb8950d263 SHA256 670ad539b1c32b425aa847a704226f28cd8421d42b1e3634d64b8a8c20017c22
 MD5 370ae3c3e2ef4b834549f515186907d6 sylpheed-1.0.6.ebuild 1453
 RMD160 3ba019ae039410016ea79c920116cb1c6737030c sylpheed-1.0.6.ebuild 1453
 SHA256 670ad539b1c32b425aa847a704226f28cd8421d42b1e3634d64b8a8c20017c22 sylpheed-1.0.6.ebuild 1453
 EBUILD sylpheed-2.4.2.ebuild 1551 RMD160 002fa10b5a3fcf908fe5c064fd601e35b090db31 SHA1 22b7d7e52790642977e7f385c4e2333fd241483f SHA256 70fda5832e62b15fb2f126ba8867fcbe83c7d0be29e5ee2e52d3629e19cd9260
 MD5 2e2274021bf1581a24fc5756c328f3bd sylpheed-2.4.2.ebuild 1551
 RMD160 002fa10b5a3fcf908fe5c064fd601e35b090db31 sylpheed-2.4.2.ebuild 1551
 SHA256 70fda5832e62b15fb2f126ba8867fcbe83c7d0be29e5ee2e52d3629e19cd9260 sylpheed-2.4.2.ebuild 1551
 MISC metadata.xml 229 RMD160 e7b8af58013b68717b38eb3a9caa66a4dd9ade19 SHA1 9b1ae8fd78b5f31fd556e38a0eaec1fbb48a2a5b SHA256 011cdd7759602b24f43dfcc25055ff2d87d7c4ad18fef9fa49a6e0b47e5d3326
 MD5 ef6023a73b31bf0ffdc6b566841160aa metadata.xml 229
 RMD160 e7b8af58013b68717b38eb3a9caa66a4dd9ade19 metadata.xml 229
 SHA256 011cdd7759602b24f43dfcc25055ff2d87d7c4ad18fef9fa49a6e0b47e5d3326 metadata.xml 229
 MD5 806aa8dfd6b939868647433666c0b73f files/digest-sylpheed-1.0.6 247
 RMD160 3d0a0d96dfb03793861bf60778fd22f74ad7f7c8 files/digest-sylpheed-1.0.6 247
 SHA256 e309b9b7c0b8f3998cbc4d68759c7ba6a7d76bd1385cb0f5e36a071f904d37ef files/digest-sylpheed-1.0.6 247
 MD5 8c9d71db3efb4625165370e927000b2d files/digest-sylpheed-2.4.2 250
 RMD160 88d1d873b097b8beda1d5b8becb65eb1a4eed23f files/digest-sylpheed-2.4.2 250
 SHA256 f062eace4ebcebc02ea7941d5854036504243bd0e908c4148bf996be8e69eca1 files/digest-sylpheed-2.4.2 250
--- a/mail-client/sylpheed/files/digest-sylpheed-1.0.6
+++ b/mail-client/sylpheed/files/digest-sylpheed-1.0.6
@@ -1,3 +0,0 @@
 MD5 8bc978f173dc2c5a298b6bf59ede3891 sylpheed-1.0.6.tar.gz 3532006
 RMD160 be2dad0ea9ff2fafdf16efae4d22a903c2665f68 sylpheed-1.0.6.tar.gz 3532006
 SHA256 a35c0f49f7c595ea98b94fb7e1b1ca6f64e46e485e8b4eeb50fb9c10c050aef8 sylpheed-1.0.6.tar.gz 3532006
--- a/mail-client/sylpheed/files/digest-sylpheed-2.4.2
+++ b/mail-client/sylpheed/files/digest-sylpheed-2.4.2
@@ -1,3 +0,0 @@
 MD5 ac0aeeebc320f445beb36ff443ea903a sylpheed-2.4.2.tar.bz2 2726890
 RMD160 12f740c12b6811629ff90761a2820de0f55d907e sylpheed-2.4.2.tar.bz2 2726890
 SHA256 056318815de84ac38c0ff8efaae2d964d0750988a19982d69162e477019eba19 sylpheed-2.4.2.tar.bz2 2726890
--- a/mail-client/sylpheed/files/sylpheed-1.0-namespace.diff
+++ b/mail-client/sylpheed/files/sylpheed-1.0-namespace.diff
@@ -1,14 +0,0 @@
 --- sylpheed-1.0.6/src/imap.c.orig	2005-12-31 12:59:37.000000000 +0100
 +++ sylpheed-1.0.6/src/imap.c	2005-12-31 13:01:27.000000000 +0100
@@ -2327,6 +2327,11 @@
 	    folder->ns_others   != NULL ||
 	    folder->ns_shared   != NULL)
 		return;
 +	
 +	if (!imap_has_capability(session, "NAMESPACE")) {
 +		imap_get_namespace_by_list(session, folder);
 +		return;
 +	}
 	if (imap_cmd_namespace(session, &ns_str) != IMAP_SUCCESS) {
 		log_warning(_("can't get namespace\n"));
--- a/mail-client/sylpheed/files/sylpheed-1.0-procmime.diff
+++ b/mail-client/sylpheed/files/sylpheed-1.0-procmime.diff
@@ -1,39 +0,0 @@
 --- sylpheed-1.0.6/src/procmime.c.orig	2005-12-31 13:05:55.000000000 +0100
 +++ sylpheed-1.0.6/src/procmime.c	2005-12-31 13:06:54.000000000 +0100
@@ -962,6 +962,9 @@
 		g_free(dir);
 		mime_type_list = g_list_concat(mime_type_list, list);
 +		list = procmime_get_mime_type_list("/usr/share/mime/globs");
 +		mime_type_list = g_list_concat(mime_type_list, list);
 +
 		if (!mime_type_list) {
 			g_warning("mime.types not found\n");
 			return NULL;
@@ -1014,7 +1017,7 @@
 		g_strstrip(buf);
 		p = buf;
 -		while (*p && !isspace(*p)) p++;
 +		while (*p && !isspace(*p) && (*p != ':')) p++;
 		if (*p) {
 			*p = '\0';
 			p++;
@@ -1027,7 +1030,7 @@
 		mime_type->type = g_strdup(buf);
 		mime_type->sub_type = g_strdup(delim + 1);
 -		while (*p && isspace(*p)) p++;
 +		while (*p && (isspace(*p) || (*p == '*') || (*p == '.'))) p++;
 		if (*p)
 			mime_type->extension = g_strdup(p);
 		else
@@ -1039,7 +1042,7 @@
 	fclose(fp);
 	if (!list)
 -		g_warning("Can't read mime.types\n");
 +		g_warning("Can't read %s\n", file);
 	return list;
 }
--- a/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
+++ b/mail-client/sylpheed/files/sylpheed-2.1-shared-mime-info.diff
@@ -1,53 +0,0 @@
 diff -urN sylpheed-2.1.3.orig/libsylph/Makefile.am sylpheed-2.1.3/libsylph/Makefile.am
 --- sylpheed-2.1.3.orig/libsylph/Makefile.am	2005-09-08 16:24:49.000000000 +0900
 +++ sylpheed-2.1.3/libsylph/Makefile.am	2005-10-02 20:56:56.940000000 +0900
@@ -1,7 +1,8 @@
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibSylph\" \
 -	-DSYSCONFDIR=\""$(sysconfdir)"\"
 +	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 +	-DDATADIR=\""$(datadir)"\"
 INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
 diff -urN sylpheed-2.1.3.orig/libsylph/procmime.c sylpheed-2.1.3/libsylph/procmime.c
 --- sylpheed-2.1.3.orig/libsylph/procmime.c	2005-09-22 20:18:02.000000000 +0900
 +++ sylpheed-2.1.3/libsylph/procmime.c	2005-10-02 20:57:55.920000000 +0900
@@ -1051,6 +1051,9 @@
 		g_free(dir);
 		mime_type_list = g_list_concat(mime_type_list, list);
 +		list = procmime_get_mime_type_list(DATADIR "/mime/globs");
 +		mime_type_list = g_list_concat(mime_type_list, list);
 +
 		if (!mime_type_list) {
 			g_warning("mime.types not found\n");
 			return NULL;
@@ -1103,7 +1106,7 @@
 		g_strstrip(buf);
 		p = buf;
 -		while (*p && !g_ascii_isspace(*p)) p++;
 +		while (*p && !g_ascii_isspace(*p) && *p != ':') p++;
 		if (*p) {
 			*p = '\0';
 			p++;
@@ -1116,7 +1119,7 @@
 		mime_type->type = g_strdup(buf);
 		mime_type->sub_type = g_strdup(delim + 1);
 -		while (*p && g_ascii_isspace(*p)) p++;
 +		while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++;
 		if (*p)
 			mime_type->extension = g_strdup(p);
 		else
@@ -1128,7 +1131,7 @@
 	fclose(fp);
 	if (!list)
 -		g_warning("Can't read mime.types\n");
 +		g_warning("Can't read %s\n", file);
 	return list;
 }
--- a/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff
+++ b/mail-client/sylpheed/files/sylpheed-2.2-replace-aspell-with-enchant.diff
@@ -1,102 +0,0 @@
 diff -ur sylpheed-2.2.0.orig/src/compose.c sylpheed-2.2.0/src/compose.c
 --- sylpheed-2.2.0.orig/src/compose.c	2006-02-07 11:53:05.000000000 +0900
 +++ sylpheed-2.2.0/src/compose.c	2006-02-15 23:40:01.000000000 +0900
@@ -64,7 +64,7 @@
 #if USE_GTKSPELL
 #  include <gtk/gtkradiomenuitem.h>
 #  include <gtkspell/gtkspell.h>
 -#  include <aspell.h>
 +#  include <enchant/enchant.h>
 #endif
 #include <stdio.h>
@@ -459,6 +459,9 @@
 					 GtkWidget	*widget);
 static void compose_set_spell_lang_cb	(GtkWidget	*widget,
 					 gpointer	 data);
 +static void compose_list_dicts_cb	(const char *lang_tag,
 +					const char *provider_name, const char *provider_desc,
 +					const char *provider_file, void *user_data);
 #endif
 static void compose_attach_drag_received_cb (GtkWidget		*widget,
@@ -4874,33 +4877,34 @@
 }
 #if USE_GTKSPELL
 +static void compose_list_dicts_cb(const char *lang_tag,
 +				const char *provider_name, const char *provider_desc,
 +				const char *provider_file, void *user_data)
 +{
 +	GQueue *queue = (GQueue *)user_data;
 +
 +	if (g_queue_index(queue, (gconstpointer)lang_tag) == -1) {
 +		g_queue_push_tail(queue, g_strdup(lang_tag));
 +	}
 +}
 +
 static void compose_set_spell_lang_menu(Compose *compose)
 {
 -	AspellConfig *config;
 -	AspellDictInfoList *dlist;
 -	AspellDictInfoEnumeration *dels;
 -	const AspellDictInfo *entry;
 +	EnchantBroker *broker;
 +	GQueue *langs;
 	GSList *dict_list = NULL, *menu_list = NULL, *cur;
 	GtkWidget *menu;
 	gboolean lang_set = FALSE;
 -	config = new_aspell_config();
 -	dlist = get_aspell_dict_info_list(config);
 -	delete_aspell_config(config);
 -
 -	dels = aspell_dict_info_list_elements(dlist);
 -	while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
 -		dict_list = g_slist_append(dict_list, (gchar *)entry->name);
 -		if (compose->spell_lang != NULL &&
 -		    g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
 -			lang_set = TRUE;
 -	}
 -	delete_aspell_dict_info_enumeration(dels);
 +	broker = enchant_broker_init();
 +	langs = g_queue_new();
 +	enchant_broker_list_dicts(broker, compose_list_dicts_cb, langs);
 +	enchant_broker_free(broker);
 	menu = gtk_menu_new();
 -	for (cur = dict_list; cur != NULL; cur = cur->next) {
 -		gchar *dict = (gchar *)cur->data;
 +	while (g_queue_get_length(langs) > 0) {
 +		gchar *dict = g_queue_pop_head(langs);
 		GtkWidget *item;
 		if (dict == NULL) continue;
@@ -4910,13 +4914,16 @@
 			(GTK_RADIO_MENU_ITEM(item));
 		if (compose->spell_lang != NULL &&
 		    g_ascii_strcasecmp(compose->spell_lang, dict) == 0)
 +		{
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(item), TRUE);
 +			lang_set = TRUE;
 +		}
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		g_signal_connect(G_OBJECT(item), "activate",
 				 G_CALLBACK(compose_set_spell_lang_cb),
 				 compose);     
 -		g_object_set_data(G_OBJECT(item), "spell-lang", dict);
 +		g_object_set_data_full(G_OBJECT(item), "spell-lang", dict, g_free);
 		gtk_widget_show(item);
 		if (!lang_set && g_ascii_strcasecmp("en", dict) == 0)
@@ -4924,6 +4931,8 @@
 				(GTK_CHECK_MENU_ITEM(item), TRUE);
 	}
 +	g_queue_free(langs);
 +
 	gtk_widget_show(menu);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu);
 }
--- a/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
+++ b/mail-client/sylpheed/files/sylpheed-2.4-firefox.diff
@@ -1,12 +0,0 @@
 diff -Naur sylpheed-2.4.1.orig/libsylph/defs.h sylpheed-2.4.1/libsylph/defs.h
 --- sylpheed-2.4.1.orig/libsylph/defs.h	2006-09-22 11:58:56.000000000 +0900
 +++ sylpheed-2.4.1/libsylph/defs.h	2007-05-07 17:25:18.000000000 +0900
@@ -92,7 +92,7 @@
 /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
 /* #define DEFAULT_INC_PROGRAM	"imget" */
 #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
 -#define DEFAULT_BROWSER_CMD	"mozilla-firefox -remote 'openURL(%s,new-window)'"
 +#define DEFAULT_BROWSER_CMD	"firefox -remote 'openURL(%s,new-window)'"
 #ifdef _PATH_MAILDIR
 #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
--- a/mail-client/sylpheed/metadata.xml
+++ b/mail-client/sylpheed/metadata.xml
@@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>gryf@elysium.pl</email>
 		<name>Roman Dobosz</name>
 	</maintainer>
 </pkgmetadata>
--- a/mail-client/sylpheed/sylpheed-1.0.6.ebuild
+++ b/mail-client/sylpheed/sylpheed-1.0.6.ebuild
@@ -1,69 +0,0 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.0.6.ebuild,v 1.8 2005/11/16 13:30:24 hattya Exp $
 inherit eutils
 IUSE="crypt gnome ipv6 ldap nls pda ssl xface"
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.good-day.net/"
 SRC_URI="http://sylpheed.good-day.net/${PN}/v${PV%.*}/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 PROVIDE="virtual/sylpheed"
 DEPEND=">=x11-libs/gtk+-1.2*
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
 	crypt? ( >=app-crypt/gpgme-0.4.5 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	pda? ( app-pda/jpilot )
 	ssl? ( dev-libs/openssl )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.0-namespace.diff
 	epatch ${FILESDIR}/${PN}-1.0-procmime.diff
 }
 src_compile() {
 	econf \
 		`use_enable nls` \
 		`use_enable ssl` \
 		`use_enable crypt gpgme` \
 		`use_enable pda jpilot` \
 		`use_enable ldap` \
 		`use_enable ipv6` \
 		`use_enable xface compface` \
 		|| die
 	emake || die
 }
 src_install() {
 	einstall
 	dodir /usr/share/pixmaps
 	insinto /usr/share/pixmaps
 	doins *.png
 	insinto /usr/share/applications
 	doins sylpheed.desktop
 	dodoc AUTHORS COPYING ChangeLog* INSTALL* NEWS* README* TODO*
 }
--- a/mail-client/sylpheed/sylpheed-2.4.2.ebuild
+++ b/mail-client/sylpheed/sylpheed-2.4.2.ebuild
@@ -1,72 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-2.4.1.ebuild,v 1.2 2007/05/12 15:04:04 hattya Exp $
 inherit autotools eutils
 IUSE="crypt ipv6 ldap nls pda spell ssl xface"
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
 SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 DEPEND=">=x11-libs/gtk+-2.4
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	crypt? ( >=app-crypt/gpgme-0.4.5 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	pda? ( app-pda/jpilot )
 	spell? ( app-text/gtkspell )
 	ssl? ( dev-libs/openssl )
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
 AT_M4DIR="ac"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.*.diff
 	use crypt || cp ac/missing/gpgme.m4 ac
 	eautomake
 }
 src_compile() {
 	local htmldir=/usr/share/doc/${PF}/html
 	econf \
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
 		$(use_enable ldap) \
 		$(use_enable nls) \
 		$(use_enable pda jpilot) \
 		$(use_enable spell gtkspell) \
 		$(use_enable ssl) \
 		$(use_enable xface compface) \
 		--with-manualdir=${htmldir}/manual \
 		--with-faqdir=${htmldir}/faq \
 		|| die
 	emake || die
 }
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
 	doicon *.png
 	domenu *.desktop
 }
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -1,15 +0,0 @@
 DIST gqview-1.2.2.tar.gz 864300 RMD160 fd99a9da9e3b623d5b14f21682a447e04c1009cf SHA1 6530af2286c024115afab71fbe3d7e31ae42af7d SHA256 f4cfabf26651786bb2fef4feedfeb3823890e7880386c5f5b1cc8827b8358096
 EBUILD gqview-1.2.2-r1.ebuild 444 RMD160 87f6a9ba6a1514ba4fbbd16a1a57884e6eb85177 SHA1 5e5c910865f07ac62b0e550727ace911b432dd66 SHA256 cef98308dbb0ce10cf9d06a30a722ef23dbf008da952ade48d638273c53a50ca
 MD5 ec238d073dd896292066cae29c9f15cd gqview-1.2.2-r1.ebuild 444
 RMD160 87f6a9ba6a1514ba4fbbd16a1a57884e6eb85177 gqview-1.2.2-r1.ebuild 444
 SHA256 cef98308dbb0ce10cf9d06a30a722ef23dbf008da952ade48d638273c53a50ca gqview-1.2.2-r1.ebuild 444
 EBUILD gqview-1.2.2.ebuild 781 RMD160 a1f63d6e3f1cb8f23a4d571bafa7e572753e3cfc SHA1 ce2c0a15b5964fcd31417c3bbebe61e6835de475 SHA256 fd287d034f2175f78215cc3fc42f9601b31056c2e37640b34f06aba21d605961
 MD5 8e967cd26ceab47c9f7c393edd82ba18 gqview-1.2.2.ebuild 781
 RMD160 a1f63d6e3f1cb8f23a4d571bafa7e572753e3cfc gqview-1.2.2.ebuild 781
 SHA256 fd287d034f2175f78215cc3fc42f9601b31056c2e37640b34f06aba21d605961 gqview-1.2.2.ebuild 781
 MD5 f241d0beb9b2d72d0d6e77e04231aba8 files/digest-gqview-1.2.2 238
 RMD160 340e591a7f82ded1cb1fa6aaf6d565fbaeff9f0f files/digest-gqview-1.2.2 238
 SHA256 8a8ce3f0e6ea3bda588088586c503ff03d64ec9a5605632765947057d8ff6a0d files/digest-gqview-1.2.2 238
 MD5 f241d0beb9b2d72d0d6e77e04231aba8 files/digest-gqview-1.2.2-r1 238
 RMD160 340e591a7f82ded1cb1fa6aaf6d565fbaeff9f0f files/digest-gqview-1.2.2-r1 238
 SHA256 8a8ce3f0e6ea3bda588088586c503ff03d64ec9a5605632765947057d8ff6a0d files/digest-gqview-1.2.2-r1 238
--- a/media-gfx/gqview/files/digest-gqview-1.2.2
+++ b/media-gfx/gqview/files/digest-gqview-1.2.2
@@ -1,3 +0,0 @@
 MD5 3273d2f39d4383a6b0812afeaccc5606 gqview-1.2.2.tar.gz 864300
 RMD160 fd99a9da9e3b623d5b14f21682a447e04c1009cf gqview-1.2.2.tar.gz 864300
 SHA256 f4cfabf26651786bb2fef4feedfeb3823890e7880386c5f5b1cc8827b8358096 gqview-1.2.2.tar.gz 864300
--- a/media-gfx/gqview/files/digest-gqview-1.2.2-r1
+++ b/media-gfx/gqview/files/digest-gqview-1.2.2-r1
@@ -1,3 +0,0 @@
 MD5 3273d2f39d4383a6b0812afeaccc5606 gqview-1.2.2.tar.gz 864300
 RMD160 fd99a9da9e3b623d5b14f21682a447e04c1009cf gqview-1.2.2.tar.gz 864300
 SHA256 f4cfabf26651786bb2fef4feedfeb3823890e7880386c5f5b1cc8827b8358096 gqview-1.2.2.tar.gz 864300
--- a/media-gfx/gqview/gqview-1.2.2-r1.ebuild
+++ b/media-gfx/gqview/gqview-1.2.2-r1.ebuild
@@ -1,18 +0,0 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-1.2.2.ebuild $
 DESCRIPTION="A GTK-based image browser"
 SRC_URI="mirror://sourceforge/gqview/gqview-1.2.2.tar.gz"
 HOMEPAGE="http://gqview.sourceforge.net/"
 SLOT="0"
 KEYWORDS="x86"
 src_compile() {
 	econf || die
 	emake || die "emake failed"
 }
 src_install() {
 	einstall || die
 }
--- a/media-gfx/gqview/gqview-1.2.2.ebuild
+++ b/media-gfx/gqview/gqview-1.2.2.ebuild
@@ -1,31 +0,0 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-1.2.2.ebuild $
 IUSE="nls"
 DESCRIPTION="A GTK-based image browser"
 SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
 HOMEPAGE="http://gqview.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc amd64"
 DEPEND="media-libs/libpng
 	>=x11-libs/gtk+-1.2.10"
 RDEPEND="nls? ( sys-devel/gettext )"
 src_compile() {
 	econf `use_enable nls` || die
 	emake || die "emake failed"
 }
 src_install() {
 	einstall GNOME_DATADIR=${D}/usr/share || die
 	# Don't remove duplicate README, the program looks for it. (bug 30111)
 	# rm -rf ${D}/usr/share/gqview
 	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 }
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>gryf@elysium.pl</email>
 		<name>Roman Dobosz</name>
 	</maintainer>
 </pkgmetadata>
--- a/media-libs/win32codecs/ChangeLog
+++ b/media-libs/win32codecs/ChangeLog
@@ -1,243 +0,0 @@
 # ChangeLog for media-libs/win32codecs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/ChangeLog,v 1.51 2008/10/29 17:02:03 beandog Exp $
 *win32codecs-20071007-r4 (29 Oct 2008)
  29 Oct 2008; Steve Dibb <beandog@gentoo.org>
  -win32codecs-20071007-r3.ebuild, +win32codecs-20071007-r4.ebuild:
  Keep real use flag, drop realplayer dep
  28 Oct 2008; Steve Dibb <beandog@gentoo.org>
  win32codecs-20071007-r2.ebuild, win32codecs-20071007-r3.ebuild:
  Minor QA cleanups
 *win32codecs-20071007-r3 (28 Oct 2008)
  28 Oct 2008; Steve Dibb <beandog@gentoo.org>
  +win32codecs-20071007-r3.ebuild:
  Drop realplayer support, security bug 232999, moving real codecs to
  media-libs/realcodecs, bug 240341
  21 Nov 2007; Steve Dibb <beandog@gentoo.org> -win32codecs-20050216.ebuild,
  -win32codecs-20061022-r1.ebuild, -win32codecs-20071007-r1.ebuild:
  Punt older versions, bug 150288
  08 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
  win32codecs-20071007-r2.ebuild:
  stable x86, security bug 150288
 *win32codecs-20071007-r2 (07 Nov 2007)
  07 Nov 2007; Carsten Lohrke <carlo@gentoo.org>
  +win32codecs-20071007-r2.ebuild:
  Remove Quicktime support for now, bug #150288.
 *win32codecs-20071007-r1 (29 Oct 2007)
  29 Oct 2007; Steve Dibb <beandog@gentoo.org> -win32codecs-20071007.ebuild,
  +win32codecs-20071007-r1.ebuild:
  Fix install of reallibs, bug 197319
 *win32codecs-20071007 (08 Oct 2007)
  08 Oct 2007; Steve Dibb <beandog@gentoo.org> +win32codecs-20071007.ebuild:
  Version bump
  24 Apr 2007; Raúl Porcel <armin76@gentoo.org>
  win32codecs-20061022-r1.ebuild:
  x86 stable
 *win32codecs-20061022-r1 (12 Jan 2007)
 *win32codecs-20060611-r1 (12 Jan 2007)
  12 Jan 2007; Steve Dibb <beandog@gentoo.org>
  +win32codecs-20060611-r1.ebuild, +win32codecs-20061022-r1.ebuild:
  Add realplayer support / dep for amd64
  06 Jan 2007; Steve Dibb <beandog@gentoo.org> win32codecs-20061022.ebuild:
  Fix QA_TEXTRELS, strip
 *win32codecs-20061022 (06 Jan 2007)
  06 Jan 2007; Steve Dibb <beandog@gentoo.org> +win32codecs-20061022.ebuild:
  Version bump
  03 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20060611.ebuild:
  Use get_libdir to get the path to mask from revdep-rebuild.
  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20060611.ebuild:
  Mask the win32codecs directories from revdep-rebuild. Bug #139166.
  28 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
  -win32codecs-20050412.ebuild:
  Remove old version.
  21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20050216.ebuild, win32codecs-20050412.ebuild,
  win32codecs-20060611.ebuild:
  Add missing dependency on libstdc++ 3.3 as per bug #137844, thanks to
  Petteri Räty for reporting.
 *win32codecs-20060611 (11 Jun 2006)
  11 Jun 2006; Luca Barbato <lu_zero@gentoo.org>
  +win32codecs-20060611.ebuild:
  Updated collection
  25 May 2006; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20050412.ebuild:
  Add ~x86-fbsd keyword.
  03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
  Update metadata to list media-video@gentoo.org as maintainer.
  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20050412.ebuild:
  Restrict striping, as the package is binary.
  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
  win32codecs-20050216.ebuild, win32codecs-20050412.ebuild:
  use mirror://mplayer/ to get the codecs.
  12 Aug 2005; <dang@gentoo.org> win32codecs-20050412.ebuild:
  Add multilib support. This makes the libs get installed in the correct spot
  on amd64 to be used by 32-bit programs. x86 install locations are
  unaffected.  Also, mark ~amd64
  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
  -win32codecs-20050115.ebuild, win32codecs-20050412.ebuild:
  stable on x86 (not really, ignore this entry - Flameeyes)
 *win32codecs-20050412 (18 Apr 2005)
  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
  +win32codecs-20050412.ebuild:
  new upstream version, fixes #89565
 *win32codecs-20050216 (29 Mar 2005)
  29 Mar 2005; Chris White <chriswhite@gentoo.org>
  win32codecs-20050115.ebuild, win32codecs-20050216.ebuild:
  Fixed the arch logic to -* [~x86,x86] instead of the long list of keywords
  since it only works on x86.
  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> :
  version bump, fixes #85034. also corrected an permission issue, fixes #83221
  08 Feb 2005; Chris White <chriswhite@gentoo.org>
  -win32codecs-0.90.1-r1.ebuild, -win32codecs-0.90.1-r2.ebuild,
  -win32codecs-20031001.ebuild, -win32codecs-20040427.ebuild,
  -win32codecs-20040703.ebuild, -win32codecs-20040916-r1.ebuild,
  -win32codecs-20040916.ebuild, win32codecs-20050115.ebuild:
  get rid of some old ebuilds to make my life my sane and fix bug #80321 while
  I'm at it.
  08 Feb 2005; Chris White <chriswhite@gentoo.org>
  win32codecs-20040916-r1.ebuild:
  Fix bug #81122.
  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
  win32codecs-20040916-r1.ebuild, win32codecs-20050115.ebuild:
  changed ~amd64 keyword to -amd64.
 *win32codecs-20050115 (30 Jan 2005)
  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
  +win32codecs-20050115.ebuild:
  new upstream release, fixes #72393
  16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
  win32codecs-20040916-r1.ebuild:
  added ~amd64 to KEYWORDS. fixes bug #78159
  19 Dec 2004; Chris White <chriswhite@gentoo.org>
  win32codecs-20040916-r1.ebuild:
  Marked stable to prepare for mplayer security marking.
 *win32codecs-20040916-r1 (26 Oct 2004)
  26 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
  +win32codecs-20040916-r1.ebuild:
  Fixing bug #68962
  23 Oct 2004; Chris White <chriswhite@gentoo.org>
  win32codecs-20040916.ebuild:
  Quicktime needs to actually be in /usr/lib/win32 for MPlayer to see it so,
  back there it goes.
  23 Oct 2004; Chris White <chriswhite@gentoo.org>
  win32codecs-20040916.ebuild:
  Fixed installation logic and gave real/quicktime seperate install folders.
 *win32codecs-20040916 (23 Oct 2004)
  23 Oct 2004; Chris White <chriswhite@gentoo.org>
  +win32codecs-20040916.ebuild:
  bumped to 20040916 which uses 1 tarball instead of 3. real and xanim USE flags
  added onto the existing quicktime USE flag.
 *win32codecs-20040703 (14 Aug 2004)
  14 Aug 2004; Chris White <chriswhite@gentoo.org>
  +win32codecs-20040703.ebuild:
  Bumped to 20040703.  Closes bug #60120.
 *win32codecs-20040427 (24 Jun 2004)
  24 Jun 2004; Martin Holzer <mholzer@gentoo.org> win32codecs-20040427.ebuild:
  Version bumped. Closes 50420
  20 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org>
  win32codecs-0.90.1-r1.ebuild:
  set -ppc
 *win32codecs-20031001 (01 Oct 2003)
  01 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
  win32codecs-20031001.ebuild:
  In response to bug 29972, the files are renamed with a date-based version
  number and brought manually to the distfiles mirrors. The dmocodecs package
  was removed, this seems to be in win32codecs.tar.bz2 now.
  08 Jul 2003; Jason Wever <weeve@gentoo.org> win32codecs-0.90.1-r1.ebuild:
  Added -sparc to keywords.
 *win32codecs-0.90.1-r2 (29 Jan 2003)
  29 Jan 2003; Nick Hadaway <raker@gentoo.org> win32codecs-0.90.1-r2.ebuild,
  files/digest-win32codecs-0.90.1-r2 :
  Now includes the extra Quicktime codecs plus WindowsMedia9 and
  RealPlayer9 codec support.  x86 should be the only platform
  utilizing these codecs, changed arch accordingly.
 *win32codecs-0.90.1-r1 (16 Dec 2002)
  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
  Install QuickTime 6 dlls if 'quicktime' in USE.
 *win32codecs-0.90.1 (16 Dec 2002)
  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
  Update to latest tarball that include WMA codecs, bug #11882.
 *win32codecs-0.90 (24 Nov 2002)
  24 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
  Version Bump #11169
 *win32codecs-0.60-r1 (3 May 2002)
  3 May 2002; Donny Davies <woodchip@gentoo.org> :
  Added LICENSE, SLOT.
 *win32codecs-0.60 (1 Feb 2002)
  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
  Added initial ChangeLog which should be updated whenever the package is
  updated in any way. This changelog is targetted to users. This means that the
  comments should well explained and written in clean English. The details about
  writing correct changelogs are explained in the skel.ChangeLog file which you
  can find in the root directory of the portage repository.
--- a/media-libs/win32codecs/Manifest
+++ b/media-libs/win32codecs/Manifest
@@ -1,5 +0,0 @@
 DIST all-20071007.tar.bz2 13864479 RMD160 dd413908b3217346f33d7845b4bc275471a44fd5 SHA1 39f6dae4919ba90ce7b12e719396373bd8c48877 SHA256 7aae7fc658d7a9a1766002435fd75436fead9c2d45eac3d67588c313cde0d8da
 EBUILD win32codecs-20071007-r2.ebuild 1428 RMD160 f2f4da6dfed9ff4019ed9a9c17e710cec63af4d4 SHA1 125647697046a4f8c5d4e0600607307a70d533d5 SHA256 f96d3c8a86a41ecd4d80ef203730dcdb3d1b80dd8952c0d7e8ba91f5617a6bdf
 EBUILD win32codecs-20071007-r4.ebuild 1403 RMD160 639c92dd4c0e4285c8bdac771ee15574196fb777 SHA1 3ec7c22c8139a2931ff0c41840a1a356861f6c31 SHA256 1474a56b61be44da4f2716a6fc3e815828d8f19bd9bcbfc76fdcf2160f4a995f
 MISC ChangeLog 8424 RMD160 f66f3bc98342418214792e012a574b93774ec643 SHA1 8371e66ad9404cc7ddc70735b492728d549bb5ad SHA256 722ec8a9df3256df80ecf085effb74750e5a98f75a989e457a0f8b8459f55910
 MISC metadata.xml 310 RMD160 0c2f6d9d5785fbf91f9a561a5d4d2b7e716537fa SHA1 ac63b512710a04d6e4cd65aaa2bb5f1d8928004d SHA256 d150937ac3cddb33e42d1c1fcd17216cdf33cd80827b0df390de5e2c88ef04d9
--- a/media-libs/win32codecs/metadata.xml
+++ b/media-libs/win32codecs/metadata.xml
@@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>video</herd>
  <maintainer>
    <email>media-video@gentoo.org</email>
  </maintainer>
  <use>
    <flag name="real">Installs the real video codecs</flag>
  </use>
 </pkgmetadata>
--- a/media-libs/win32codecs/win32codecs-20071007-r2.ebuild
+++ b/media-libs/win32codecs/win32codecs-20071007-r2.ebuild
@@ -1,58 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20071007-r2.ebuild,v 1.3 2008/10/28 18:34:31 beandog Exp $
 inherit multilib
 DESCRIPTION="Win32 binary codecs for video and audio playback support"
 SRC_URI="mirror://mplayer/releases/codecs/all-${PV}.tar.bz2"
 HOMEPAGE="http://www.mplayerhq.hu/"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* ~amd64 x86 ~x86-fbsd"
 IUSE="real"
 RDEPEND="real? ( =virtual/libstdc++-3.3*
 	amd64? ( media-video/realplayer ) )"
 S="${WORKDIR}/all-${PV}"
 RESTRICT="strip binchecks"
 pkg_setup() {
 	# This is a binary x86 package => ABI=x86
 	# Please keep this in future versions
 	# Daniel Gryniewicz <dang@gentoo.org>
 	has_multilib_profile && ABI="x86"
 }
 src_install() {
 	# see #83221
 	insopts -m0644
 	dodir /usr/$(get_libdir)/win32
 	if use real
 	then
 		dodir /usr/$(get_libdir)/real
 		insinto /usr/$(get_libdir)/real
 		doins *so.6.0
 		# copy newly introduced codecs from realplayer10
 		# see the ChangeLog online
 		doins *.so
 		# fix bug #80321
 		ln -s "${D}"/usr/$(get_libdir)/real/* "${D}"/usr/$(get_libdir)/win32/
 	fi
 	insinto /usr/$(get_libdir)/win32
 	doins *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL
 	dodoc README
 	dodir /etc/revdep-rebuild
 	cat - > "${D}/etc/revdep-rebuild/50win32codecs" <<EOF
 SEARCH_DIRS_MASK="/usr/$(get_libdir)/real /usr/$(get_libdir)/win32"
 EOF
 }
--- a/media-libs/win32codecs/win32codecs-20071007-r4.ebuild
+++ b/media-libs/win32codecs/win32codecs-20071007-r4.ebuild
@@ -1,57 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/win32codecs/win32codecs-20071007-r4.ebuild,v 1.1 2008/10/29 17:02:03 beandog Exp $
 inherit multilib
 DESCRIPTION="Windows 32-bit binary codecs for video and audio playback support"
 SRC_URI="mirror://mplayer/releases/codecs/all-${PV}.tar.bz2"
 HOMEPAGE="http://www.mplayerhq.hu/"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="real"
 RDEPEND="real? ( =virtual/libstdc++-3.3* )"
 S="${WORKDIR}/all-${PV}"
 RESTRICT="strip binchecks"
 pkg_setup() {
 	# This is a binary x86 package => ABI=x86
 	# Please keep this in future versions
 	# Daniel Gryniewicz <dang@gentoo.org>
 	has_multilib_profile && ABI="x86"
 }
 src_install() {
 	# see #83221
 	insopts -m0644
 	dodir /usr/$(get_libdir)/win32
 	if use real
 	then
 		dodir /usr/$(get_libdir)/real
 		insinto /usr/$(get_libdir)/real
 		doins *so.6.0
 		# copy newly introduced codecs from realplayer10
 		# see the ChangeLog online
 		doins *.so
 		# fix bug #80321
 		ln -s "${D}"/usr/$(get_libdir)/real/* "${D}"/usr/$(get_libdir)/win32/
 	fi
 	insinto /usr/$(get_libdir)/win32
 	doins *.dll *.ax *.xa *.acm *.vwp *.drv *.DLL
 	dodoc README
 	dodir /etc/revdep-rebuild
 	cat - > "${D}/etc/revdep-rebuild/50win32codecs" <<EOF
 SEARCH_DIRS_MASK="/usr/$(get_libdir)/real /usr/$(get_libdir)/win32"
 EOF
 }
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,2 +0,0 @@
 DIST sonata-1.6.2.tar.bz2 315918 RMD160 418eef732cc171d21e301261aa0c6b7751d03ab3 SHA1 33cb3458014b4901eb312bff76c24be125ed7d0a SHA256 7460ac04ac4d6e301578c27496125c1c13b2748e91cdd73ff39f2adcd9680dd2
 EBUILD sonata-1.6.2.ebuild 954 RMD160 5481effed89ae48d190d88287f768a4c07f54a3a SHA1 a8bc98eb39fb621184bc6a60a91d3879c52b8cb4 SHA256 757c69b7b13122beba32b0a2611ef96eb0c1b52f4d5b83eba22c87312e11614a
--- a/media-sound/sonata/sonata-1.6.2.ebuild
+++ b/media-sound/sonata/sonata-1.6.2.ebuild
@@ -1,32 +0,0 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.6.ebuild,v 1.1 2009/04/02 00:12:22 angelos Exp $
 inherit distutils
 DESCRIPTION="an elegant GTK+ music client for the Music Player Daemon (MPD)."
 HOMEPAGE="http://sonata.berlios.de/"
 SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="dbus lyrics taglib"
 RDEPEND=">=virtual/python-2.4
 	>=dev-python/pygtk-2.10
 	>=dev-python/python-mpd-0.2.0
 	dbus? ( dev-python/dbus-python )
 	lyrics? ( dev-python/zsi )
 	taglib? ( >=dev-python/tagpy-0.93 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 pkg_setup() {
 	if ! built_with_use '=x11-libs/gtk+-2*' jpeg; then
 		ewarn "If you want album cover art displayed in Sonata,"
 		ewarn "you must build gtk+-2 with the \"jpeg\" USE flag."
 	fi
 }
 DOCS="CHANGELOG README TODO TRANSLATORS"
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,4 +0,0 @@
 AUX nvclock_confd 360 RMD160 a793577e43a9a66bb0eb8b4d22e8ddb39b6ac30c SHA1 c9da108dbe24f5c1a42f859b6d28b83031fcb8ce SHA256 2bbf36faa3b78425471275f70c4d8abdff4720dc854152e4ad7b2da68810bdca
 AUX nvclock_initd 146 RMD160 cab3315e3aa033d5c220bef85d37ab0a7f623fa9 SHA1 442d2d56c51595b04c3d89d50e33431f66942ed4 SHA256 c56108c1358a76205861649b76f6ee94657983e01a795e84af64ac28d4667fb4
 DIST nvclock0.8b4.tar.gz 336999 RMD160 02dbfde37514b34c7f0e5a8b71e8205e32575dcc SHA1 758b3848b036e2b3e25368cfec4c6cd82a963dc9 SHA256 bdb695e869822c4740c361bcace81b5527b774002d42785c986da9a92d7a9b0b
 EBUILD nvclock-0.8_beta4.ebuild 984 RMD160 9da8200a8da1fbad36290dbd0b59086b50408bce SHA1 cdd93bad48df367e8b812d1680ac02295a2f85a0 SHA256 749dda5d501719480993ec35ff41950c848690fe9a9db71b2b576edd33377e5a
--- a/media-video/nvclock/files/nvclock_confd
+++ b/media-video/nvclock/files/nvclock_confd
@@ -1,9 +0,0 @@
 # Config file for /etc/init.d/nvclock
 # Set the core clock speed after -n and the memory clock speed after -m
 # Check your current speeds by running 'nvclock -s' at the command line
 # so you don't overclock too much and burn out the card
 # Test out your overclocking before adding this to the bootup!
 CLOCKOPTS="-s"
 #CLOCKOPTS="-n <corespeed> -m <memspeed>"
--- a/media-video/nvclock/files/nvclock_initd
+++ b/media-video/nvclock/files/nvclock_initd
@@ -1,12 +0,0 @@
 #!/sbin/runscript
 depend() {
 	before xdm
 }
 start() {
 	ebegin "Setting nvidia card overclock speed"
 	nvclock ${CLOCKOPTS} >/dev/null
 	eend $?
 }
--- a/media-video/nvclock/nvclock-0.8_beta4.ebuild
+++ b/media-video/nvclock/nvclock-0.8_beta4.ebuild
@@ -1,36 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta2.ebuild,v 1.4 2008/06/04 18:36:44 flameeyes Exp $
 inherit eutils autotools
 MY_P="${PN}${PV/_beta/b}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="NVIDIA Overclocking Utility"
 HOMEPAGE="http://www.linuxhardware.org/nvclock/"
 SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE="gtk"
 RDEPEND="virtual/libc
 	gtk? ( =x11-libs/gtk+-2* )"
 src_compile() {
 	econf $(use_enable gtk) || die "Error: econf failed."
 	emake || die "Error: emake failed."
 }
 src_install() {
 	dodir /usr/bin
 	einstall || die
 	newinitd "${FILESDIR}"/nvclock_initd nvclock
 	newconfd "${FILESDIR}"/nvclock_confd nvclock
 }
 pkg_postinst() {
 	elog "To enable card overclocking at startup, edit your /etc/conf.d/nvclock"
 	elog "accordingly and then run: rc-update add nvclock default"
 }
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,31 +0,0 @@
 AUX kadu-0.4.3-tcltk-gcc4.patch 576 RMD160 f37fcaba6dafbc84b7bf9efd03d6708f5305195b SHA1 bc31cd2421e923b1680db7a089b8a1f5ff4032c1 SHA256 8974c9948f39100c97269e57591e0090fa017c485e89abbf5a07ece8b7299d86
 AUX kadu-toolbar_toggle-gentoo.diff 5983 RMD160 ea7c587b4c3617c2ebb445dce46d6c275a71c0a9 SHA1 bca7202cdae4eea2d5a1d1df1cffad704cf49711 SHA256 2f39f3871c120c3ef1d720b67bb1c536762b5af1a63cf79282a679a65c63b12a
 AUX xosd-gentoo.patch 1148 RMD160 d09f0f8af0701b7c56404f2ed5a744c963aa5a46 SHA1 e7c12fc41559499c8b40aae51fa04c52b5b04c0e SHA256 0d8c8dcc33e913fdf44b33d91854313633dee89eaff192aab107d0559994d7e1
 DIST amarok-1.13.tar.gz 9201 RMD160 7061d5e8659cb19005becd4e7e99265e9bd340ea SHA1 b7d5fbf6110a4f9a3bc6c1958c16410af54e7420 SHA256 74eedf534c7021bba94c905cdecf6025c3215f7dbd178219c0e1d360779a69a2
 DIST contacts-1.0rc1.tar.bz2 47539 RMD160 61b01d486e0113c6ae8a7f611489c12d9ff7b358 SHA1 1fed9485284c7abd432a12991a4b44c53e89b206 SHA256 1715498daedc3024b4d612f14246c95bee4d0a5f9dcc6f48bc637809aff8eb50
 DIST ext_info-1.4.3.tar.bz2 19797 RMD160 46b606f42e341eaa2a24432d4b5b28ac1ca8a9ee SHA1 cfa06dbb37fa1ffffe9d7d40b91a00c0ef120927 SHA256 78946df2963585178639cfc6c60895495ecebfc6fa09cdbf0fd30aa4ef7ad27d
 DIST firewall-0.8.tar.bz2 8201 RMD160 5dc445c1aadf162dc40a9074d706fd437f707bac SHA1 53f066f070e96a3038aaee371b1649b1ff6442ea SHA256 a30182e298f9560bb264cb5d1aac0dec4f0dc2bea56fbcb88835b354aaff570f
 DIST kadu-0.4.3.tar.bz2 1181830 RMD160 e7de2e95e72ba9b6235695428daad97f9992b04a SHA1 6236137270dfb7f1b028309cf5e3142f5f15c924 SHA256 3790048e8883533a0bc89119261035759278c6392b4f934c3528b729699ac0ed
 DIST kadu-osdhints_notify-0.2.6.tar.gz 82130 RMD160 1f26da89765b25b613c1b0ada027ec2b7852ad75 SHA1 bfd22df74229fd4ecb3c164f4dc0b72d9a50712e SHA256 76583137a6e729f8916deb5a78342736eef50ed7521891212abdc29abb88ee8f
 DIST kadu-spy-0.0.8-1.tar.gz 18234 RMD160 08c0de0b132a5f9f16988f18e223f744df5327ee SHA1 a7acadfa218479f69abed9380a191a6606325d7e SHA256 5afd21398fc4ef027299e6a6e18219c7252a690d7f0b7db6f646675ae71b6730
 DIST kadu-theme-alt_cryst.tar.bz2 121877 RMD160 6d968a0ef651166cdb5e986e460adcf577e8cd03 SHA1 e6ebf4e063b480d8a4d9e4ba13d9ff15e41d0161 SHA256 0d2a5f27654e6829903c859c757fee27b708cc137e6b60f220c8a5c787ac276a
 DIST kadu-theme-crystal-16.tar.bz2 45993 RMD160 8d8344e7eec4f4c39255aab93b0ae14da6b0f4dd SHA1 9be6f978f177cc1a7d30add44fb5d77fd4b3aa9d SHA256 2b901a0559215c98e23a27ae548ed7270bf7194d93007befe33a973f702b7ed5
 DIST kadu-theme-crystal-22.tar.bz2 48895 RMD160 33e35704ba65922ccf592e1a3ca3c12c197d1a1e SHA1 846e70a69b516ae9349f5e0f4becf171e75fb62d SHA256 f297c5c96dc162e000410b7fece3f391b399e131b634afa5d5aa5d997bba0670
 DIST kadu-theme-gg3d.tar.bz2 78353 RMD160 9ea8ccb6f67e10652bc2c055cac0f9cb8cee41d3 SHA1 998dc761c096f372ac83819fa51756399bc4503a SHA256 5aca31feea238acb587e485136594b3156dea8479a3e2b490bdd1ffd385aaaf4
 DIST kadu-theme-noia-16.tar.bz2 109294 RMD160 8b086f6d6872000756ad9c67233d136add646e8b SHA1 47877a71865946b8493fd2358be28b71c5f8604e SHA256 29d56c5195e3ec8b7abf29558aa0155fb04a79bd69e44780cebfd80d8cb32eee
 DIST kadu-theme-nuvola-16.tar.gz 119276 RMD160 c2d1b14cdf3e9e3b6ae02e9a1c795fb0a5345c9a SHA1 64f8595684a5031fbf7f2e2013bcac99f0eab7ba SHA256 523dd03cc2caa528e7416d4c13d3fd60d4071a099e298559c10818bb8d816dc7
 DIST kadu-theme-nuvola-22.tar.gz 147311 RMD160 2ce8c8f7c9dabb9a68a307e3ff9ec40a42616952 SHA1 f7eb725a0e716cb54b63038d085ae0f9c450936e SHA256 d9f23d6d89fc7668669d9064e59c55cd2801feb45be0bbffe54437e965da7b42
 DIST kadu-theme-old_default.tar.bz2 85997 RMD160 f5d1a0163d0f371bc4fa369447c9b8e751b6fdab SHA1 24ceb7eb529937970006a754b55d9f6ad8d4c6e8 SHA256 9a1b77afe546cdeffdb0ef528535eee9c379e2e99946ac083868d38ec513d847
 DIST kadu-theme-piolnet.tar.bz2 79831 RMD160 918790970bb13c68a410ddbac7d8f882b7c1e6e8 SHA1 26926fc705d12851140c10c4cb314d9157364cbc SHA256 f25b60beb1732d2888a0faee765f9dca4bddd8351a01f92d68f31f18950232ce
 DIST kadu-theme-real_gg.tar.bz2 131697 RMD160 14e0744c70ae9fb813cdb5865a0ea5fb74b7aa00 SHA1 853c1793b0c7228849bd9237a37776997c7d5a1a SHA256 0e90222925edbb808505f4b59bdb0b85154ce842298c2efa1fbd89cd8fb22abd
 DIST kde_transparency.tar.bz2 1658 RMD160 77d10dcb2f3ccfc4051affa0cacbba82507a4cca SHA1 c30f799a87755df0224dd3fa41a3a7268c464f62 SHA256 137f3d625a5475534a8517c3f3669006a409d6110999db6ab4507c1b80c65a65
 DIST led_notify-0.2.tar.bz2 2838 RMD160 f294cea80410fa6ccf8905ee7c3157cbd55d0fe9 SHA1 01ae01e12831e432b1c1b8d4603049906bc87e17 SHA256 dfc06090dea46ef4b6587f2efba1dff0f779a48122cd403ad2755cc1ec4d5901
 DIST mail-0.2.0.tar.bz2 93363 RMD160 e8fb87e8d29003e09e59577c8e1741664ca8aa69 SHA1 3ae1205fd0e8da0f74a953efe7ef7e3377d83e09 SHA256 e628b2248ea501fc4772e47bacba36df4333dd0d1355c21c3f3e6a19b1671f39
 DIST screenshot-0.3.1.tar.gz 8539 RMD160 3f290e185cdfa17c3eb0eb58c2af5a247d8ad4ea SHA1 3f12173119d31bb0632e0f8beb584b3606c8e22b SHA256 310069376a016321972402ae34978bc1b8506b8e86b2b139639310dbe6539cdd
 DIST spellchecker-0.15.tar.gz 9303 RMD160 b4109c5151d978d5276503440dc0c421dfb649d3 SHA1 dba6d0afb506a1bec9fa304b1e2facb7273de9df SHA256 820127b09a0c4c8c9e8e7c1124d4cde1860b21461d1c7744276be0ccc11751d9
 DIST tabs-svn-rev38.tar.gz 12383 RMD160 d7ecfe49617e5d047521d4c5aac7a5fb07f913ce SHA1 68faaad54fa7a4308bf21747f5b7ae1ee7a7ccad SHA256 4514a23088351ae5fc0becca65c0977a9b980065d81e34459841d2e4eceda480
 DIST tcl_scripting-0.6.2-Josephine.tar.gz 626573 RMD160 6a4985ebf47695197daa659db5dc8103dc92ac3c SHA1 2057ad30f8042d431b722c79624d7f49fd7f1569 SHA256 e0680e737205abdd9b7186d2629cd6b65c90a06ec9945c9d5728e71737b829a5
 DIST weather-2.02.tar.bz2 46670 RMD160 0e7e1917e5e0296b4860a0cacf381b71a717d746 SHA1 0402e62e9fe5025414c6453214a0e285abaec767 SHA256 a9950c671ab19d582b6f639843d208bb0fabd2af4d5bec6c2f118a6b4248209d
 DIST xmms-1.25.tar.gz 14992 RMD160 0820e650df6ea2a906aef9709faaa238fc212450 SHA1 22905da983218a740a7f13152d6c4f47e4f09e39 SHA256 07a438d9daaa595a9cf4fd338c5d02f65a1d74b1aa45f18399922cba01ac0a99
 DIST xosd_notify-050607.tar.bz2 12511 RMD160 2629bd314f00567255472887a2a2f81d263a06d0 SHA1 f1f491a92d782e031fe0c72614b5072ced3679c6 SHA256 153d1b6bd2c4a41cddda743a6af70b2be2d064e7a15af3c9601df4f6fada2799
 EBUILD kadu-0.4.3-r10.ebuild 8758 RMD160 aa03cbb9ee24ed071bf65b75fe788fc6bf15aa08 SHA1 b0015b713c14d5abc7e572ff61e740e529744619 SHA256 90e56343093f38bcca22e4d891e4e3cb133601bb42066d0630af43f74593eec3
--- a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch
+++ b/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch
@@ -1,14 +0,0 @@
 diff -Naurp kadu-orig/modules/tcl_scripting/tcl_scripting.h kadu/modules/tcl_scripting/tcl_scripting.h
 --- kadu-orig/modules/tcl_scripting/tcl_scripting.h	2006-12-27 23:36:24.000000000 -0600
 +++ kadu/modules/tcl_scripting/tcl_scripting.h	2006-12-27 23:37:34.000000000 -0600
@@ -65,8 +65,8 @@ class TclSession : public QObject
 		bool allowErrors;
 	public:
 -		TclSession::TclSession(bool main = FALSE);
 -		TclSession::~TclSession();
 +		TclSession(bool main = FALSE);
 +		~TclSession();
 		void addMenu();
 		void delMenu();
 		void menuItemSetEnabled(int idx, bool enabled);
--- a/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff
+++ b/net-im/kadu/files/kadu-toolbar_toggle-gentoo.diff
@@ -1,162 +0,0 @@
 diff -aurp kadu.orig/kadu/kadu.cpp kadu/kadu/kadu.cpp
 --- kadu.orig/kadu/kadu.cpp	2005-03-20 15:48:41.000000000 +0100
 +++ kadu/kadu/kadu.cpp	2005-03-20 19:07:06.000000000 +0100
@@ -100,8 +100,21 @@ void ToolBar::createControls()
 		if ((*j).caption== "--separator--")
 			addSeparator();
 		else
 -			(*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption,
 -				QString::null, (*j).receiver, (*j).slot, this, (*j).name);
 +		{
 +			if ((*j).type == ToolButton::Push)
 +			{
 +				(*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption,
 +					QString::null, (*j).receiver, (*j).slot, this, (*j).name);
 +			}
 +			else
 +			{
 +				(*j).button = new QToolButton(icons_manager.loadIcon((*j).iconname), (*j).caption,
 +					QString::null, 0, 0, this, (*j).name);
 +				(*j).button->setToggleButton(true);
 +				(*j).button->setOn((*j).type == ToolButton::ToggleOn);
 +				connect((*j).button, SIGNAL(toggled(bool)), (*j).receiver, (*j).slot);
 +			}
 +		}
 	setStretchableWidget(new QWidget(this));
 	kdebugf2();
@@ -141,6 +154,34 @@ void ToolBar::registerButton(const QStri
 	RToolButton.slot= slot;
 	RToolButton.position= position;
 	RToolButton.name= name;
 +	RToolButton.type= ToolButton::Push;
 +
 +	if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1))
 +		RegisteredToolButtons.append(RToolButton);
 +	else
 +		RegisteredToolButtons.insert(RegisteredToolButtons.at(position), RToolButton);
 +
 +	if(instance!=NULL)
 +		instance->createControls();
 +	kdebugf2();
 +}
 +
 +void ToolBar::registerToggleButton(const QString &iconname, const QString& caption, bool on,
 +			QObject* receiver, const char* slot, int position, const char* name)
 +{
 +	kdebugf();
 +	if(instance!=NULL)
 +		instance->clear();
 +
 +	ToolButton RToolButton;
 +
 +	RToolButton.iconname= iconname;
 +	RToolButton.caption= caption;
 +	RToolButton.receiver= receiver;
 +	RToolButton.slot= slot;
 +	RToolButton.position= position;
 +	RToolButton.name= name;
 +	RToolButton.type= on ? ToolButton::ToggleOn : ToolButton::ToggleOff;
 	if ((RegisteredToolButtons.count()<(uint)(position+1)) || (position == -1))
 		RegisteredToolButtons.append(RToolButton);
@@ -400,8 +441,10 @@ Kadu::Kadu(QWidget *parent, const char *
 	setActiveGroup("");
 	// dodanie przyciskow do paska narzedzi
 -	ToolBar::registerButton("ShowHideInactiveUsers", tr("Show / hide inactive users"), Userbox, SLOT(showHideInactive()), -1, "inactiveUsersButton");
 -	ToolBar::registerButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"), Userbox, SLOT(showHideDescriptions()), -1, "withDescriptionUsersButton");
 +	ToolBar::registerToggleButton("ShowHideInactiveUsers", tr("Show / hide inactive users"),
 +		config_file.readBoolEntry("General","ShowHideInactive"), Userbox, SLOT(showHideInactive(bool)), -1, "inactiveUsersButton");
 +	ToolBar::registerToggleButton("ShowOnlyDescriptionUsers", tr("Show / hide users without description"),
 +		config_file.readBoolEntry("General","ShowOnlyDescriptionUsers"), Userbox, SLOT(showHideDescriptions(bool)), -1, "withDescriptionUsersButton");
 	ToolBar::registerButton("Configuration", tr("Configuration"), this, SLOT(configure()), -1, "configurationButton");
 	ToolBar::registerSeparator();
 	ToolBar::registerButton("History", tr("View history"), this, SLOT(viewHistory()), -1, "historyButton");
 diff -aurp kadu.orig/kadu/kadu.h kadu/kadu/kadu.h
 --- kadu.orig/kadu/kadu.h	2005-03-20 15:48:41.000000000 +0100
 +++ kadu/kadu/kadu.h	2005-03-20 19:02:48.000000000 +0100
@@ -35,6 +35,12 @@ class ToolBar : public QToolBar
 			QString slot;
 			QToolButton* button;
 			int position;
 +			enum
 +			{
 +				Push,
 +				ToggleOff,
 +				ToggleOn
 +			} type;
 		};
 		static QValueList<ToolButton> RegisteredToolButtons;
 		void createControls();
@@ -44,6 +50,8 @@ class ToolBar : public QToolBar
 		~ToolBar();
 		static void registerButton(const QString &iconname, const QString& caption,
 			QObject* receiver, const char* slot, const int position=-1, const char* name="");
 +		static void registerToggleButton(const QString &iconname, const QString& caption, bool on,
 +			QObject* receiver, const char* slot, const int position=-1, const char* name="");
 		static void unregisterButton(const char* name);
 		static void registerSeparator(int position=-1);
 		static QToolButton* getButton(const char* name);
 diff -aurp kadu.orig/kadu/userbox.cpp kadu/kadu/userbox.cpp
 --- kadu.orig/kadu/userbox.cpp	2005-03-20 15:48:42.000000000 +0100
 +++ kadu/kadu/userbox.cpp	2005-03-20 18:08:42.000000000 +0100
@@ -678,6 +678,14 @@ void UserBox::showHideInactive()
 	kdebugf2();
 }
 +void UserBox::showHideInactive(bool state)
 +{
 +	kdebugf();
 +	config_file.writeEntry("General","ShowHideInactive",state);
 +	all_refresh();
 +	kdebugf2();
 +}
 +
 void UserBox::showHideDescriptions()
 {
 	kdebugf();
@@ -685,6 +693,13 @@ void UserBox::showHideDescriptions()
 	all_refresh();
 }
 +void UserBox::showHideDescriptions(bool state)
 +{
 +	kdebugf();
 +	config_file.writeEntry("General","ShowOnlyDescriptionUsers",state);
 +	all_refresh();
 +}
 +
 UinsList UserBox::getSelectedUins() const
 {
 	kdebugf();
 diff -aurp kadu.orig/kadu/userbox.h kadu/kadu/userbox.h
 --- kadu.orig/kadu/userbox.h	2005-03-20 15:48:42.000000000 +0100
 +++ kadu/kadu/userbox.h	2005-03-20 17:58:14.000000000 +0100
@@ -418,12 +418,26 @@ class UserBox : public QListBox , QToolT
 		void showHideInactive();
 		/**
 +			\fn void showHideInactive()
 +			Prze³±cza tryb pokazywania kontaktów niedostêpnych.
 +			\param state Je¶li true - kontakty nieaktywne sa widoczne
 +		**/
 +		void showHideInactive(bool state);
 +
 +		/**
 			\fn void showHideDescriptions()
 			Prze³±cza tryb pokazywania opisów kontaktów.
 		**/
 		void showHideDescriptions();
 		/**
 +			\fn void showHideDescriptions()
 +			Prze³±cza tryb pokazywania opisów kontaktów.
 +			\param state Je¶li true - kontakty bez opisow sa ukryte 
 +		**/
 +		void showHideDescriptions(bool state);
 +
 +		/**
 			\fn virtual void clear()
 			Czy¶li listê.
 		**/
--- a/net-im/kadu/files/xosd-gentoo.patch
+++ b/net-im/kadu/files/xosd-gentoo.patch
@@ -1,38 +0,0 @@
 --- modules/xosd_notify/xosd_notify.cpp.orig	2005-02-27 16:21:08.000000000 +0100
 +++ modules/xosd_notify/xosd_notify.cpp	2005-03-18 11:56:17.521249672 +0100
@@ -51,7 +51,7 @@
 					"NewChat"<<"NewMessage"<<"Error"<<"OtherMessage";
 	int val;
 -	CONST_FOREACH(it, optionPrefixes)
 +	FOREACH(it, optionPrefixes)
 	{
 		config_file.addVariable("XOSD", (*it)+"Position", 4);
 		val = config_file.readNumEntry("XOSD", (*it)+"Position");
@@ -392,7 +392,7 @@
 	}
 	int y_offset = config_file.readNumEntry("XOSD", QString("OffsetY%1").arg(position));
 -	CONST_FOREACH(line, lines[position])
 +	FOREACH(line, lines[position])
 	{
 		xosd_set_vertical_offset((*line).handle, y_offset);
 		xosd_hide((*line).handle);
@@ -456,7 +456,7 @@
 	toggled_SetAll(config_file.readBoolEntry("XOSD", "SetAll"));
 	configs.clear();
 -	CONST_FOREACH(prefix, optionPrefixes)
 +	FOREACH(prefix, optionPrefixes)
 	{
 		TestConfig c;
 		c.type = *prefix;
@@ -498,7 +498,7 @@
 {
 	kdebugf();
 -	CONST_FOREACH(prefix, optionPrefixes)
 +	FOREACH(prefix, optionPrefixes)
 	{
 		TestConfig c = configs[*prefix];
 		config_file.writeEntry("XOSD", (*prefix)+"Position", c.position);
--- a/net-im/kadu/kadu-0.4.3-r10.ebuild
+++ b/net-im/kadu/kadu-0.4.3-r10.ebuild
@@ -1,259 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.3.ebuild,v 1.10 2007/07/12 05:34:48 mr_bones_ Exp $
 inherit flag-o-matic eutils
 TCL="0.6.2-Josephine"		#http://scripts.one.pl/tcl4kadu
 TABS="rev38"				#http://gov.one.pl/svnsnap
 AMAROK="1.13"				#http://scripts.one.pl/amarok
 WEATHER="2.02"				#http://www.kadu.net/~blysk/
 #EXT_INFO="2.0beta5"			#http://kadu-ext-info.berlios.de
 EXT_INFO="1.4.3"
 XMMS="1.25"					#http://scripts.one.pl/xmms
 XOSD_NOTIFY="050607"		#http://www.kadu.net/~joi/xosd_notify
 MAIL="0.2.0"				#http://michal.gov.one.pl/mail
 SPELLCHECKER="0.15"			#http://scripts.one.pl/spellchecker
 SPY="0.0.8-1"				#http://scripts.one.pl/~przemos/projekty/kaduspy/
 FIREWALL="0.8"				#http://users.skorpion.wroc.pl/arturmat/firewall/
 LED_NOTIFY="0.2"			#http://republika.pl/buysk/led_notify
 SCREEN_SHOT="0.3.1"			#http://scripts.one.pl/screenshot
 CONTACTS="1.0rc1"			#http://obeny.kicks-ass.net/obeny/kadu/modules/contacts
 OSD_NOTIFY="0.2.6"			#http://www.kadu.net/~pan_wojtas/osdhints_notify/
 THEMES="kadu-theme-crystal-16
 	kadu-theme-crystal-22
 	kadu-theme-gg3d
 	kadu-theme-noia-16
 	kadu-theme-nuvola-16
 	kadu-theme-nuvola-22
 	kadu-theme-old_default
 	kadu-theme-piolnet
 	kadu-theme-real_gg
 	alt_cryst"				#http://www.kadu.net/download/additions
 DESCRIPTION="QT client for popular in Poland Gadu-Gadu IM network"
 HOMEPAGE="http://kadu.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug alsa arts esd voice speech nas oss spell ssl tk
 	xmms xosd amarok extraicons extramodules mail config_wizard"
 DEPEND="=x11-libs/qt-3*
 	alsa? ( media-libs/alsa-lib
 	media-libs/libsndfile )
 	arts? ( kde-base/arts
 			media-libs/libsndfile )
 	esd? ( media-sound/esound
 			media-libs/libsndfile )
 	nas? ( media-libs/nas
 			media-libs/libsndfile )
 	oss? ( media-libs/libsndfile )
 	config_wizard? ( media-libs/libsndfile )
 	voice? ( media-libs/libsndfile )
 	amarok? ( media-sound/amarok )
 	spell? ( app-dicts/aspell-pl )
 	ssl? ( dev-libs/openssl )
 	speech? ( app-accessibility/powiedz )
 	tk? ( >=dev-lang/tk-8.4.0 )
 	xmms? ( media-sound/xmms )
 	xosd? ( x11-libs/xosd )"
 SRC_URI="http://kadu.net/download/stable/${P}.tar.bz2
 	amarok? ( http://scripts.one.pl/amarok/stable/0.4.0/amarok-${AMAROK}.tar.gz )
 	tk? ( http://scripts.one.pl/tcl4kadu/files/stable/${PV}/tcl_scripting-${TCL}.tar.gz )
 	extraicons? (
 		http://biprowod.wroclaw.pl/kadu/kadu-theme-alt_cryst.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-gg3d.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-noia-16.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
 		http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
 		http://www.kadu.net/download/additions/kadu-theme-old_default.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-piolnet.tar.bz2
 		http://www.kadu.net/download/additions/kadu-theme-real_gg.tar.bz2 )
 	extramodules? (
 		http://gov.one.pl/svnsnap/tabs-svn-${TABS}.tar.gz
 		http://www.kadu.net/~blysk/weather-${WEATHER}.tar.bz2
 		http://www.kadu.net/~dzwiedziu/pub/ext_info-${EXT_INFO}.tar.bz2
 		http://scripts.one.pl/~przemos/download/kadu-spy-${SPY}.tar.gz
 		http://users.skorpion.wroc.pl/arturmat/firewall/files/firewall-${FIREWALL}.tar.bz2
 		http://pcb45.tech.us.edu.pl/~blysk/led_notify/led_notify-${LED_NOTIFY}.tar.bz2
 		http://scripts.one.pl/screenshot/stable/0.4.0/screenshot-${SCREEN_SHOT}.tar.gz
 		http://obeny.kicks-ass.net/obeny/kadu/modules/contacts/contacts-${CONTACTS}.tar.bz2
 		http://www.kadu.net/~joi/kde_transparency.tar.bz2
 		http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-${OSD_NOTIFY}.tar.gz )
 	xmms? ( http://scripts.one.pl/xmms/devel/0.4.0/xmms-${XMMS}.tar.gz )
 	xosd? ( http://www.kadu.net/~joi/xosd_notify/packages/xosd_notify-${XOSD_NOTIFY}.tar.bz2 )
 	mail? ( http://michal.kernel-panic.cjb.net/mail/tars/release/mail-${MAIL}.tar.bz2 )
 	spell? (
 	http://scripts.one.pl/spellchecker/devel/${PV}/spellchecker-${SPELLCHECKER}.tar.gz
 	)"
 S=${WORKDIR}/${PN}
 enable_module() {
 	if use ${1}; then
 		mv ${WORKDIR}/${2} ${WORKDIR}/kadu/modules/
 		module_config ${2} m
 	fi
 }
 module_config() {
 	sed -i -r "s/(^module_${1}\\s*=\\s*).*/\\1${2}/" .config
 }
 spec_config() {
 	sed -i -r "s/(^${2}\\s*=\\s*).*//" modules/${1}/spec
 	echo "${2}=${3}" >> modules/${1}/spec
 }
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# Disabling autodownload for modules
 	rm -f ${WORKDIR}/kadu/modules/*.web
 	# Disabling autodownload for icons
 	rm -f ${WORKDIR}/kadu/varia/themes/icons/*.web
 	# Disabling all modules and iconsets for further activation via USE flags
 	sed .config -i -e 's/=m/=n/g'
 	sed .config -i -e 's/=y/=n/g'
 	# Enable default icon theme
 	sed .config -i -e 's/icons_default=n/icons_default=y/'
 	enable_module amarok amarok
 	enable_module spell spellchecker
 	enable_module xmms xmms
 	enable_module xosd xosd_notify
 	enable_module mail mail
 	enable_module tk "tcl_scripting"
 	enable_module extramodules weather
 	enable_module extramodules ext_info
 	enable_module extramodules spy
 	enable_module extramodules led_notify
 	enable_module extramodules tabs
 	enable_module extramodules screenshot
 	enable_module extramodules osdhints_notify
 	# put some patches
 	epatch "${FILESDIR}"/kadu-toolbar_toggle-gentoo.diff
 	use tk && epatch "${FILESDIR}"/${P}-tcltk-gcc4.patch
 #	use tcltk && epatch ${FILESDIR}/${P}-tcltk.patch
 	use xosd && epatch "${FILESDIR}"/xosd-gentoo.patch
 }
 src_compile() {
 	# Enabling default iconset
 	module_config icons_default y
 	# Enabling dependencies that are needed by other modules
 	module_config account_management m
 	module_config autoaway m
 	module_config autoresponder m
 	module_config dcc m
 	module_config default_sms m
 	module_config docking m
 	module_config filedesc m
 	module_config hints m
 	module_config notify m
 	module_config sms m
 	module_config desktop_docking m
 	use config_wizard && \
 		( module_config sound m; module_config config_wizard m )
 	if use extramodules; then
 		if use !tk; then
 			ewarn "script_chess depends on module_tcl_scripting;"
 			ewarn "It won't be installed."
 		fi
 	fi
 	# Firewall
 	if use extramodules; then
 		if use !tk; then
 			ewarn "script_firewall depends on module_tcl_scripting;"
 			ewarn "It won't be installed."
 		fi
 	fi
 	use speech && module_config speech m
 	use extramodules && module_config autoresponder
 	# static modules (disable only, do not compile as .so)
 	use ssl && module_config encryption y
 	# dynamic modules
 	use alsa	&&	( module_config sound m; module_config alsa_sound m )
 	use arts	&&	( module_config sound m; module_config arts_sound m )
 	use esd		&&	( module_config sound m; module_config esd_sound m )
 	use nas		&&	( module_config sound m; module_config nas_sound m )
 	use voice	&&	( module_config sound m; module_config voice m )
 	use oss		&&	( module_config sound m; module_config dsp_sound m )
 	module_config x11_docking m
 	module_config wmaker_docking m
 	# Some fixes
 	einfo "Fixing modules spec files"
 	if use arts; then
 		spec_config arts_sound MODULE_INCLUDES_PATH "\"$(kde-config --prefix)/include $(kde-config --prefix)/include/artsc\""
 		spec_config arts_sound MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 	if use amarok; then
 		spec_config amarok MODULE_INCLUDES_PATH $(kde-config --prefix)/include
 		spec_config amarok MODULE_LIBS_PATH $(kde-config --prefix)/lib
 	fi
 	if use extramodules; then
 		einfo "Changing default firewall log location to user's homedir/.gg/firewall.log"
 		sed ${WORKDIR}/firewall.tcl -i -e \
 			's%$module(scriptpath)/firewall.log%$env(HOME)/.gg/firewall.log%g'
 	fi
 	local myconf
 	myconf="${myconf} --enable-modules --enable-dist-info=Gentoo"
 	use voice && myconf="${myconf} --enable-dependency-tracing"
 	use debug && myconf="${myconf} --enable-debug"
 	econf ${myconf} || die
 	emake || die
 }
 src_install() {
 	make \
 		DESTDIR=${D} \
 		install || die
 	# Installing additional scripts and plugins
 	# Chess and Firewall
 	if use extramodules; then
 		if use tk; then
 		einfo "Installing Chess script"
 		insinto /usr/share/kadu/modules/data/tcl_scripting/scripts
 		doins ${WORKDIR}/KaduChess/{data,pics,KaduChess.tcl}
 		# small fix form author's site
 		sed ${D}/usr/share/kadu/modules/data/tcl_scripting/scripts/KaduChess.tcl -i -e \
 			's/on chat0 KC_recv KC_recv/on chat0 KC_recv/g'
 		einfo "Installing Firewall module"
 		doins ${WORKDIR}/firewall{.tcl,.png}
 		fi
 	fi
 	if use extraicons; then
 		einfo "Installing extra icons"
 		for theme in ${THEMES}; do
 			insinto /usr/share/kadu/themes/icons/${theme}
 			doins ${WORKDIR}/${theme}/{icons.conf,*.png}
 		done
 	fi
 }
--- a/net-misc/nozomi/Manifest
+++ b/net-misc/nozomi/Manifest
@@ -0,0 +1,5 @@
 AUX nozomi-2.21-kernel-2.6.20.patch 850 RMD160 0e67b2e8c26f22b977f79c7ac88e9a277a5465df SHA1 eed022c3091d50b7962a65a58b0de7304883d54c SHA256 e41d7d37643196714351afeb1291cbe902f854d0d15f4584490843e31be3d38d
 AUX nozomi-2.21-kernel-2.6.20.patch.ori 442 RMD160 8dfb166eaeded9495180d9b680c1aba4a87697dc SHA1 1ef51ae3667bc598496a8e30de4c79e614d3a6ae SHA256 6da6145386ea3d104f04805f735d90304776ed13cc8ed15963595402eed9b12f
 AUX nozomi-2.21-pci_module_init.patch 357 RMD160 bc3877847c3b0549d8e282ca0b480c2b111880b7 SHA1 79c99e26a70a52fda8091050c2fec93a87d28398 SHA256 dc91726f12a820d8d0cd6b173e7c0cd54082172bc0c54c1aaf2323e006971f09
 DIST nozomi_2.21alpha_060917.tar.gz 24792 RMD160 3db7dbb311f920a58da48a4900b57e8486537435 SHA1 6f3d15f2cb4511b36647941353b16ff518bafb4a SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639
 EBUILD nozomi-2.21-r1.ebuild 1909 RMD160 78b08a36e374079a256c11b6b65b680633d1f770 SHA1 3c3bcb9a79f522f4ad73f02a609fae6d616cdf4a SHA256 e4d86509c63b7302c0e9a0afcc9c0780258f728084c00d1670094cac2d8f3ad4
--- a/net-misc/nozomi/files/digest-nozomi-2.21
+++ b/net-misc/nozomi/files/digest-nozomi-2.21
@@ -0,0 +1,3 @@
 MD5 1ad7b8361ed5e138a833c9f552c9c8f0 nozomi_2.21alpha_060917.tar.gz 24792
 RMD160 3db7dbb311f920a58da48a4900b57e8486537435 nozomi_2.21alpha_060917.tar.gz 24792
 SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639 nozomi_2.21alpha_060917.tar.gz 24792
--- a/net-misc/nozomi/files/digest-nozomi-2.21-r1
+++ b/net-misc/nozomi/files/digest-nozomi-2.21-r1
@@ -0,0 +1,3 @@
 MD5 1ad7b8361ed5e138a833c9f552c9c8f0 nozomi_2.21alpha_060917.tar.gz 24792
 RMD160 3db7dbb311f920a58da48a4900b57e8486537435 nozomi_2.21alpha_060917.tar.gz 24792
 SHA256 c52e12058fd3161a89abd7d5af20824d0b1e88516ad9241ec49822de1d32b639 nozomi_2.21alpha_060917.tar.gz 24792
--- a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch
+++ b/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch
@@ -0,0 +1,26 @@
 --- nozomi_2.21alpha_060917.orig/nozomi.c	2006-09-17 10:26:39.000000000 +0200
 +++ nozomi_2.21alpha_060917/nozomi.c	2007-08-15 15:39:21.000000000 +0200
@@ -1686,7 +1686,13 @@
 		ret = -ENODEV;
 		goto err_disable_device;
 	}
 -	dc->base_addr = (void *)ioremap((int)dc->base_addr, dc->card_type);
 +
 +#ifdef CONFIG_X86_64
 + 	dc->base_addr = (void*)ioremap((u64)dc->base_addr, dc->card_type);
 +#else
 +   	dc->base_addr = (void *)ioremap((int)dc->base_addr, dc->card_type);
 +#endif 
 +
 	if (!dc->base_addr) {
 		dev_err(&pdev->dev, "No I/O-Address for card detected\n");
 		ret = -ENODEV;
@@ -1733,7 +1739,7 @@
 		BUG_ON(!dc->tty_flip_wq);
 		return -ENOMEM;
 	}
 -	INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc);
 +	INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function);
 #endif
 	spin_lock_init(&dc->spin_mutex);
 	make_proc_dirs();
--- a/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori
+++ b/net-misc/nozomi/files/nozomi-2.21-kernel-2.6.20.patch.ori
@@ -0,0 +1,11 @@
 --- nozomi.c.orig    2007-02-14 21:14:41.000000000 +0100 
 +++ nozomi.c    2007-02-14 19:49:51.000000000 +0100 
@@ -1733,7 +1733,7 @@ 
                BUG_ON(!dc->tty_flip_wq); 
                return -ENOMEM; 
        } 
 -       INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc); 
 +       INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function); 
 #endif 
        spin_lock_init(&dc->spin_mutex); 
        make_proc_dirs();
--- a/net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch
+++ b/net-misc/nozomi/files/nozomi-2.21-pci_module_init.patch
@@ -0,0 +1,11 @@
 --- nozomi_2.21alpha_060917.orig/nozomi.c	2007-08-15 15:42:00.000000000 +0200
 +++ nozomi_2.21alpha_060917/nozomi.c	2007-08-15 15:43:06.000000000 +0200
@@ -2399,7 +2399,7 @@
 {
 	int rval = 0;
 -	rval = pci_module_init(&nozomi_driver);
 +	rval = pci_register_driver(&nozomi_driver);
 	printk(KERN_INFO "Initializing %s\n", VERSION_STRING);
 	return rval;
 }
--- a/net-misc/nozomi/nozomi-2.21-r1.ebuild
+++ b/net-misc/nozomi/nozomi-2.21-r1.ebuild
@@ -0,0 +1,80 @@
 # Copyright 1999-2006 Gentoo Foundation 
 # Distributed under the terms of the GNU General Public License v2 
 # $Header: /var/cvsroot/gentoo-x86/net-misc/nozomi/nozomi-2.21.ebuild,v 1.1 2006/08/28 09:25:36 mariano Exp $ 
 inherit eutils linux-mod 
 nozomifile="nozomi_2.21alpha_060917.tar.gz" 
 DESCRIPTION="Driver for modem Option Globetrotter UMTS/EDGE " 
 HOMEPAGE="http://www.pharscape.org" 
 #SRC_URI="/usr/portage/distfiles/${PN}-2.21.tar.bz2" 
 SRC_URI="${nozomifile}" 
 LICENSE="GPL-2" 
 SLOT="0" 
 KEYWORDS="x86 ~amd64" 
 RESTRICT="fetch" 
 IUSE="" 
 MODULE_NAMES="nozomi(kernel/drivers/pci/hotplug:)" 
 BUILD_TARGETS=" " 
 FETCH_NOZOMI="http://www.pharscape.org/index2.php?option=com_forum&Itemid=68&page=download&id=18" 
 CONFIG_CHECK="MODULES" 
 S=${WORKDIR}/nozomi_2.21alpha_060917 
 pkg_setup() { 
   linux-mod_pkg_setup 
   BUILD_PARAMS="KDIR=${KV_DIR}" 
 } 
 pkg_nofetch() { 
   einfo "Please download ${nozomifile} from:" 
   einfo ${FETCH_NOZOMI} 
   einfo "and move it to ${DISTDIR}" 
 } 
 src_unpack() { 
   if [ ! -r ${DISTDIR}/${nozomifile} ]; then 
      die "cannot read ${nozomifile}. Please check the permission and try again." 
   fi 
   for pkg in ${A}; do 
      cd ${WORKDIR} 
      unpack ${pkg} 
      if kernel_is ge 2 6 20 ; then 
                      cd ${S} 
         epatch "${FILESDIR}"/${P}-kernel-2.6.20.patch 
      fi
      if kernel_is ge 2 6 22 ; then 
                      cd ${S} 
 	 epatch "${FILESDIR}"/${P}-pci_module_init.patch
      fi 
   done 
 } 
 src_compile() { 
   linux-mod_src_compile 
 } 
 src_install() { 
   linux-mod_src_install 
   #dodir /usr/share/${PN}/samples 
   #insinto   /usr/share/${PN}/samples 
   #doins "${FILESDIR}"/net 
   #doins "${FILESDIR}"/www.plusgsm.pl 
   #doins "${FILESDIR}"/chat-www.plusgsm.pl 
   #doins "${FILESDIR}"/51-3g-datacard.rules 
 } 
 pkg_postinst() { 
   linux-mod_pkg_postinst 
   einfo "Have fun :)" 
 }
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,12 +0,0 @@
 AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe SHA1 59a923f6263e954a7db488021005448cefcc8f5a SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1
 MD5 c1ef6366ba5892111ddef08887328663 files/fuse-fix-lazy-binding.patch 398
 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe files/fuse-fix-lazy-binding.patch 398
 SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1 files/fuse-fix-lazy-binding.patch 398
 DIST fuse-2.6.0.tar.gz 474956 RMD160 a963d7938500d9e7dd5d77c47f935015ea822991 SHA1 3c7782147ae406450e9bd17f12a81f183dbe6550 SHA256 9572530349b2cebbbc76278bfcbda0de3590c022d2dcd439f381ef497988d9b1
 EBUILD fuse-2.6.0-r10.ebuild 1807 RMD160 b5c40831e8366038177dfa7d71958938d3999fc2 SHA1 78152a1e09e5cfdd105e7bf9c12128062005d077 SHA256 84b1bf58fba9d9d0810d510b2abdc01a9a2f4795e461ded0c36044eb205b1950
 MD5 b2e9064953ffb6320f60404367478873 fuse-2.6.0-r10.ebuild 1807
 RMD160 b5c40831e8366038177dfa7d71958938d3999fc2 fuse-2.6.0-r10.ebuild 1807
 SHA256 84b1bf58fba9d9d0810d510b2abdc01a9a2f4795e461ded0c36044eb205b1950 fuse-2.6.0-r10.ebuild 1807
 MD5 97046bd567f2b300eb03e589fe478be4 files/digest-fuse-2.6.0-r10 232
 RMD160 b67749e56a807eaa892f46042bf7f7774a981e5c files/digest-fuse-2.6.0-r10 232
 SHA256 2875cbaf4443af074f31092da113c9a1bbdf052391db73e24c71772c99c90c37 files/digest-fuse-2.6.0-r10 232
--- a/sys-fs/fuse/files/digest-fuse-2.6.0-r10
+++ b/sys-fs/fuse/files/digest-fuse-2.6.0-r10
@@ -1,3 +0,0 @@
 MD5 997900fde4462c95ca11972410a0b910 fuse-2.6.0.tar.gz 474956
 RMD160 a963d7938500d9e7dd5d77c47f935015ea822991 fuse-2.6.0.tar.gz 474956
 SHA256 9572530349b2cebbbc76278bfcbda0de3590c022d2dcd439f381ef497988d9b1 fuse-2.6.0.tar.gz 474956
--- a/sys-fs/fuse/files/fuse-fix-lazy-binding.patch
+++ b/sys-fs/fuse/files/fuse-fix-lazy-binding.patch
@@ -1,11 +0,0 @@
 diff -pur fuse-1.4.orig/util/Makefile.in fuse-1.4/util/Makefile.in
 --- fuse-1.4.orig/util/Makefile.in	2005-01-02 21:09:09.000000000 +0100
 +++ fuse-1.4/util/Makefile.in	2005-01-03 08:49:25.333258992 +0100
@@ -36,6 +36,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 ACLOCAL = @ACLOCAL@
 +AM_CFLAGS=-Wl,-z,now
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
--- a/sys-fs/fuse/fuse-2.6.0-r10.ebuild
+++ b/sys-fs/fuse/fuse-2.6.0-r10.ebuild
@@ -1,70 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.0.ebuild,v 1.1 2006/11/01 15:57:22 genstef Exp $
 inherit linux-mod eutils libtool
 MY_P=${P/_/-}
 DESCRIPTION="An interface for filesystems implemented in userspace."
 HOMEPAGE="http://fuse.sourceforge.net"
 SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kernel_linux kernel_FreeBSD"
 S=${WORKDIR}/${MY_P}
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 MODULE_NAMES="fuse(fs:${S}/kernel)"
 CONFIG_CHECK="@FUSE_FS:fuse"
 BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
 			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
 BUILD_TARGETS="all"
 ECONF_PARAMS="--with-kernel=${KV_OUT_DIR}"
 FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
 We will continue, but we wont build the module this time."
 pkg_setup() {
 	use kernel_linux && linux-mod_pkg_setup
 }
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
 	elibtoolize
 }
 src_compile() {
 	econf \
 		--disable-kernel-module \
 		--disable-example \
 		|| die "econf failed for fuse userland"
 	emake || die "emake failed"
 	if use kernel_linux ; then
 		cd "${S}"
 		sed -i -e 's/.*depmod.*//g' kernel/Makefile.in
 		convert_to_m kernel/Makefile.in
 		linux-mod_src_compile
 	fi
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
 		README.NFS NEWS doc/how-fuse-works
 	docinto example
 	dodoc example/*
 	if use kernel_linux ; then
 		linux-mod_src_install
 	else
 		insinto /usr/include/fuse
 		doins include/fuse_kernel.h
 	fi
 }
 pkg_postinst() {
 	use kernel_linux && linux-mod_pkg_postinst
 }
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,8 +0,0 @@
 DIST loop-AES-v3.1e.tar.bz2 169664 RMD160 78a54330a343103900cc479d58645ec77563ded0 SHA1 10535c8279e55555686af9e39945ccff2434e44f SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d
 EBUILD loop-aes-3.1e.ebuild 1637 RMD160 7d0ea2de03b040b14ef42fb6ec844f5aedbc0c77 SHA1 2db871ff5b9e82ef25b2413ed6ad24cbb88d727c SHA256 e890c9d925c53de8ae87358c596151e5e8e43ae69bfd0ed6429cf002c7619dfd
 MD5 12cbf962f3c94c5589e1871439006bc7 loop-aes-3.1e.ebuild 1637
 RMD160 7d0ea2de03b040b14ef42fb6ec844f5aedbc0c77 loop-aes-3.1e.ebuild 1637
 SHA256 e890c9d925c53de8ae87358c596151e5e8e43ae69bfd0ed6429cf002c7619dfd loop-aes-3.1e.ebuild 1637
 MD5 da55984d097e89c17d48d5c8f34257f2 files/digest-loop-aes-3.1e 247
 RMD160 f733a91211bfe7c4503d3b72db9e7808d0a581aa files/digest-loop-aes-3.1e 247
 SHA256 639f282c3e471b9838ad6abbcf5fb73648d86ac97aa99f4667f685a5d15cb863 files/digest-loop-aes-3.1e 247
--- a/sys-fs/loop-aes/files/digest-loop-aes-3.1e
+++ b/sys-fs/loop-aes/files/digest-loop-aes-3.1e
@@ -1,3 +0,0 @@
 MD5 021d6a83e05a13ad84cd601d5e5ecefb loop-AES-v3.1e.tar.bz2 169664
 RMD160 78a54330a343103900cc479d58645ec77563ded0 loop-AES-v3.1e.tar.bz2 169664
 SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d loop-AES-v3.1e.tar.bz2 169664
--- a/sys-fs/loop-aes/loop-aes-3.1e.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.1e.ebuild
@@ -1,65 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.1d.ebuild,v 1.4 2006/10/04 15:51:53 genstef Exp $
 inherit linux-mod eutils
 MY_P="${PN/aes/AES}-v${PV}"
 DESCRIPTION="Linux kernel module to encrypt local file systems and disk partitions with AES cipher."
 HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
 SRC_URI="mirror://sourceforge/loop-aes/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="keyscrub padlock"
 KEYWORDS="~amd64 ~hppa ~ppc x86"
 S="${WORKDIR}/${MY_P}"
 CONFIG_CHECK="!BLK_DEV_LOOP"
 MODULE_NAMES="loop(block:)"
 BUILD_TARGETS="all"
 RDEPEND=">=sys-apps/util-linux-2.12r"
 pkg_setup() {
 	if ! built_with_use sys-apps/util-linux crypt; then
 		eerror "loop-aes needs >=util-linux-2.12q-r1 compiled with crypt use-flag enabled!"
 		die "util-linux without crypt detected"
 	fi
 	linux-mod_pkg_setup
 	if ! linux_chkconfig_present KMOD && \
 	   ! linux_chkconfig_present KERNELD
 	then
 		ewarn ""
 		ewarn "It is recommended to have Automatic kernel module loading"
 		ewarn "(CONFIG_KERNELD in kernels 2.0 or CONFIG_KMOD in newer)"
 		ewarn ""
 	fi
 	BUILD_PARAMS="LINUX_SOURCE=${KV_DIR} MODINST=n RUNDM=n"
 	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
 	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
 }
 src_unpack () {
 	unpack ${A}
 	convert_to_m ${S}/Makefile
 }
 src_install() {
 	linux-mod_src_install
 	dodoc README
 }
 pkg_postinst() {
 	linux-mod_pkg_postinst
 	einfo ""
 	einfo "For more instructions take a look at examples in"
 	einfo "/usr/share/doc/${PF}/README.gz"
 	einfo ""
 }
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,44 +0,0 @@
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419
 SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb files/gtk+-1.2-locale_fix.patch 419
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 MD5 01aa21ac7a54f5647ad71011b05f300f files/gtk+-1.2.10-as-needed.patch 19865
 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e files/gtk+-1.2.10-as-needed.patch 19865
 SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7 files/gtk+-1.2.10-as-needed.patch 19865
 AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 files/gtk+-1.2.10-m4.patch 220
 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 files/gtk+-1.2.10-m4.patch 220
 AUX gtk+-gdk-pixbuf-testfix.patch 578 RMD160 317120af2683d5ac6119a89745b38f71b0581e40 SHA1 19117bf9b667799dce0f319a76354ab615125cec SHA256 f1fb49b3a93db10bdf6f29a641d5bdb6ebb96956623f0492a52efebdfa238fb2
 MD5 9ea5c063ade44a46b279eab398fc969a files/gtk+-gdk-pixbuf-testfix.patch 578
 RMD160 317120af2683d5ac6119a89745b38f71b0581e40 files/gtk+-gdk-pixbuf-testfix.patch 578
 SHA256 f1fb49b3a93db10bdf6f29a641d5bdb6ebb96956623f0492a52efebdfa238fb2 files/gtk+-gdk-pixbuf-testfix.patch 578
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 files/gtkrc 627
 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gtkrc 627
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 EBUILD gtk+-1.2.10-r11.ebuild 2033 RMD160 24ec6feebfce673f0a81af1905963741f8e073de SHA1 a2d36149fb707fe5cb82a85f01d628d482ee6162 SHA256 b581707ebeb94e69954bd080234d2667b8e8c9aa90b933df8c8677d41628b697
 MD5 2f736fc4a5ca2d7d68e746063414ea85 gtk+-1.2.10-r11.ebuild 2033
 RMD160 24ec6feebfce673f0a81af1905963741f8e073de gtk+-1.2.10-r11.ebuild 2033
 SHA256 b581707ebeb94e69954bd080234d2667b8e8c9aa90b933df8c8677d41628b697 gtk+-1.2.10-r11.ebuild 2033
 EBUILD gtk+-1.2.10-r12.ebuild 2320 RMD160 e969b3b74e831d40799ea1bdfbe08a1eb03882a5 SHA1 bb5e2a4477553301690123a93080534a1f02cd69 SHA256 47548266fb2307527b5c373c75099589b48ee3c8b30cbae394a7246e3d869d03
 MD5 58664054a0d023536e4326c1c52e21b1 gtk+-1.2.10-r12.ebuild 2320
 RMD160 e969b3b74e831d40799ea1bdfbe08a1eb03882a5 gtk+-1.2.10-r12.ebuild 2320
 SHA256 47548266fb2307527b5c373c75099589b48ee3c8b30cbae394a7246e3d869d03 gtk+-1.2.10-r12.ebuild 2320
 MISC ChangeLog 40235 RMD160 cc2ec659794ae7b1de65ef35196f4ea626b59913 SHA1 fa9d49b305cbaec976f3e3b9f9c68d2b8bf1fbd6 SHA256 009232bb3aff0c625c267c3dc466d6c81c143155fc16212d5a106bef74c32deb
 MD5 50d7ad82b8011008a2870fafcb9393d0 ChangeLog 40235
 RMD160 cc2ec659794ae7b1de65ef35196f4ea626b59913 ChangeLog 40235
 SHA256 009232bb3aff0c625c267c3dc466d6c81c143155fc16212d5a106bef74c32deb ChangeLog 40235
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
 SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d metadata.xml 424
 MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r11 506
 RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r11 506
 SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r11 506
 MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r12 506
 RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r12 506
 SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r12 506
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
+++ b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r11
@@ -1,6 +0,0 @@
 MD5 0ae8dcec20e0fa6dbc022d5eb00dc2a3 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
 MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
 RMD160 9b38310d2768e947c4f6173db009243dd11db288 gtk+-1.2.10.tar.gz 2868322
 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 gtk+-1.2.10.tar.gz 2868322
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r12
+++ b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r12
@@ -1,4 +0,0 @@
 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 gtk+-1.2.10-r8-gentoo.diff.bz2 81223
 RMD160 9b38310d2768e947c4f6173db009243dd11db288 gtk+-1.2.10.tar.gz 2868322
 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 gtk+-1.2.10.tar.gz 2868322
--- a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
+++ b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
@@ -1,19 +0,0 @@
 --- gtk/gtkrc.c.~1.40.2.17.~	2001-07-10 20:06:35.000000000 +0200
 +++ gtk/gtkrc.c	2003-03-05 16:56:10.000000000 +0100
@@ -453,7 +453,7 @@
   if (!initted)
     {
 -      char *locale = setlocale (LC_CTYPE, NULL);
 +      char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
       char *p;
       initted = TRUE;
@@ -558,6 +558,7 @@
 	  if (tmp) g_free (tmp);
 	}
 +      g_free (locale);
     }
   i = 0;
--- a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
@@ -1,696 +0,0 @@
 --- gtk+-1.2.10/acinclude.m4.orig	2006-05-24 23:23:51.000000000 -0700
 +++ gtk+-1.2.10/acinclude.m4	2006-05-24 23:23:19.000000000 -0700
@@ -672,7 +672,7 @@
      AC_DEFINE(HAVE_STPCPY)
    fi
 -   AM_LC_MESSAGES
 +   gt_LC_MESSAGES
    AM_GTK_WITH_NLS
    if test "x$CATOBJEXT" != "x"; then
 --- gtk+-1.2.10/gtk.m4.orig	2006-05-24 23:32:00.000000000 -0700
 +++ gtk+-1.2.10/gtk.m4	2006-05-24 23:36:16.000000000 -0700
@@ -1,6 +1,11 @@
 # Configure paths for GTK+
 # Owen Taylor     97-11-3
 -
 +AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
 +[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
 +       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
 +              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 +$1
 +AC_DIVERT_POP()])])])
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
 --- gtk+-1.2.10/configure.in.orig	2006-05-25 05:45:06.000000000 -0700
 +++ gtk+-1.2.10/configure.in	2006-05-25 05:44:08.000000000 -0700
@@ -1,6 +1,8 @@
 +builtin(include,gtk.m4)
 +
 +
 # Process this file with autoconf to produce a configure script.
 AC_INIT(gdk/gdktypes.h)
 -
 # In the following, there are a the following variants
 # of GLib cflags and libs variables
 #
@@ -12,12 +14,11 @@
 # glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
 # glib_thread_libs:   libs to store in gtk-config for gtk-config gthread
 +AC_CANONICAL_TARGET
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 -dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
 -dnl are available for $ac_help expansion (don't we all *love* autoconf?)
 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 +GTK_AC_DIVERT_BEFORE_HELP([
 #
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
@@ -32,9 +33,8 @@
 GTK_MICRO_VERSION=10
 GTK_INTERFACE_AGE=1
 GTK_BINARY_AGE=10
 -GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 -dnl
 -AC_DIVERT_POP()dnl
 +GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION"
 +])
 AC_SUBST(GTK_MAJOR_VERSION)
 AC_SUBST(GTK_MINOR_VERSION)
@@ -44,9 +44,9 @@
 AC_SUBST(GTK_VERSION)
 # libtool versioning
 -LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
 +LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION"
 LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
 -LT_REVISION=$GTK_INTERFACE_AGE
 +LT_REVISION="$GTK_INTERFACE_AGE"
 LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
@@ -54,11 +54,8 @@
 AC_SUBST(LT_AGE)
 # For automake.
 -VERSION=$GTK_VERSION
 -PACKAGE=gtk+
 -
 -# Save this value here, since automake will set cflags later
 -cflags_set=${CFLAGS+set}
 +VERSION="$GTK_VERSION"
 +PACKAGE="gtk+"
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
@@ -67,42 +64,40 @@
 AM_CONFIG_HEADER(config.h)
 dnl Initialize libtool
 -AM_PROG_LIBTOOL
 +AC_PROG_LIBTOOL
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 -AC_CANONICAL_HOST
 -
 dnl figure debugging default, prior to $ac_help setup
 -dnl
 -AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 +
 +GTK_AC_DIVERT_BEFORE_HELP([
 if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
 -        debug_default=yes
 +  debug_default="yes"
 else
 -        debug_default=minimum
 +  debug_default="minimum"
 fi
 -AC_DIVERT_POP()dnl
 -
 +])
 dnl declare --enable-* args and collect ac_help strings
 -AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
 +AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,
 +  [enable_debug="$debug_default"])
 AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]],
 -		   echo $enable_shm, enable_shm="yes")
 -AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
 -		    , enable_ansi=no)
 +  [echo "$enable_shm"],[enable_shm="yes"])
 +AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],,[enable_ansi="no"])
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 -AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
 -			, enable_xim="yes")
 -AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],
 -			, enable_xim_inst="maybe")
 -AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
 +AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],,[enable_xim="yes"])
 +AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],,
 +  [enable_xim_inst="maybe"])
 +AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,
 +  [enable_rebuilds="yes"])
 AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 -
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
 -AC_ARG_WITH(native_locale, [  --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no)
 +AC_ARG_WITH(native_locale, [  --with-native-locale=[yes/no] Use native locale support [default=no]],,
 +  [with_native_locale="no"])
 +
 if test "x$enable_debug" = "xyes"; then
 -  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
 +  test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g"
   GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
@@ -113,16 +108,14 @@
 fi
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
 -
 # Build time sanity check...
 AM_SANITY_CHECK
 # Checks for programs.
 AC_PROG_CC
 AC_ISC_POSIX
 -AM_PROG_CC_STDC
 +AC_PROG_CC_STDC
 AC_PROG_INSTALL
 -AC_PROG_MAKE_SET
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -144,7 +137,6 @@
   fi
 fi
 changequote([,])dnl
 -
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -158,8 +150,7 @@
 AC_CHECK_PROG(INDENT, indent, indent)
 REBUILD=\#
 -if test "x$enable_rebuilds" = "xyes" && \
 -     test -n "$PERL" && \
 +if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \
      $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
      test -n "$AWK" ; then
   REBUILD=
@@ -194,55 +185,58 @@
 dnl Check for nl_langinfo and CODESET
 AC_MSG_CHECKING([for nl_langinfo (CODESET)])
 -AC_TRY_COMPILE([#include <langinfo.h>],
 +AC_TRY_COMPILE([#include <langinfo.h>
 +  ],
         [char *codeset = nl_langinfo (CODESET);],
    AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
 -   have_codeset=yes,
 -   have_codeset=no)
 +  have_codeset="yes",
 +  have_codeset="no"
 +)
 AC_MSG_RESULT($have_codeset)
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
 -gtk_save_LIBS=$LIBS
 +gtk_save_LIBS="$LIBS"
 LIBS="$LIBS -lm"
 AC_TRY_RUN([#include <math.h>
              int main (void) { return (log(1) != log(1.)); }],
      AC_MSG_RESULT(none needed),
 -     gtk_save_CFLAGS=$CFLAGS
 +  [gtk_save_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS -std1"
      AC_TRY_RUN([#include <math.h>
 	         int main (void) { return (log(1) != log(1.)); }],
          AC_MSG_RESULT(-std1),
          AC_MSG_RESULT()
 -         CFLAGS=$gtk_save_CFLAGS
 -         AC_MSG_WARN(
 -                [No ANSI prototypes found in library. (-std1 didn't work.)]),
 -	 true
 -     ),
 +    CFLAGS="$gtk_save_CFLAGS"
 +    AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]),
 +  true)],
      AC_MSG_RESULT(none needed)
 )
 -LIBS=$gtk_save_LIBS
 +LIBS="$gtk_save_LIBS"
 dnl NeXTStep cc seems to need this
 AC_MSG_CHECKING([for extra flags for POSIX compliance])
 -AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 +AC_TRY_COMPILE([#include <dirent.h>
 +  ],[DIR *dir;],
   AC_MSG_RESULT(none needed),
 -  gtk_save_CFLAGS=$CFLAGS
 +  [gtk_save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -posix"
 -  AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 +  AC_TRY_COMPILE([#include <dirent.h>
 +    ],[DIR *dir;],
     AC_MSG_RESULT(-posix),
     AC_MSG_RESULT()
 -    CFLAGS=$gtk_save_CFLAGS
 -    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
 +    CFLAGS="$gtk_save_CFLAGS"
 +    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])]))
 -if test x$with_glib = xyes ; then
 -  AC_MSG_ERROR([
 -*** Directory must be specified for --with-glib])
 +
 +
 +if test "x$with_glib" = "xyes" ; then
 +  AC_MSG_ERROR([*** Directory must be specified for --with-glib])
 fi
 -if test x$with_glib = x ; then 
 +if test "x$with_glib" = "x" ; then 
   # Look for separately installed glib
   AM_PATH_GLIB(1.2.8,,
@@ -261,7 +255,7 @@
 else
   # Use uninstalled glib (assume they got the version right)
 -  GLIB_CONFIG=$with_glib/glib-config
 +  GLIB_CONFIG="$with_glib/glib-config"
   if test -x $GLIB_CONFIG ; then 
     :
   else
@@ -277,9 +271,9 @@
   glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
   # canonicalize relative paths
 -  case $with_glib in 
 +  case "$with_glib" in 
     /*)
 -      glib_dir=$with_glib
 +      glib_dir="$with_glib"
       ;;
     *)
       glib_dir="\$(top_builddir)/$with_glib"
@@ -312,61 +306,56 @@
 saved_ldflags="$LDFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS"
 -LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
 +LDFLAGS="$LDFLAGS $X_LDFLAGS" 
 if test "x$no_x" = "xyes"; then 
   AC_MSG_ERROR([
 *** X libraries or include files not found. Check 'config.log' for 
 *** more details.])
 fi
 -
 # Checks for libraries.
 # Check for the X11 library
 -AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", 
 +AC_CHECK_LIB(X11,XOpenDisplay,
 +  x_libs="-lX11 $X_EXTRA_LIBS", 
   AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
 -  $X_EXTRA_LIBS)
 -
 +  $X_EXTRA_LIBS
 +)
 if test "x$enable_shm" = "xyes"; then
   # Check for the Xext library (needed for XShm extention)
   AC_CHECK_LIB(Xext, XShmAttach, 
       x_libs="-lXext $x_libs", 
       # On AIX, it is in XextSam instead, but we still need -lXext
 -      AC_CHECK_LIB(XextSam, XShmAttach, 
 +      [AC_CHECK_LIB(XextSam, XShmAttach, 
           x_libs="-lXextSam -lXext $x_libs", 
 -          no_xext_lib=yes, $x_libs),
 -      $x_libs)
 +          no_xext_lib="yes",
 +          $x_libs
 +      )],
 +      $x_libs
 +  )
 fi
 -
 # Check for shaped window extension
 -
 AC_CHECK_LIB(Xext, XShapeCombineMask,
 -      if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
 +  if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then
            x_libs="-lXext $x_libs"
       fi
 -      AC_DEFINE(HAVE_SHAPE_EXT),
 -      ,
 -      $x_libs)
 -
 +  AC_DEFINE(HAVE_SHAPE_EXT),,
 +  $x_libs
 +)
 # Check for XConvertCase (X11R6 specific)
 -
 AC_CHECK_LIB(X11, XConvertCase,
 -      AC_DEFINE(HAVE_XCONVERTCASE),
 -      ,
 -      $x_libs)
 -
 +  AC_DEFINE(HAVE_XCONVERTCASE),,
 +  $x_libs
 +)
 # Check for XIM support.
 -
 -AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
 -	    : ,
 +AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,,
 	    enable_xim_inst="no",
 -	    $x_libs)
 -
 +  $x_libs
 +)
 # On Solaris, calling XRegisterIMInstantiateCallback seems to
 # cause an immediate segfault, so we disable it, unless
 # the user specifically forces it to be on.
 -
 -if test x$enable_xim_inst = xmaybe ; then
 -  case host in
 +if test "x$enable_xim_inst" = "xmaybe" ; then
 +  case "$host" in
 	*-*-solaris*)
             enable_xim_inst="no"
             ;;
@@ -384,16 +373,15 @@
 fi
 x_cflags="$X_CFLAGS"
 -x_ldflags="$X_LDFLAGS $X_LIBS"
 +x_ldflags="$X_LDFLAGS" 
 # set up things for XInput
 -
 if test "x$with_xinput" = "xgxi"; then
   AC_MSG_WARN([
 *** The generic XInput support has not been tested for several years
 *** and is not known to work with any currently available X servers])
   AC_DEFINE(XINPUT_GXI)
 -  xinput_progs=gxid
 +  xinput_progs="gxid"
   x_libs="-lXi $x_libs"
 elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
   AC_DEFINE(XINPUT_XFREE)
@@ -413,77 +401,72 @@
 if test "x$enable_shm" = "xyes"; then
   # Check for shared memory
 -  AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
 -  AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
 +  AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes")
 +  AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes")
   # Check for the X shared memory extension header file
   AC_MSG_CHECKING(X11/extensions/XShm.h)
   if test "x$no_xext_lib" = "xyes"; then
     AC_MSG_RESULT(no)
 -    no_xshm=yes
 +    no_xshm="yes"
   else
     if test -f "$x_includes/X11/extensions/XShm.h"; then
       AC_MSG_RESULT(yes)
       AC_DEFINE(HAVE_XSHM_H)
     else
       AC_MSG_RESULT(no)
 -      no_xshm=yes
 +      no_xshm="yes"
     fi
   fi
 fi
 -
 # Check if X_LOCALE definition is necessary
 -
 AC_MSG_CHECKING(need -DX_LOCALE)
 AC_TRY_RUN([
 #include <stdio.h>
 #include <locale.h>
 -
 -int
 -main ()
 +  int main ()
 {
   return setlocale (LC_ALL, "${with_locale}") == NULL;
 }],
 -need_x_locale=no,
 -need_x_locale=yes,
 -need_x_locale=no)
 +  need_x_locale="no",
 +  need_x_locale="yes",
 +  need_x_locale="no"
 +)
 AC_MSG_RESULT($need_x_locale)
 -use_native_locale=no
 -if test $need_x_locale = yes; then
 +use_native_locale="no"
 +if test "$need_x_locale" = "yes"; then
   GTK_LOCALE_FLAGS="-DX_LOCALE"
 else
 -  if test x$with_native_locale = xyes ; then
 +  if test "x$with_native_locale" = "xyes" ; then
     AC_MSG_CHECKING(functioning locale support)
 -    AC_TRY_COMPILE([#include <stdlib.h>],[
 -          char c;
 +    AC_TRY_COMPILE([#include <stdlib.h>],
 +      [char c;
           if (MB_CUR_MAX == 1) {
               wctomb(&c, 42);
 -          }
 -    ],use_native_locale=yes,)
 -
 +      }],
 +      use_native_locale="yes"
 +    )
     AC_MSG_RESULT($use_native_locale)
   fi
 fi
 -if test x$use_native_locale = xyes ; then
 +if test "x$use_native_locale" = "xyes" ; then
   AC_MSG_CHECKING(if sizeof(wchar_t) == 4)
 -  AC_TRY_RUN([
 -  #include <stdlib.h>
 -
 -  int
 -  main ()
 +  AC_TRY_RUN([#include <stdlib.h>
 +    int main ()
   {
     return (sizeof(wchar_t) == 4) ? 0 : 1;
 -  }],
 -  ,use_native_locale=no,:)
 +    }],,
 +    use_native_locale="no"
 +  )
   AC_MSG_RESULT($use_native_locale)
 fi
 -if test $use_native_locale = yes ; then 
 +if test "$use_native_locale" = "yes" ; then 
   AC_DEFINE(USE_NATIVE_LOCALE)
 fi
@@ -502,13 +485,17 @@
 # Check if <sys/select.h> needs to be included for fd_set
 AC_MSG_CHECKING([for fd_set])
 -AC_TRY_COMPILE([#include <sys/types.h>],
 -        [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
 -if test $gtk_ok = yes; then
 +AC_TRY_COMPILE([#include <sys/types.h>
 +  ],
 +  [fd_set readMask, writeMask;],
 +  gtk_ok="yes",
 +  gtk_ok="no"
 +)
 +if test "$gtk_ok" = "yes"; then
     AC_MSG_RESULT([yes, found in sys/types.h])
 else
 -    AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
 -    if test $gtk_ok = yes; then
 +  AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes")
 +  if test "$gtk_ok" = "yes"; then
         AC_DEFINE(HAVE_SYS_SELECT_H)
         AC_MSG_RESULT([yes, found in sys/select.h])
     else
@@ -520,30 +507,35 @@
 # Duplicate `widechar' tests from `glib'.
 # Check for wchar.h
 AC_MSG_CHECKING(for wchar.h)
 -AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
 -if test $gtk_ok = yes; then
 +AC_TRY_CPP([#include <wchar.h>
 +  ],
 +  gtk_ok="yes",
 +  gtk_ok="no"
 +)
 +if test "$gtk_ok" = "yes"; then
    AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)
 # Check for wctype.h (for iswalnum)
 AC_MSG_CHECKING(for wctype.h)
 -AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
 -if test $gtk_ok = yes; then
 +AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no")
 +if test "$gtk_ok" = "yes"; then
    AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)
 # in Solaris 2.5, `iswalnum' is in -lw
 GDK_WLIBS=
 -AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
 +AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")])
 # The following is necessary for Linux libc-5.4.38
 oLIBS="$LIBS"
 LIBS="$LIBS $GDK_WLIBS"
 AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
 -AC_TRY_LINK([#include <stdlib.h>],[
 -#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
 +AC_TRY_LINK([#include <stdlib.h>
 +  ],
 +  [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
 #  ifdef HAVE_WCTYPE_H
 #    include <wctype.h>
 #  else
@@ -554,11 +546,13 @@
 #else
 #  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
 #endif
 -iswalnum((wchar_t) 0);
 -], gtk_ok=yes, gtk_ok=no)
 +  iswalnum((wchar_t) 0);],
 +  gtk_ok="yes",
 +  gtk_ok="no"
 +)
 LIBS="$oLIBS"
 -if test $gtk_ok = no; then
 +if test "$gtk_ok" = "no"; then
    AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
    GDK_WLIBS=
 fi
@@ -580,5 +574,5 @@
 gtk/Makefile
 gtk/gtkfeatures.h
 gdk.pc
 -gtk+.pc
 -], [chmod +x gtk-config])
 +gtk+.pc],
 +[chmod +x gtk-config])
 --- gtk+-1.2.10/gdk/Makefile.am.orig	2006-05-19 02:41:18.000000000 -0700
 +++ gtk+-1.2.10/gdk/Makefile.am		2006-05-19 02:11:54.000000000 -0700
@@ -21,12 +21,11 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) \
 	-export-dynamic \
 -	@GLIB_DEPLIBS@	\
 	@x_ldflags@	\
 -	@x_libs@	\
 -	-lm		\
 @STRIP_END@
 +libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
 +
 #
 # setup source file variables
 #
@@ -104,14 +103,13 @@
 EXTRA_PROGRAMS = gxid
 bin_PROGRAMS = @xinput_progs@
 LDADDS = @STRIP_BEGIN@ \
 -	@x_ldflags@	\
 	@x_libs@	\
 	@GLIB_LIBS@	\
 	-lm		\
 @STRIP_END@
 gxid_SOURCES = gxid.c
 gxid_LDADD = $(LDADDS)
 -
 +gxid_LDFLAGS = @x_ldflags@
 .PHONY: files
 --- gtk+-1.2.10/gtk/Makefile.am.orig	2006-05-25 07:40:45.000000000 -0700
 +++ gtk+-1.2.10/gtk/Makefile.am	2006-05-25 07:43:20.000000000 -0700
@@ -27,13 +27,15 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
 	-release $(LT_RELEASE) 					\
 	-export-dynamic						\
 -	@GLIB_DEPLIBS@ 						\
 	@x_ldflags@						\
 -	@x_libs@ 						\
 -	-lm							\
 @STRIP_END@
 -#	$(top_builddir)/gdk/libgdk.la
 -
 +libgtk_la_LIBADD = @STRIP_BEGIN@ \
 +        $(top_builddir)/gdk/libgdk.la   \
 +        @x_libs@                        \
 +        @GDK_WLIBS@                     \
 +        @GLIB_LIBS@                     \
 +        -lm                             \
 +	@STRIP_END@
 #
 # setup source file variables
@@ -374,14 +376,17 @@
 gtkconfdir = $(sysconfdir)/gtk
 -gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
 +# removed references to non-existent gtkrc files - tsh
 +gtkconf_DATA = \
 +	gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
 	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
 -	gtkrc.utf-8 gtkrc.iso-8859-2 \
 -	gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
 -	gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
 -	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
 -	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
 -	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
 +	gtkrc.iso-8859-2 gtkrc.iso-8859-5 \
 +	gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
 +	gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \
 +	gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \
 +	gtkrc.ka_GE.georgianacademy \
 +	gtkrc.ka_GE.georgianps \
 +	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
 # We create a dummy theme for the default GTK+ theme
 install-data-local:
@@ -428,7 +433,6 @@
 LDADDS = @STRIP_BEGIN@ \
 	libgtk.la			\
 	$(top_builddir)/gdk/libgdk.la	\
 -	@x_ldflags@			\
 	@x_libs@			\
 	@GDK_WLIBS@			\
 	@GLIB_LIBS@			\
@@ -441,12 +445,20 @@
 testdnd_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
 #testthreads_DEPENDENCIES = $(DEPS)
 +
 testgtk_LDADD = $(LDADDS)
 +testgtk_LDFLAGS=@x_ldflags@
 testinput_LDADD = $(LDADDS)
 +testinput_LDFLAGS = @x_ldflags@
 testselection_LDADD = $(LDADDS)
 +testselection_LDFLAGS = @x_ldflags@
 testrgb_LDADD = $(LDADDS)
 +testrgb_LDFLAGS = @x_ldflags@
 testdnd_LDADD = $(LDADDS)
 +testdnd_LDFLAGS = @x_ldflags@
 simple_LDADD = $(LDADDS)
 +simple_LDFLAGS = @x_ldflags@
 +
 #testthreads_LDADD = $(LDADDS)
 .PHONY: files test test-debug
--- a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
@@ -1,9 +0,0 @@
 Fix aclocal warnings:
 /usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
 --- gtk+-1.2.10/gtk.m4
 +++ gtk+-1.2.10/gtk.m4
@@ -6,3 +6,3 @@
 dnl
 -AC_DEFUN(AM_PATH_GTK,
 +AC_DEFUN([AM_PATH_GTK],
 [dnl 
--- a/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
+++ b/x11-libs/gtk+/files/gtk+-gdk-pixbuf-testfix.patch
@@ -1,9 +0,0 @@
 --- gtk+-2.8.10/gdk-pixbuf/abicheck.sh	2005-08-07 09:47:25.000000000 -0400
 +++ gtk+-2.8.10.new/gdk-pixbuf/abicheck.sh	2006-01-12 18:56:04.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 -nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 +nm -D .libs/libgdk_pixbuf-2.0.so | grep " [GBDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- a/x11-libs/gtk+/files/gtkrc
+++ b/x11-libs/gtk+/files/gtkrc
@@ -1,39 +0,0 @@
 style "default"
 {
 font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
 }
 style "button" = "default"
 { 
 bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
 }
 style "treeitem"
 {
 bg[ACTIVE] = { 0.7, 0.7, 0.9 }
 }
 style "scrollbar" = "button" 
 {
 bg[ACTIVE] = {0.6, 0.6, 0.6 }
 }
 style "status" {
 bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
 }
 style "gtk-tooltips" {
 bg[NORMAL] = "#ffff60"
 }
 class "GtkWidget" style "default" 
 class "GtkButton" style "button"
 class "GtkItem" style "button"
 class "GtkProgressBar" style "status"
 class "GtkScrollbar" style "scrollbar"
 class "GtkTreeItem" style "treeitem"
 widget "gtk-tooltips" style "gtk-tooltips"
--- a/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild
@@ -1,93 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r11.ebuild,v 1.27 2006/09/04 19:49:23 gustavoz Exp $
 GNOME_TARBALL_SUFFIX="gz"
 inherit gnome.org eutils libtool toolchain-funcs
 DESCRIPTION="The GIMP Toolkit"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="nls debug"
 RDEPEND="||	(
 				(
 					x11-libs/libXi
 					x11-libs/libXt
 				)
 				virtual/x11
 			)
 		 =dev-libs/glib-1.2*"
 DEPEND="${RDEPEND}
 		||	(
 				(
 					x11-proto/inputproto
 					x11-proto/xextproto
 				)
 				virtual/x11
 			)
 		nls? ( sys-devel/gettext dev-util/intltool )"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
 	cd "${S}"/..
 	epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
 	# locale fix by sbrabec@suse.cz
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
 	elibtoolize
 }
 src_compile() {
 	local myconf=
 	use nls || myconf="${myconf} --disable-nls"
 	if use debug ; then
 		myconf="${myconf} --enable-debug=yes"
 	else
 		myconf="${myconf} --enable-debug=minimum"
 	fi
 	econf \
 		--sysconfdir=/etc \
 		--with-xinput=xfree \
 		--with-x \
 		${myconf} || die
 	emake CC="$(tc-getCC)" || die
 }
 src_install() {
 	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog* HACKING
 	dodoc NEWS* README* TODO
 	docinto docs
 	cd docs
 	dodoc *.txt *.gif text/*
 	dohtml -r html
 	#install nice, clean-looking gtk+ style
 	insinto /usr/share/themes/Gentoo/gtk
 	doins "${FILESDIR}"/gtkrc
 }
 pkg_postinst() {
 	if [[ -e /etc/X11/gtk/gtkrc ]] ; then
 		ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
 		ewarn "all themes it seems.  Please remove it manually as it will not due"
 		ewarn "to /env protection."
 	fi
 	echo ""
 	einfo "The old gtkrc is available through the new Gentoo gtk theme."
 }
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -1,89 +0,0 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.11 2006/11/12 03:27:56 vapier Exp $
 GNOME_TARBALL_SUFFIX="gz"
 WANT_AUTOMAKE=1.4
 inherit gnome.org eutils toolchain-funcs autotools
 DESCRIPTION="The GIMP Toolkit"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
 LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="nls debug"
 # Supported languages and translated documentation
 # Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 RDEPEND="=dev-libs/glib-1.2*
 	||	(
 		( x11-libs/libXi x11-libs/libXt )
 		virtual/x11
 	)"
 DEPEND="${RDEPEND}
 	||	(
 		( x11-proto/inputproto x11-proto/xextproto )
 		virtual/x11
 	)
 	nls? ( sys-devel/gettext dev-util/intltool )"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
 	epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
 	epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch
 	eautoreconf
 }
 src_compile() {
 	local myconf=
 	use nls || myconf="${myconf} --disable-nls"
 	strip-linguas ${MY_AVAILABLE_LINGUAS}
 	if use debug ; then
 		myconf="${myconf} --enable-debug=yes"
 	else
 		myconf="${myconf} --enable-debug=minimum"
 	fi
 	econf \
 		--sysconfdir=/etc \
 		--with-xinput=xfree \
 		--with-x \
 		${myconf} || die
 	emake CC="$(tc-getCC)" || die
 }
 src_install() {
 	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog* HACKING
 	dodoc NEWS* README* TODO
 	docinto docs
 	cd docs
 	dodoc *.txt *.gif text/*
 	dohtml -r html
 	#install nice, clean-looking gtk+ style
 	insinto /usr/share/themes/Gentoo/gtk
 	doins "${FILESDIR}"/gtkrc
 }
 pkg_postinst() {
 	if [[ -e /etc/X11/gtk/gtkrc ]] ; then
 		ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
 		ewarn "all themes it seems.  Please remove it manually as it will not due"
 		ewarn "to /env protection."
 	fi
 	echo ""
 	einfo "The old gtkrc is available through the new Gentoo gtk theme."
 }
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>gnome</herd>
  <longdescription>
    GTK+ is a multi-platform toolkit for creating graphical user
    interfaces. Offering a complete set of widgets, GTK+ is suitable
    for projects ranging from small one-off projects to complete
    application suites.
  </longdescription>
 </pkgmetadata>
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,3 +0,0 @@
 AUX tabbed.patch 3643 RMD160 cdf1c08bbbb4c30c78bc2e86544c6563f09ee75e SHA1 e22ab622b5bfb5f0d07d26df978b5a57dea76892 SHA256 42ecb60134529dabc139c0295c404c339fa31e879c800e4854afc45c53dcb8c0
 DIST rxvt-unicode-9.06.tar.bz2 869076 RMD160 ae737ed07e943303318bd81b566146d5426f36bd SHA1 df623ebdad001de534781721f8298ba1add0df2c SHA256 8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1
 EBUILD rxvt-unicode-9.06-r10.ebuild 2906 RMD160 e8e29401db3396e2ea84f4dd16ab0eb43363bb19 SHA1 810a218c68061ad35be7c2f6826b1154958ec6c9 SHA256 0cf940767105fc8730ba152b2c81c4af837e36a6f2edd647fb727329326e109a
--- a/x11-terms/rxvt-unicode/files/super_l.patch
+++ b/x11-terms/rxvt-unicode/files/super_l.patch
@@ -1,32 +0,0 @@
 diff -rupN rxvt-unicode-9.06/src/command.C rxvt-unicode-9.06_mod/src/command.C
 --- rxvt-unicode-9.06/src/command.C	2008-11-05 17:21:05.000000000 +0100
 +++ rxvt-unicode-9.06_mod/src/command.C	2009-11-22 18:37:06.000000000 +0100
@@ -398,7 +398,7 @@ map_function_key (KeySym keysym)
 void
 rxvt_term::key_press (XKeyEvent &ev)
 {
 -  int ctrl, meta, shft, len;
 +  int ctrl, meta, shft, super, len;
   KeySym keysym;
   int valid_keysym;
   char kbuf[KBUFSZ];
@@ -417,6 +417,8 @@ rxvt_term::key_press (XKeyEvent &ev)
   shft = ev.state & ShiftMask;
   ctrl = ev.state & ControlMask;
   meta = ev.state & ModMetaMask;
 +  super = ev.state & Mod4Mask;
 +
   if (numlock_state || (ev.state & ModNumLockMask))
     {
@@ -849,6 +851,10 @@ rxvt_term::key_press (XKeyEvent &ev)
       const char ch = C0_ESC;
       tt_write (&ch, 1);
     }
 +  if (super) {
 +      char buf[3] = { 0x18, '@', 's' };
 +      tt_write (buf, 3);
 +  }
   tt_write (kbuf, (unsigned int)len);
 }
--- a/x11-terms/rxvt-unicode/files/tabbed.patch
+++ b/x11-terms/rxvt-unicode/files/tabbed.patch
@@ -1,118 +0,0 @@
 --- rxvt-unicode-9.06_orig/src/perl/tabbed	2008-06-15 16:52:47.000000000 +0200
 +++ rxvt-unicode-9.06/src/perl/tabbed	2008-11-19 07:16:13.000000000 +0100
@@ -1,4 +1,7 @@
 #! perl
 +# Fri Aug 22 18:01:55 CEST 2008 @709 /Internet Time/
 +# added some code to make life easier and friendler with great urxvt and this
 +# nice plugin. NOTE: i don't know perl! gryf.
 sub refresh {
    my ($self) = @_;
@@ -12,7 +15,7 @@
    substr $text, 0, 7, "[NEW] |";
    @$rend[0 .. 5] = ($self->{rs_tab}) x 6;
 -   push @ofs, [0, 6, sub { $_[0]->new_tab }];
 +   push @ofs, [0, 6, sub { $_[0]->new_tab("shell") }];
    my $ofs = 7;
    my $idx = 0;
@@ -23,7 +26,7 @@
       my $act = $tab->{activity} && $tab != $self->{cur}
                 ? "*" : " ";
 -      my $txt = "$act$idx$act";
 +      my $txt = "$act$idx-$tab->{name}$act";
       my $len = length $txt;
       substr $text, $ofs, $len + 1, "$txt|";
@@ -47,7 +50,8 @@
    my ($self, @argv) = @_;
    my $offset = $self->fheight;
 -
 +   my $tab_name = shift @argv;
 +   
    # save a backlink to us, make sure tabbed is inactive
    push @urxvt::TERM_INIT, sub {
       my ($term) = @_;
@@ -64,12 +68,15 @@
    };
    push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
 -
 +   
    my $term = new urxvt::term
       $self->env, $urxvt::RXVTNAME,
       -embed => $self->parent,
       @argv,
    ;
 +   
 +   # add name to new created tab. gryf
 +   $self->{tabs}[-1]->{name} = $tab_name;
 }
 sub configure {
@@ -248,7 +255,7 @@
       shift @argv;
    } while @argv && $argv[0] ne "-e";
 -   $self->new_tab (@argv);
 +   $self->new_tab ("shell", @argv);
    ()
 }
@@ -307,7 +314,41 @@
    my ($self, $tab, $event, $keysym, $str) = @_;
    if ($event->{state} & urxvt::ShiftMask) {
 -      if ($keysym == 0xff51 || $keysym == 0xff53) {
 +	  # change default shift+downarrow behavior with some more
 +	  # sofisticated :) gryf
 +	  if ($event->{state} & urxvt::ControlMask) {
 +		  if ($keysym == 0x4e){ # CTRL+SHIFT+N new shell
 +			  $self->new_tab("shell");
 +			  return 1;
 +		  }elsif ($keysym == 0x4d){ # CTRL+SHIFT+M new mc
 +			  $self->new_tab("mc", '-e', 'mc');
 +			  return 1;
 +		  }elsif ($keysym == 0x52){ # CTRL+SHIFT+R su -
 +			  $self->new_tab("root", '-e', 'su', '-');
 +			  return 1;
 +		  }elsif ($keysym == 0x54){ # CTRL+SHIFT+T htop
 +			  $self->new_tab("htop", '-e', 'htop');
 +			  return 1;
 +		  }elsif ($keysym == 0x59){ # CTRL+SHIFT+Y ssh bombadil
 +			  $self->new_tab("bombadil", '-e', 'ssh', '-p', '6622', 'bombadil');
 +			  return 1;
 +		  }elsif ($keysym == 0x47){ # CTRL+SHIFT+G ssh esm
 +			  $self->new_tab("elysium", '-e', 'ssh', 'home.elysium.pl');
 +			  return 1;
 +		  }elsif ($keysym == 0x4a){ # CTRL+SHIFT+J ssh benq
 +			  $self->new_tab("benq", '-e', 'ssh', 'benqwifi');
 +			  return 1;
 +#		  }elsif ($keysym == 0x53){ # CTRL+SHIFT+S ssh mslug
 +#			  $self->new_tab("mslug", '-e', 'ssh', 'mslug');
 +#			  return 1;
 +		  }elsif ($keysym == 0x53){ # CTRL+SHIFT+S ssh mslug
 +			  $self->new_tab("intruder", '-e', 'ssh', 'intruder');
 +			  return 1;
 +		  }elsif ($keysym == 0x49){ # CTRL+SHIFT+I irssi on freenode
 +			  $self->new_tab("irssi", '-e', 'irssi', '--config=~/.irssi/config_freenode');
 +			  return 1;
 +		  }
 +	  }elsif ($keysym == 0xff51 || $keysym == 0xff53) {
          my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
          --$idx if $keysym == 0xff51;
@@ -316,10 +357,6 @@
          $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
          return 1;
 -      } elsif ($keysym == 0xff54) {
 -         $self->new_tab;
 -
 -         return 1;
       }
    }
    elsif ($event->{state} & urxvt::ControlMask) {
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r10.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r10.ebuild
@@ -1,104 +0,0 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.06.ebuild,v 1.1 2008/12/21 20:44:23 killerfox Exp $
 inherit autotools flag-o-matic
 DESCRIPTION="rxvt clone with xft and unicode support"
 HOMEPAGE="http://software.schmorp.de/"
 SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="truetype perl iso14755 afterimage xterm-color wcwidth vanilla"
 # see bug #115992 for modular x deps
 RDEPEND="x11-libs/libX11
 	x11-libs/libXft
 	afterimage? ( media-libs/libafterimage )
 	x11-libs/libXrender
 	perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	x11-proto/xproto"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# provide some nice features into tabbed plugin, like named tabs, custom
 	# shortcuts and other commands beside plain shell
 	epatch "${FILESDIR}"/tabbed.patch
 	if (use xterm-color || use wcwidth); then
 		ewarn "You enabled xterm-color or wcwidth or both."
 		ewarn "Please note that neither of them are supported by upstream."
 		ewarn "You are at your own if you run into problems."
 		ebeep 5
 	fi
 	local tdir=/usr/share/terminfo
 	if use xterm-color; then
 		epatch doc/urxvt-8.2-256color.patch
 		sed -e \
 			's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \
 			doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo
 		sed -i -e \
 			"s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o ${D}/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \
 			doc/Makefile.in
 	fi
 	use wcwidth && epatch doc/wcwidth.patch
 	# ncurses will provide rxvt-unicode terminfo, so we don't install them again
 	# see bug #192083
 	#
 	# According to my tests this is not (yet?) true, so keep it prepared and
 	# disabled  until it's needed again.
 	#if has_version '<sys-libs/ncurses-5.7'; then
 		sed -i -e \
 			"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
 			doc/Makefile.in
 	#else
 	#	# Remove everything except if we have rxvt-unicode256
 	#	sed -i -e \
 	#	    '/rxvt-unicode256/p;/@TIC@/d' \
 	#		doc/Makefile.in
 	#fi
 	eautoreconf
 }
 src_compile() {
 	local myconf=''
 	use iso14755 || myconf='--disable-iso14755'
 	use xterm-color && myconf="$myconf --enable-xterm-colors=256"
 	econf --enable-everything \
 		$(use_enable truetype xft) \
 		$(use_enable afterimage) \
 		$(use_enable perl) \
 		--disable-text-blink \
 		${myconf}
 	emake || die
 	sed -i \
 		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
 		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
 }
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc README.FAQ Changes
 	cd "${S}"/doc
 	dodoc README* changes.txt etc/* rxvt-tabbed
 }
 pkg_postinst() {
 	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
 	einfo "upstream-supplied terminfo files can be used."
 }
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,4 +0,0 @@
 AUX windowmaker-gcc4.patch 210579 RMD160 74b204421aa25c0fc2a7b6bf1f0d03e792a22601 SHA1 a42e82d778dfe9400d777bf0ed7d127240a54e1c SHA256 df6563ef7fc518a3ae042a049658cb153d6ceb1e982e89a9fd313a68510dad87
 DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd SHA1 6f545356acde7e9bf4c11345ac1359b451a9d1bc SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
 EBUILD windowmaker-0.92.0-r10.ebuild 3653 RMD160 f64b3c05ab2dde8429c97112453f24812056c45e SHA1 1e60bfdd3beddf2b9caf97cb7e7a7a0acb8c92e9 SHA256 de3de3adf1a3f437bb8c96305fc43c91f95566909e4aff6566ee81d9bc357a4b
--- a/x11-wm/windowmaker/files/windowmaker-gcc4.patch
+++ b/x11-wm/windowmaker/files/windowmaker-gcc4.patch
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild
@@ -1,123 +0,0 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r4.ebuild,v 1.5 2007/10/03 14:19:26 armin76 Exp $
 # Arch linux version of windomaker - only patch against gcc4
 #
 inherit autotools eutils gnustep-base flag-o-matic
 S=${WORKDIR}/${P/windowm/WindowM}
 DESCRIPTION="The fast and light GNUstep window manager"
 SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
 	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz"
 HOMEPAGE="http://www.windowmaker.info/"
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
 DEPEND="x11-libs/libXv
 	x11-libs/libXft
 	x11-libs/libXt
 	media-libs/fontconfig
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )
 	gnustep? ( >=gnustep-base/gnustep-make-2.0 )"
 RDEPEND="${DEPEND}
 	nls? ( >=sys-devel/gettext-0.10.39 )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 src_unpack() {
 	is-flag -fstack-protector && filter-flags -fstack-protector \
 		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
 	replace-flags "-Os" "-O2"
 	replace-flags "-O3" "-O2"
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/windowmaker-gcc4.patch
 	# Fix some paths
 	if use gnustep; then
 		egnustep_env
 	fi
 	for file in ${S}/WindowMaker/*menu*; do
 		if [ -r $file ]; then
 			if use gnustep ; then
 				sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" $file
 			else
 				sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/bin/:g;" $file
 			fi
 			sed -i 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' $file
 			sed -i 's:/opt/share/WindowMaker:/usr/share/WindowMaker:g;' $file
 		fi;
 	done;
 	eautoreconf || die "eautoreconf failed"
 }
 src_compile() {
 	local myconf
 	# image format types
 	# xpm is provided by X itself
 	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
 	# non required X capabilities
 	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
 	if use gnustep ; then
 		egnustep_env
 		# Gentoo installs everything in System, make sure configure honors that
 		export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT}
 		myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}"
 	fi
 	if use nls; then
 		[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
 	else
 		myconf="${myconf} --disable-locale"
 	fi
 	# default settings with $myconf appended
 	econf \
 		--sysconfdir=/etc/X11 \
 		--with-x \
 		--enable-usermenu \
 		--with-pixmapdir=/usr/share/pixmaps \
 		--with-nlsdir=/usr/share/locale \
 		${myconf} || die
 	emake || die "windowmaker: make has failed"
 	# WindowMaker Extra Package (themes and icons)
 	cd ../WindowMaker-extra-0.1
 	econf || die "windowmaker-extra: configure has failed"
 	emake || die "windowmaker-extra: make has failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "windowmaker: install has failed."
 	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
 		  MIRRORS README* NEWS TODO
 	# WindowMaker Extra
 	cd ../WindowMaker-extra-0.1
 	emake DESTDIR="${D}" install || die "windowmaker-extra: install failed"
 	newdoc README README.extra
 	# create wmaker session shell script
 	echo "#!/bin/bash" > wmaker
 	echo "/usr/bin/wmaker" >> wmaker
 	exeinto /etc/X11/Sessions/
 	doexe wmaker
 	insinto /etc/X11/dm/Sessions
 	doins ${FILESDIR}/wmaker.desktop
 	make_desktop_entry /usr/bin/wmaker
 }
		`@@ -1,2 +0,0 @@`
			`DIST sonata-1.6.2.tar.bz2 315918 RMD160 418eef732cc171d21e301261aa0c6b7751d03ab3 SHA1 33cb3458014b4901eb312bff76c24be125ed7d0a SHA256 7460ac04ac4d6e301578c27496125c1c13b2748e91cdd73ff39f2adcd9680dd2`
			`EBUILD sonata-1.6.2.ebuild 954 RMD160 5481effed89ae48d190d88287f768a4c07f54a3a SHA1 a8bc98eb39fb621184bc6a60a91d3879c52b8cb4 SHA256 757c69b7b13122beba32b0a2611ef96eb0c1b52f4d5b83eba22c87312e11614a`