Cleanse

author: René 'Necoro' Neumann <necoro@necoro.net> 2011-01-26 18:47:19 +0100
committer: René 'Necoro' Neumann <necoro@necoro.net> 2011-01-26 18:47:19 +0100
commit: 79d4ffcc26fa209d92993233ef2382aaf786384d (patch)
tree: c1139a8d3f25c7a44d2db486ce7f624852b69e86
parent: 364e853a524cfd4f8464e5349a53d1b04a67b469 (diff)
download: overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.tar.gz
overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.tar.bz2
overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.zip
22 files changed, 0 insertions, 2126 deletions
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
deleted file mode 100644
index b4df91d..0000000
--- a/games-fps/ut2004-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD ut2004-data-3186-r3.ebuild 16879 RMD160 fcd90b07d079e6a43fa9af63b00d7c32da7c3b07 SHA1 3a59931c5ce2ac22e4efcd44cbeeac0ce95057d5 SHA256 c8ead6f7083c17bacc4e0fe335262f1b788cc69baaf31f67e87ae903d263d5c0
-MISC ut2004-data-3186-r3.ebuild.old 17893 RMD160 0437faa444baf119553b1899783d7aa286a6f63c SHA1 ff80ebc5a82f1db9bdccf0b87c2e314127943540 SHA256 6b37793a0f5f39fd7e051e730eef871e99fd08985f68007e34c4c0e9908ea4db
-MISC ut2004-data.ebuild.diff 1561 RMD160 5a1f8d5a6e0df81192bdaa091d7280dc2f4e39de SHA1 ee12bb375ed84a1fe1d730f0b3a435e1dc4d0536 SHA256 3c73f0c08989e0b3a8d7e9402001343dd944845448bbb894f0dc90e3c6381753
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
deleted file mode 100644
index 5191ffe..0000000
--- a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib games games-ut2k4mod
-
-DESCRIPTION="Unreal Tournament 2004 - this is the data portion of UT2004"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI=""
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dynamic icon"
-RESTRICT="strip"
-
-# Must assume for Midway DVDs that openal, libsdl & unshield are needed.
-# Needs >=app-arch/unshield-0.5-r1 due to bug #149235.
-# Needs imagemagick to extract the icon from some Midway DVDs.
-RDEPEND="media-libs/openal
-	media-libs/libsdl"
-DEPEND="${RDEPEND}
-	games-util/uz2unpack
-	>=app-arch/unshield-0.5-r1
-	icon? ( media-gfx/imagemagick )"
-# Ideally, will be downloading ut2004 while installing ut2004-data
-PDEPEND="games-fps/ut2004"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-QA_TEXTRELS="${dir:1}/System/libSDL-1.2.so.0"
-
-GAMES_LICENSE_CHECK="yes"
-
-grabdirs() {
-	local d srcdir
-
-	for d in {Music,Sounds,Speech,StaticMeshes,Textures} ; do
-		srcdir=${CDROM_ROOT}/$1${d}
-		# Is flexible to handle CD_ROOT vs CD_ROOT_1 mixups
-		[[ -d "${srcdir}" ]] || srcdir=${CDROM_ROOT}/${d}
-		if [[ -d "${srcdir}" ]] ; then
-			insinto "${dir}"
-			doins -r "${srcdir}" || die "doins ${srcdir} failed"
-		fi
-	done
-}
-
-pkg_setup() {
-	games_pkg_setup
-
-	ewarn "This is a huge package. If you do not have at least 7GB of free"
-	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT}"
-	ewarn "then you should abort this installation now and free up some space."
-}
-
-src_unpack() {
-	check_dvd
-
-	if [[ "${USE_DVD}" -eq 1 ]] ; then
-		if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] ; then
-			# Is 1 DVD, either UT2004-only or Anthology
-			if [[ "${USE_GERMAN_MIDWAY_DVD}" -eq 1 ]] ; then
-				cdrom_get_cds autorund/unreal.ico
-			else
-				cdrom_get_cds AutoRunData/Unreal.ico
-			fi
-		else
-			DISK1="CD1/"
-			DISK2="CD2/"
-			DISK3="CD3/"
-			DISK4="CD4/"
-			DISK5="CD5/"
-			DISK6="CD6/"
-			if [[ "${USE_ECE_DVD}" -eq 1 ]] ; then
-				# Editor's Choice Edition DVD
-				cdrom_get_cds "${DISK1}"System/UT2004.ini \
-					"${DISK2}"Textures/2K4Fonts.utx.uz2 \
-					"${DISK3}"Textures/ONSDeadVehicles-TX.utx.uz2 \
-					"${DISK4}"Textures/XGameShaders2004.utx.uz2 \
-					"${DISK5}"Speech/ons.xml \
-					"${DISK6}"Sounds/TauntPack.det_uax.uz2
-			else
-				# Original DVD
-				cdrom_get_cds "${DISK1}"System/UT2004.ini \
-					"${DISK2}"Textures/2K4Fonts.utx.uz2 \
-					"${DISK3}"Textures/ONSDeadVehicles-TX.utx.uz2 \
-					"${DISK4}"StaticMeshes/AlienTech.usx.uz2 \
-					"${DISK5}"Speech/ons.xml \
-					"${DISK6}"Sounds/TauntPack.det_uax.uz2
-			fi
-		fi
-	else
-		# 6 CDs
-		cdrom_get_cds System/UT2004.ini \
-			Textures/2K4Fonts.utx.uz2 \
-			Textures/ONSDeadVehicles-TX.utx.uz2 \
-			StaticMeshes/AlienTech.usx.uz2 \
-			Speech/ons.xml \
-			Sounds/TauntPack.det_uax.uz2
-	fi
-
-	if [[ "${USE_MIDWAY_DVD}" -ne 1 ]] ; then
-		unpack_makeself "${CDROM_ROOT}"/linux-installer.sh \
-			|| die "unpacking linux installer"
-		use x86 && unpack ./linux-x86.tar
-		use amd64 && unpack ./linux-amd64.tar
-	fi
-}
-
-src_install() {
-	local cabfile diskno srcdir varname j
-
-	if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] ; then
-		einfo "Copying files from UT2004 Midway DVD."
-
-		if [[ -e "${CDROM_ROOT}"/Manual/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual/Manual.pdf \
-				|| die "copying Manual.pdf"
-		elif [[ -e "${CDROM_ROOT}"/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual.pdf \
-				|| die "copying Manual.pdf"
-		fi
-
-		for cab in "${CDROM_ROOT}"/[dD]isk?/data?.{cab,hdr}; do
-			elog "Linking: $cab"
-			ln -sfn ${cab} .
-		done
-
-		# The big extraction
-		einfo "Extracting from CAB files - this will take several minutes."
-		unshield x data1.cab || die "unshield data1.cab failed"
-
-		# Useful debugging information
-		ls -R > extract-filelist.txt
-
-		if [[ -d 4_UT2004_Animations ]] ; then
-			# Delete the other games on the Anthology DVD
-			rm -rf {1,2,3}_Unreal* 4_UT2004_EXE Launcher_English OCXFiles
-			# Rename directories to be same as Midway UT2004-only DVD,
-			# i.e. rename "4_UT2004_Animations" to "Animations".
-			for j in 4_UT2004_* ; do
-				mv -f "${j}" "${j:9}" || die "mv ${j} failed"
-			done
-		fi
-
-		# The "logging" subdirectory is created by unshield.
-		rm -rf logging
-		rm -f *.{cab,hdr}
-
-		for j in Animations Benchmark ForceFeedback Help KarmaData \
-			Manual Maps Music Sounds Speech StaticMeshes \
-			System Textures Web ; do
-			einfo "Collating ${j}"
-
-			# UT2004-only DVD has "All_*" dirs, and Anthology DVD has "*_All"
-			if [[ -d "All_${j}" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "All_${j}"/* "${j}" || die "cp All_${j}"
-				else
-					mv -f "All_${j}" "${j}" || die "mv All_${j}"
-				fi
-			fi
-			if [[ -d "${j}_All" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "${j}_All"/* "${j}" || die "cp ${j}_All"
-				else
-					mv -f "${j}_All" "${j}" || die "mv ${j}_All"
-				fi
-			fi
-
-			if [[ -d "English_${j}" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "English_${j}"/* "${j}" || die "cp English_${j}"
-				else
-					mv -f "English_${j}" "${j}" || die "mv English_${j}"
-				fi
-			fi
-			if [[ -d "${j}_English" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "${j}_English"/* "${j}" || die "cp ${j}_English"
-				else
-					mv -f "${j}_English" "${j}" || die "mv ${j}_English"
-				fi
-			fi
-
-			# Ensure that the directory exists
-			mkdir -p "${j}" || die
-		done
-
-		# Rearrange directories
-		if [[ -d English_Sounds_Speech_System_Help ]] ; then
-			# http://utforums.epicgames.com/showthread.php?t=558146
-			for j in Sounds Speech System Help ; do
-				cp -rf English_Sounds_Speech_System_Help/"${j}"/* "${j}" \
-					|| die "cp English_Sounds_Speech_System_Help/${j}"
-			done
-		fi
-
-		if [[ ! -d Benchmark/Stuff ]] ; then
-			mkdir -p Benchmark/Stuff || die
-			cp -f BenchmarkStuff/timedemo.txt Benchmark/Stuff || die
-		fi
-
-		if [[ ! -d System/editorres ]] ; then
-			mkdir -p System/editorres || die
-			cp -rf Systemeditorres/* System/editorres || die
-		fi
-
-		if [[ ! -d Web/images ]] ; then
-			mkdir -p Web/{images,ServerAdmin,Src} || die
-			cp -rf Webimages/* Web/images || die
-			cp -rf WebServerAdmin/* Web/ServerAdmin || die
-			cp -rf WebSrc/* Web/Src || die
-		fi
-
-		# Straggling file. Seems safe to ignore.
-		#[[ -e US_License.int ]] && mv -f US_License.int System
-
-		# Remove unnecessary directories
-		rm -rf Benchmark{CSVs,Logs,Results,Stuff}
-		rm -rf Systemeditorres Web{images,ServerAdmin,Src}
-		rm -rf \<* \[* _* All_* English_* *_All *_English
-
-		# These files are created later, for all installations
-		find . -type f -name 'DO_NOT_DELETE.ME' -delete
-
-		# Sanity checks
-		[[ -d Animations ]] || die "Animations directory does not exist."
-		[[ -d Music ]] || die "Music directory does not exist."
-
-		if [[ ! -e ut2004.xpm ]] && use icon ; then
-			# Create ut2004.xpm desktop icon if possible
-			if [[ -e Help/Unreal.ico ]] ; then
-				einfo "Creating icon from Help/Unreal.ico"
-				# Uses imagemagick to convert the icon
-				convert Help/Unreal.ico ut2004.xpm \
-					|| die "convert Unreal.ico failed"
-				mv -f ut2004-6.xpm ut2004.xpm || die
-				# Remove the other graphics files that were extracted
-				rm -f ut2004-?.xpm
-			elif [[ -e "${CDROM_ROOT}"/AutoRunData/Unreal.ico ]] ; then
-				einfo "Creating icon from /AutoRunData/Unreal.ico on DVD"
-				# Uses imagemagick to convert the icon
-				convert "${CDROM_ROOT}"/AutoRunData/Unreal.ico ut2004.xpm \
-					|| die "convert Unreal.ico failed"
-				mv -f ut2004-6.xpm ut2004.xpm || die
-				# Remove the other graphics files that were extracted
-				rm -f ut2004-?.xpm
-			elif [[ -e Help/Unreal.bmp ]] ; then
-				einfo "Creating icon from Help/Unreal.bmp"
-				# Uses imagemagick to convert the icon
-				convert -transparent 'rgb(255,0,255)' Help/Unreal.bmp \
-					ut2004.xpm || die "convert Unreal.bmp failed"
-				# Remove pink border from icon. A shadow remains.
-				mogrify -transparent 'rgb(252,2,252)' ut2004.xpm || die
-				mogrify -transparent 'rgb(217,14,217)' ut2004.xpm || die
-				mogrify -transparent 'rgb(228,10,228)' ut2004.xpm || die
-				mogrify -transparent 'rgb(237,11,236)' ut2004.xpm || die
-				mogrify -transparent 'rgb(246,6,246)' ut2004.xpm || die
-				mogrify -transparent 'rgb(207,21,206)' ut2004.xpm || die
-				mogrify -transparent 'rgb(243,10,243)' ut2004.xpm || die
-				mogrify -transparent 'rgb(211,35,210)' ut2004.xpm || die
-				mogrify -transparent 'rgb(170,69,168)' ut2004.xpm || die
-				mogrify -transparent 'rgb(227,23,227)' ut2004.xpm || die
-				mogrify -transparent 'rgb(215,20,215)' ut2004.xpm || die
-				mogrify -transparent 'rgb(216,32,215)' ut2004.xpm || die
-				mogrify -transparent 'rgb(152,82,149)' ut2004.xpm || die
-				mogrify -transparent 'rgb(220,29,219)' ut2004.xpm || die
-				mogrify -transparent 'rgb(186,56,185)' ut2004.xpm || die
-				mogrify -transparent 'rgb(231,19,231)' ut2004.xpm || die
-				mogrify -transparent 'rgb(165,74,163)' ut2004.xpm || die
-				mogrify -transparent 'rgb(142,93,140)' ut2004.xpm || die
-				mogrify -transparent 'rgb(203,43,201)' ut2004.xpm || die
-				mogrify -transparent 'rgb(150,86,147)' ut2004.xpm || die
-				mogrify -transparent 'rgb(205,41,204)' ut2004.xpm || die
-				mogrify -transparent 'rgb(133,99,131)' ut2004.xpm || die
-				mogrify -transparent 'rgb(128,104,125)' ut2004.xpm || die
-				mogrify -transparent 'rgb(176,65,174)' ut2004.xpm || die
-				mogrify -transparent 'rgb(152,85,150)' ut2004.xpm || die
-				mogrify -transparent 'rgb(138,96,135)' ut2004.xpm || die
-				mogrify -transparent 'rgb(160,78,158)' ut2004.xpm || die
-			fi
-		fi
-
-		# The big install
-		einfo "Installing UT2004 directories..."
-		insinto "${dir}"
-		doins -r * || die "doins -r * failed"
-
-		if [[ -e ut2004.xpm ]] ; then
-			# Install icon
-			doicon ut2004.xpm || die "doicon failed"
-		fi
-	else
-		# Disk 1
-		einfo "Copying files from Disk 1..."
-		insinto "${dir}"
-		doins -r "${CDROM_ROOT}/${DISK1}"{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Web} \
-			|| die "copying directories"
-		insinto "${dir}"/System
-		doins -r "${CDROM_ROOT}/${DISK1}"System/{editorres,*.{bat,bmp,dat,det,est,frt,ini,int,itt,kot,md5,smt,tmt,u,ucl,upl,url}} \
-			|| die "copying System files"
-		insinto "${dir}"/Manual
-		doins "${CDROM_ROOT}/${DISK1}"Manual/Manual.pdf \
-			|| die "copying Manual.pdf"
-		insinto "${dir}"/Benchmark/Stuff
-		doins -r "${CDROM_ROOT}/${DISK1}"Benchmark/Stuff/* \
-			|| die "copying Benchmark files"
-		cdrom_load_next_cd
-
-		for diskno in {2..5} ; do
-			einfo "Copying files from Disk ${diskno}..."
-			varname="DISK${diskno}"
-			srcdir=${!varname}
-			grabdirs "${srcdir}"
-			cdrom_load_next_cd
-		done
-
-		# Disk 6
-		einfo "Copying files from Disk 6..."
-		grabdirs "${DISK6}"
-
-		# Install extra help files
-		insinto "${dir}"/Help
-		doins Unreal.bmp
-
-		# Install EULA
-		insinto "${dir}"
-		doins UT2004_EULA.txt
-
-		# Installing documentation/icon
-		doins README.linux ut2004.xpm || die "copying readme/icon"
-		dodoc README.linux || die "dodoc README.linux"
-		doicon ut2004.xpm || die "doicon failed"
-
-		# Install System.inis
-		insinto "${dir}"/System
-		doins ini-{det,est,frt,int,itt,kot,smt,tmt}.tar
-
-		# Don't need a messy FindPath() script. This is replaced by
-		# games_make_wrapper in the ut2004 ebuild.
-		#exeinto "${dir}"
-		#doexe bin/ut2004 || die "copying ut2004"
-
-		exeinto "${dir}"/System
-		doexe System/{libSDL-1.2.so.0,openal.so} \
-			|| die "copying libraries"
-
-		# Uncompressing files
-		einfo "Uncompressing files... this *will* take a while..."
-		for j in Animations Maps Sounds StaticMeshes Textures ; do
-			fperms -R u+w "${dir}/${j}" || die "fperms ${j} failed"
-			games_ut_unpack "${Ddir}/${j}"
-		done
-	fi
-
-	# Empty directories. "DO_NOT_DELETE.ME" is the original filename, so
-	# is preferred to keepdir.
-	for j in CSVs Logs Results ; do
-		mkdir -p "${Ddir}/Benchmark/${j}"
-		touch "${Ddir}/Benchmark/${j}/DO_NOT_DELETE.ME" || die "touch failed"
-	done
-
-	# Removing unneccessary files
-	rm -f "${Ddir}"/*.{bat,exe,EXE,int}
-	rm -f "${Ddir}"/Help/{InstallerLogo.bmp,SAPI-EULA.txt,{Unreal,UnrealEd}.ico}
-	rm -f "${Ddir}"/Manual/*.exe
-	rm -rf "${Ddir}"/Speech/Redist
-	rm -f "${Ddir}"/System/*.{bat,dll,exe,tar}
-	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log}
-	rm -f "${Ddir}"/System/{User,UT2004}.ini
-
-	# Removing file collisions with ut2004-3369-r4
-	rm -f "${Ddir}"/Animations/ONSNewTank-A.ukx
-	rm -f "${Ddir}"/Help/UT2004Logo.bmp
-	rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,AS-{Convoy,FallenCity,Glacier,Junkyard,Mothership,RobotFactory}.int,bonuspack.{det,est,frt},BonusPack.{int,itt,u},BR-Serenity.int}
-	rm -f "${Ddir}"/System/CTF-{AbsoluteZero,BridgeOfFate,DE-ElecFields,DoubleDammage,January,LostFaith}.int
-	rm -f "${Ddir}"/System/DM-{1on1-Albatross,1on1-Desolation,1on1-Mixer,Corrugation,IronDeity,JunkYard}.int
-	rm -f "${Ddir}"/System/{DOM-Atlantis.int,OnslaughtBP.{kot,u,ucl},OnslaughtFull.int}
-	rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,kot,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot}
-	rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}
-	rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot}
-	rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}
-	rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}
-	rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot}
-	rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt}
-	rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt,UT2K4AssaultFull.int,UTV2004.kot,UTV2004s.kot}
-	rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est}
-	rm -f "${Ddir}"/Textures/jwfasterfiles.utx
-	rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css,current_bots_species_group.inc}
-	rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{adminsframe.htm,admins_home.htm,admins_menu.htm,current_bots.htm,currentframe.htm,current_menu.htm}
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{defaultsframe.htm,defaults_menu.htm,footer.inc,mainmenu.htm,mainmenu_itemd.inc,rootframe.htm,UnrealAdminPage.css}
-	rm -f "${Ddir}"/Web/ServerAdmin/UT2K3Stats/{admins_home.htm,current_bots.htm,ut2003stats.css}
-
-	# Removing file collisions with ut2004-bonuspack-ece
-	rm -f "${Ddir}"/Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx
-	rm -f "${Ddir}"/Help/BonusPackReadme.txt
-	rm -f "${Ddir}"/Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm -f "${Ddir}"/Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f "${Ddir}"/StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f "${Ddir}"/System/{ONS-Adara.int,ONS-IslandHop.int,ONS-Tricky.int,ONS-Urban.int,OnslaughtBP.int,xaplayersl3.upl}
-	rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx
-	rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-
-	# Removing file collisions with ut2004-bonuspack-mega
-	rm -f "${Ddir}"/Help/MegapackReadme.txt
-	rm -f "${Ddir}"/Maps/{AS-BP2-Acatana,AS-BP2-Jumpship,AS-BP2-Outback,AS-BP2-SubRosa,AS-BP2-Thrust}.ut2
-	rm -f "${Ddir}"/Maps/{CTF-BP2-Concentrate,CTF-BP2-Pistola,DM-BP2-Calandras,DM-BP2-GoopGod}.ut2
-	rm -f "${Ddir}"/Music/APubWithNoBeer.ogg
-	rm -f "${Ddir}"/Sounds/A_Announcer_BP2.uax
-	rm -f "${Ddir}"/StaticMeshes/{JumpShipObjects,Ty_RocketSMeshes}.usx
-	rm -f "${Ddir}"/System/{AssaultBP.u,Manifest.in{i,t},Packages.md5}
-	rm -f "${Ddir}"/Textures/{JumpShipTextures,T_Epic2k4BP2,Ty_RocketTextures}.utx
-
-	# Now, since these files are coming off a CD, the times/sizes/md5sums won't
-	# be different ... that means portage will try to unmerge some files (!)
-	# We run touch on ${D} so as to make sure portage doesn't do any such thing
-	find "${Ddir}" -exec touch '{}' \;
-
-	prepgamesdirs
-
-	if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] || use dynamic ; then
-		# Done after prepgamesdirs because do not want to change perms.
-		# Can improve performance, and remove pause when exiting game,
-		# although upstream wants us to use the binary libs.
-		# The binary libs are not even supplied with Midway DVDs anyway.
-		[[ -e "${D}/${dir}"/System/libSDL-1.2.so.0 ]] \
-			&& rm -f "${D}/${dir}"/System/libSDL-1.2.so.0
-		dosym /usr/"$(get_libdir)"/libSDL-1.2.so.0 \
-			"${dir}"/System/libSDL-1.2.so.0 \
-			|| die "dosym libSDL-1.2.so.0 failed"
-
-		[[ -e "${D}/${dir}"/System/openal.so ]] \
-			&& rm -f "${D}/${dir}"/System/openal.so
-		dosym /usr/"$(get_libdir)"/libopenal.so "${dir}"/System/openal.so \
-			|| die "dosym openal.so failed"
-	fi
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	echo
-	elog "This is only the data portion of the game. To play UT2004,"
-	elog "you still need to emerge ut2004."
-	echo
-}
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild.old b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild.old
deleted file mode 100644
index b379bd3..0000000
--- a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild.old
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib games games-ut2k4mod
-
-DESCRIPTION="Unreal Tournament 2004 - this is the data portion of UT2004"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI=""
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dynamic icon"
-RESTRICT="strip"
-
-# Must assume for Midway DVDs that openal, libsdl & unshield are needed.
-# Needs >=app-arch/unshield-0.5-r1 due to bug #149235.
-# Needs imagemagick to extract the icon from some Midway DVDs.
-RDEPEND="media-libs/openal
-	media-libs/libsdl"
-DEPEND="${RDEPEND}
-	games-util/uz2unpack
-	>=app-arch/unshield-0.5-r1
-	icon? ( media-gfx/imagemagick )"
-# Ideally, will be downloading ut2004 while installing ut2004-data
-PDEPEND="games-fps/ut2004"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-QA_TEXTRELS="${dir:1}/System/libSDL-1.2.so.0"
-
-GAMES_LICENSE_CHECK="yes"
-
-grabdirs() {
-	local d srcdir
-
-	for d in {Music,Sounds,Speech,StaticMeshes,Textures} ; do
-		srcdir=${CDROM_ROOT}/$1${d}
-		# Is flexible to handle CD_ROOT vs CD_ROOT_1 mixups
-		[[ -d "${srcdir}" ]] || srcdir=${CDROM_ROOT}/${d}
-		if [[ -d "${srcdir}" ]] ; then
-			insinto "${dir}"
-			doins -r "${srcdir}" || die "doins ${srcdir} failed"
-		fi
-	done
-}
-
-pkg_setup() {
-	games_pkg_setup
-
-	ewarn "This is a huge package. If you do not have at least 7GB of free"
-	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT}"
-	ewarn "then you should abort this installation now and free up some space."
-}
-
-src_unpack() {
-	check_dvd
-
-	if [[ "${USE_DVD}" -eq 1 ]] ; then
-		if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] ; then
-			# Is 1 DVD, either UT2004-only or Anthology
-			if [[ "${USE_GERMAN_MIDWAY_DVD}" -eq 1 ]] ; then
-				cdrom_get_cds autorund/unreal.ico
-			else
-				cdrom_get_cds AutoRunData/Unreal.ico
-			fi
-		else
-			DISK1="CD1/"
-			DISK2="CD2/"
-			DISK3="CD3/"
-			DISK4="CD4/"
-			DISK5="CD5/"
-			DISK6="CD6/"
-			if [[ "${USE_ECE_DVD}" -eq 1 ]] ; then
-				# Editor's Choice Edition DVD
-				cdrom_get_cds "${DISK1}"System/UT2004.ini \
-					"${DISK2}"Textures/2K4Fonts.utx.uz2 \
-					"${DISK3}"Textures/ONSDeadVehicles-TX.utx.uz2 \
-					"${DISK4}"Textures/XGameShaders2004.utx.uz2 \
-					"${DISK5}"Speech/ons.xml \
-					"${DISK6}"Sounds/TauntPack.det_uax.uz2
-			else
-				# Original DVD
-				cdrom_get_cds "${DISK1}"System/UT2004.ini \
-					"${DISK2}"Textures/2K4Fonts.utx.uz2 \
-					"${DISK3}"Textures/ONSDeadVehicles-TX.utx.uz2 \
-					"${DISK4}"StaticMeshes/AlienTech.usx.uz2 \
-					"${DISK5}"Speech/ons.xml \
-					"${DISK6}"Sounds/TauntPack.det_uax.uz2
-			fi
-		fi
-	else
-		# 6 CDs
-		cdrom_get_cds System/UT2004.ini \
-			Textures/2K4Fonts.utx.uz2 \
-			Textures/ONSDeadVehicles-TX.utx.uz2 \
-			StaticMeshes/AlienTech.usx.uz2 \
-			Speech/ons.xml \
-			Sounds/TauntPack.det_uax.uz2
-	fi
-
-	if [[ "${USE_MIDWAY_DVD}" -ne 1 ]] ; then
-		unpack_makeself "${CDROM_ROOT}"/linux-installer.sh \
-			|| die "unpacking linux installer"
-		use x86 && unpack ./linux-x86.tar
-		use amd64 && unpack ./linux-amd64.tar
-	fi
-}
-
-src_install() {
-	local cabfile diskno srcdir varname j
-
-	if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] ; then
-		einfo "Copying files from UT2004 Midway DVD."
-
-		if [[ -e "${CDROM_ROOT}"/Manual/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual/Manual.pdf \
-				|| die "copying Manual.pdf"
-		elif [[ -e "${CDROM_ROOT}"/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual.pdf \
-				|| die "copying Manual.pdf"
-		fi
-
-		# Symlinks for unshield. data1&2.cab are both in Disk1.
-		# unshield needs data1.hdr
-		if [[ "${USE_GERMAN_MIDWAY_DVD}" -eq 1 ]] ; then
-			ln -sfn "${CDROM_ROOT}/disk1/data1.hdr" .
-			ln -sfn "${CDROM_ROOT}/disk1/data1.cab" .
-			ln -sfn "${CDROM_ROOT}/disk1/data2.cab" .
-			ln -sfn "${CDROM_ROOT}/disk2/data3.cab" .
-			ln -sfn "${CDROM_ROOT}/disk3/data4.cab" .
-			ln -sfn "${CDROM_ROOT}/disk4/data5.cab" .
-			ln -sfn "${CDROM_ROOT}/disk5/data6.cab" .
-			ln -sfn "${CDROM_ROOT}/disk6/data7.cab" .
-			ln -sfn "${CDROM_ROOT}/disk7/data8.cab" .
-		else
-			ln -sfn "${CDROM_ROOT}/Disk1/data1.hdr" .
-			ln -sfn "${CDROM_ROOT}/Disk1/data1.cab" .
-			ln -sfn "${CDROM_ROOT}/Disk1/data2.cab" .
-			ln -sfn "${CDROM_ROOT}/Disk2/data3.cab" .
-			ln -sfn "${CDROM_ROOT}/Disk3/data4.cab" .
-			ln -sfn "${CDROM_ROOT}/Disk4/data5.cab" .
-			ln -sfn "${CDROM_ROOT}/Disk5/data6.cab" .
-			# The Midway Anthology DVD contains up to data9.cab
-			if [[ -e "${CDROM_ROOT}/Disk8/data9.cab" ]] ; then
-				ln -sfn "${CDROM_ROOT}/Disk6/data7.cab" .
-				ln -sfn "${CDROM_ROOT}/Disk7/data8.cab" .
-				ln -sfn "${CDROM_ROOT}/Disk8/data9.cab" .
-			fi
-		fi
-
-		# The big extraction
-		einfo "Extracting from CAB files - this will take several minutes."
-		unshield x data1.cab || die "unshield data1.cab failed"
-
-		# Useful debugging information
-		ls -R > extract-filelist.txt
-
-		if [[ -d 4_UT2004_Animations ]] ; then
-			# Delete the other games on the Anthology DVD
-			rm -rf {1,2,3}_Unreal* 4_UT2004_EXE Launcher_English OCXFiles
-			# Rename directories to be same as Midway UT2004-only DVD,
-			# i.e. rename "4_UT2004_Animations" to "Animations".
-			for j in 4_UT2004_* ; do
-				mv -f "${j}" "${j:9}" || die "mv ${j} failed"
-			done
-		fi
-
-		# The "logging" subdirectory is created by unshield.
-		rm -rf logging
-		rm -f *.{cab,hdr}
-
-		for j in Animations Benchmark ForceFeedback Help KarmaData \
-			Manual Maps Music Sounds Speech StaticMeshes \
-			System Textures Web ; do
-			einfo "Collating ${j}"
-
-			# UT2004-only DVD has "All_*" dirs, and Anthology DVD has "*_All"
-			if [[ -d "All_${j}" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "All_${j}"/* "${j}" || die "cp All_${j}"
-				else
-					mv -f "All_${j}" "${j}" || die "mv All_${j}"
-				fi
-			fi
-			if [[ -d "${j}_All" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "${j}_All"/* "${j}" || die "cp ${j}_All"
-				else
-					mv -f "${j}_All" "${j}" || die "mv ${j}_All"
-				fi
-			fi
-
-			if [[ -d "English_${j}" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "English_${j}"/* "${j}" || die "cp English_${j}"
-				else
-					mv -f "English_${j}" "${j}" || die "mv English_${j}"
-				fi
-			fi
-			if [[ -d "${j}_English" ]] ; then
-				if [[ -d "${j}" ]] ; then
-					cp -rf "${j}_English"/* "${j}" || die "cp ${j}_English"
-				else
-					mv -f "${j}_English" "${j}" || die "mv ${j}_English"
-				fi
-			fi
-
-			# Ensure that the directory exists
-			mkdir -p "${j}" || die
-		done
-
-		# Rearrange directories
-		if [[ -d English_Sounds_Speech_System_Help ]] ; then
-			# http://utforums.epicgames.com/showthread.php?t=558146
-			for j in Sounds Speech System Help ; do
-				cp -rf English_Sounds_Speech_System_Help/"${j}"/* "${j}" \
-					|| die "cp English_Sounds_Speech_System_Help/${j}"
-			done
-		fi
-
-		if [[ ! -d Benchmark/Stuff ]] ; then
-			mkdir -p Benchmark/Stuff || die
-			cp -f BenchmarkStuff/timedemo.txt Benchmark/Stuff || die
-		fi
-
-		if [[ ! -d System/editorres ]] ; then
-			mkdir -p System/editorres || die
-			cp -rf Systemeditorres/* System/editorres || die
-		fi
-
-		if [[ ! -d Web/images ]] ; then
-			mkdir -p Web/{images,ServerAdmin,Src} || die
-			cp -rf Webimages/* Web/images || die
-			cp -rf WebServerAdmin/* Web/ServerAdmin || die
-			cp -rf WebSrc/* Web/Src || die
-		fi
-
-		# Straggling file. Seems safe to ignore.
-		#[[ -e US_License.int ]] && mv -f US_License.int System
-
-		# Remove unnecessary directories
-		rm -rf Benchmark{CSVs,Logs,Results,Stuff}
-		rm -rf Systemeditorres Web{images,ServerAdmin,Src}
-		rm -rf \<* \[* _* All_* English_* *_All *_English
-
-		# These files are created later, for all installations
-		find . -type f -name 'DO_NOT_DELETE.ME' -delete
-
-		# Sanity checks
-		[[ -d Animations ]] || die "Animations directory does not exist."
-		[[ -d Music ]] || die "Music directory does not exist."
-
-		if [[ ! -e ut2004.xpm ]] && use icon ; then
-			# Create ut2004.xpm desktop icon if possible
-			if [[ -e Help/Unreal.ico ]] ; then
-				einfo "Creating icon from Help/Unreal.ico"
-				# Uses imagemagick to convert the icon
-				convert Help/Unreal.ico ut2004.xpm \
-					|| die "convert Unreal.ico failed"
-				mv -f ut2004-6.xpm ut2004.xpm || die
-				# Remove the other graphics files that were extracted
-				rm -f ut2004-?.xpm
-			elif [[ -e "${CDROM_ROOT}"/AutoRunData/Unreal.ico ]] ; then
-				einfo "Creating icon from /AutoRunData/Unreal.ico on DVD"
-				# Uses imagemagick to convert the icon
-				convert "${CDROM_ROOT}"/AutoRunData/Unreal.ico ut2004.xpm \
-					|| die "convert Unreal.ico failed"
-				mv -f ut2004-6.xpm ut2004.xpm || die
-				# Remove the other graphics files that were extracted
-				rm -f ut2004-?.xpm
-			elif [[ -e Help/Unreal.bmp ]] ; then
-				einfo "Creating icon from Help/Unreal.bmp"
-				# Uses imagemagick to convert the icon
-				convert -transparent 'rgb(255,0,255)' Help/Unreal.bmp \
-					ut2004.xpm || die "convert Unreal.bmp failed"
-				# Remove pink border from icon. A shadow remains.
-				mogrify -transparent 'rgb(252,2,252)' ut2004.xpm || die
-				mogrify -transparent 'rgb(217,14,217)' ut2004.xpm || die
-				mogrify -transparent 'rgb(228,10,228)' ut2004.xpm || die
-				mogrify -transparent 'rgb(237,11,236)' ut2004.xpm || die
-				mogrify -transparent 'rgb(246,6,246)' ut2004.xpm || die
-				mogrify -transparent 'rgb(207,21,206)' ut2004.xpm || die
-				mogrify -transparent 'rgb(243,10,243)' ut2004.xpm || die
-				mogrify -transparent 'rgb(211,35,210)' ut2004.xpm || die
-				mogrify -transparent 'rgb(170,69,168)' ut2004.xpm || die
-				mogrify -transparent 'rgb(227,23,227)' ut2004.xpm || die
-				mogrify -transparent 'rgb(215,20,215)' ut2004.xpm || die
-				mogrify -transparent 'rgb(216,32,215)' ut2004.xpm || die
-				mogrify -transparent 'rgb(152,82,149)' ut2004.xpm || die
-				mogrify -transparent 'rgb(220,29,219)' ut2004.xpm || die
-				mogrify -transparent 'rgb(186,56,185)' ut2004.xpm || die
-				mogrify -transparent 'rgb(231,19,231)' ut2004.xpm || die
-				mogrify -transparent 'rgb(165,74,163)' ut2004.xpm || die
-				mogrify -transparent 'rgb(142,93,140)' ut2004.xpm || die
-				mogrify -transparent 'rgb(203,43,201)' ut2004.xpm || die
-				mogrify -transparent 'rgb(150,86,147)' ut2004.xpm || die
-				mogrify -transparent 'rgb(205,41,204)' ut2004.xpm || die
-				mogrify -transparent 'rgb(133,99,131)' ut2004.xpm || die
-				mogrify -transparent 'rgb(128,104,125)' ut2004.xpm || die
-				mogrify -transparent 'rgb(176,65,174)' ut2004.xpm || die
-				mogrify -transparent 'rgb(152,85,150)' ut2004.xpm || die
-				mogrify -transparent 'rgb(138,96,135)' ut2004.xpm || die
-				mogrify -transparent 'rgb(160,78,158)' ut2004.xpm || die
-			fi
-		fi
-
-		# The big install
-		einfo "Installing UT2004 directories..."
-		insinto "${dir}"
-		doins -r * || die "doins -r * failed"
-
-		if [[ -e ut2004.xpm ]] ; then
-			# Install icon
-			doicon ut2004.xpm || die "doicon failed"
-		fi
-	else
-		# Disk 1
-		einfo "Copying files from Disk 1..."
-		insinto "${dir}"
-		doins -r "${CDROM_ROOT}/${DISK1}"{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Web} \
-			|| die "copying directories"
-		insinto "${dir}"/System
-		doins -r "${CDROM_ROOT}/${DISK1}"System/{editorres,*.{bat,bmp,dat,det,est,frt,ini,int,itt,kot,md5,smt,tmt,u,ucl,upl,url}} \
-			|| die "copying System files"
-		insinto "${dir}"/Manual
-		doins "${CDROM_ROOT}/${DISK1}"Manual/Manual.pdf \
-			|| die "copying Manual.pdf"
-		insinto "${dir}"/Benchmark/Stuff
-		doins -r "${CDROM_ROOT}/${DISK1}"Benchmark/Stuff/* \
-			|| die "copying Benchmark files"
-		cdrom_load_next_cd
-
-		for diskno in {2..5} ; do
-			einfo "Copying files from Disk ${diskno}..."
-			varname="DISK${diskno}"
-			srcdir=${!varname}
-			grabdirs "${srcdir}"
-			cdrom_load_next_cd
-		done
-
-		# Disk 6
-		einfo "Copying files from Disk 6..."
-		grabdirs "${DISK6}"
-
-		# Install extra help files
-		insinto "${dir}"/Help
-		doins Unreal.bmp
-
-		# Install EULA
-		insinto "${dir}"
-		doins UT2004_EULA.txt
-
-		# Installing documentation/icon
-		doins README.linux ut2004.xpm || die "copying readme/icon"
-		dodoc README.linux || die "dodoc README.linux"
-		doicon ut2004.xpm || die "doicon failed"
-
-		# Install System.inis
-		insinto "${dir}"/System
-		doins ini-{det,est,frt,int,itt,kot,smt,tmt}.tar
-
-		# Don't need a messy FindPath() script. This is replaced by
-		# games_make_wrapper in the ut2004 ebuild.
-		#exeinto "${dir}"
-		#doexe bin/ut2004 || die "copying ut2004"
-
-		exeinto "${dir}"/System
-		doexe System/{libSDL-1.2.so.0,openal.so} \
-			|| die "copying libraries"
-
-		# Uncompressing files
-		einfo "Uncompressing files... this *will* take a while..."
-		for j in Animations Maps Sounds StaticMeshes Textures ; do
-			fperms -R u+w "${dir}/${j}" || die "fperms ${j} failed"
-			games_ut_unpack "${Ddir}/${j}"
-		done
-	fi
-
-	# Empty directories. "DO_NOT_DELETE.ME" is the original filename, so
-	# is preferred to keepdir.
-	for j in CSVs Logs Results ; do
-		mkdir -p "${Ddir}/Benchmark/${j}"
-		touch "${Ddir}/Benchmark/${j}/DO_NOT_DELETE.ME" || die "touch failed"
-	done
-
-	# Removing unneccessary files
-	rm -f "${Ddir}"/*.{bat,exe,EXE,int}
-	rm -f "${Ddir}"/Help/{InstallerLogo.bmp,SAPI-EULA.txt,{Unreal,UnrealEd}.ico}
-	rm -f "${Ddir}"/Manual/*.exe
-	rm -rf "${Ddir}"/Speech/Redist
-	rm -f "${Ddir}"/System/*.{bat,dll,exe,tar}
-	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log}
-	rm -f "${Ddir}"/System/{User,UT2004}.ini
-
-	# Removing file collisions with ut2004-3369-r4
-	rm -f "${Ddir}"/Animations/ONSNewTank-A.ukx
-	rm -f "${Ddir}"/Help/UT2004Logo.bmp
-	rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,AS-{Convoy,FallenCity,Glacier,Junkyard,Mothership,RobotFactory}.int,bonuspack.{det,est,frt},BonusPack.{int,itt,u},BR-Serenity.int}
-	rm -f "${Ddir}"/System/CTF-{AbsoluteZero,BridgeOfFate,DE-ElecFields,DoubleDammage,January,LostFaith}.int
-	rm -f "${Ddir}"/System/DM-{1on1-Albatross,1on1-Desolation,1on1-Mixer,Corrugation,IronDeity,JunkYard}.int
-	rm -f "${Ddir}"/System/{DOM-Atlantis.int,OnslaughtBP.{kot,u,ucl},OnslaughtFull.int}
-	rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,kot,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot}
-	rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}
-	rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot}
-	rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}
-	rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}
-	rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot}
-	rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt}
-	rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt,UT2K4AssaultFull.int,UTV2004.kot,UTV2004s.kot}
-	rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est}
-	rm -f "${Ddir}"/Textures/jwfasterfiles.utx
-	rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css,current_bots_species_group.inc}
-	rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{adminsframe.htm,admins_home.htm,admins_menu.htm,current_bots.htm,currentframe.htm,current_menu.htm}
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{defaultsframe.htm,defaults_menu.htm,footer.inc,mainmenu.htm,mainmenu_itemd.inc,rootframe.htm,UnrealAdminPage.css}
-	rm -f "${Ddir}"/Web/ServerAdmin/UT2K3Stats/{admins_home.htm,current_bots.htm,ut2003stats.css}
-
-	# Removing file collisions with ut2004-bonuspack-ece
-	rm -f "${Ddir}"/Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx
-	rm -f "${Ddir}"/Help/BonusPackReadme.txt
-	rm -f "${Ddir}"/Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm -f "${Ddir}"/Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f "${Ddir}"/StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f "${Ddir}"/System/{ONS-Adara.int,ONS-IslandHop.int,ONS-Tricky.int,ONS-Urban.int,OnslaughtBP.int,xaplayersl3.upl}
-	rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx
-	rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-
-	# Removing file collisions with ut2004-bonuspack-mega
-	rm -f "${Ddir}"/Help/MegapackReadme.txt
-	rm -f "${Ddir}"/Maps/{AS-BP2-Acatana,AS-BP2-Jumpship,AS-BP2-Outback,AS-BP2-SubRosa,AS-BP2-Thrust}.ut2
-	rm -f "${Ddir}"/Maps/{CTF-BP2-Concentrate,CTF-BP2-Pistola,DM-BP2-Calandras,DM-BP2-GoopGod}.ut2
-	rm -f "${Ddir}"/Music/APubWithNoBeer.ogg
-	rm -f "${Ddir}"/Sounds/A_Announcer_BP2.uax
-	rm -f "${Ddir}"/StaticMeshes/{JumpShipObjects,Ty_RocketSMeshes}.usx
-	rm -f "${Ddir}"/System/{AssaultBP.u,Manifest.in{i,t},Packages.md5}
-	rm -f "${Ddir}"/Textures/{JumpShipTextures,T_Epic2k4BP2,Ty_RocketTextures}.utx
-
-	# Now, since these files are coming off a CD, the times/sizes/md5sums won't
-	# be different ... that means portage will try to unmerge some files (!)
-	# We run touch on ${D} so as to make sure portage doesn't do any such thing
-	find "${Ddir}" -exec touch '{}' \;
-
-	prepgamesdirs
-
-	if [[ "${USE_MIDWAY_DVD}" -eq 1 ]] || use dynamic ; then
-		# Done after prepgamesdirs because do not want to change perms.
-		# Can improve performance, and remove pause when exiting game,
-		# although upstream wants us to use the binary libs.
-		# The binary libs are not even supplied with Midway DVDs anyway.
-		[[ -e "${D}/${dir}"/System/libSDL-1.2.so.0 ]] \
-			&& rm -f "${D}/${dir}"/System/libSDL-1.2.so.0
-		dosym /usr/"$(get_libdir)"/libSDL-1.2.so.0 \
-			"${dir}"/System/libSDL-1.2.so.0 \
-			|| die "dosym libSDL-1.2.so.0 failed"
-
-		[[ -e "${D}/${dir}"/System/openal.so ]] \
-			&& rm -f "${D}/${dir}"/System/openal.so
-		dosym /usr/"$(get_libdir)"/libopenal.so "${dir}"/System/openal.so \
-			|| die "dosym openal.so failed"
-	fi
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	echo
-	elog "This is only the data portion of the game. To play UT2004,"
-	elog "you still need to emerge ut2004."
-	echo
-}
diff --git a/games-fps/ut2004-data/ut2004-data.ebuild.diff b/games-fps/ut2004-data/ut2004-data.ebuild.diff
deleted file mode 100644
index f65db06..0000000
--- a/games-fps/ut2004-data/ut2004-data.ebuild.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- ut2004-data-3186-r3.ebuild.old	2008-07-24 23:36:56.000000000 +0200
-+++ ut2004-data-3186-r3.ebuild	2008-07-24 23:38:46.000000000 +0200
-@@ -126,33 +126,10 @@
- 				|| die "copying Manual.pdf"
- 		fi
- 
--		# Symlinks for unshield. data1&2.cab are both in Disk1.
--		# unshield needs data1.hdr
--		if [[ "${USE_GERMAN_MIDWAY_DVD}" -eq 1 ]] ; then
--			ln -sfn "${CDROM_ROOT}/disk1/data1.hdr" .
--			ln -sfn "${CDROM_ROOT}/disk1/data1.cab" .
--			ln -sfn "${CDROM_ROOT}/disk1/data2.cab" .
--			ln -sfn "${CDROM_ROOT}/disk2/data3.cab" .
--			ln -sfn "${CDROM_ROOT}/disk3/data4.cab" .
--			ln -sfn "${CDROM_ROOT}/disk4/data5.cab" .
--			ln -sfn "${CDROM_ROOT}/disk5/data6.cab" .
--			ln -sfn "${CDROM_ROOT}/disk6/data7.cab" .
--			ln -sfn "${CDROM_ROOT}/disk7/data8.cab" .
--		else
--			ln -sfn "${CDROM_ROOT}/Disk1/data1.hdr" .
--			ln -sfn "${CDROM_ROOT}/Disk1/data1.cab" .
--			ln -sfn "${CDROM_ROOT}/Disk1/data2.cab" .
--			ln -sfn "${CDROM_ROOT}/Disk2/data3.cab" .
--			ln -sfn "${CDROM_ROOT}/Disk3/data4.cab" .
--			ln -sfn "${CDROM_ROOT}/Disk4/data5.cab" .
--			ln -sfn "${CDROM_ROOT}/Disk5/data6.cab" .
--			# The Midway Anthology DVD contains up to data9.cab
--			if [[ -e "${CDROM_ROOT}/Disk8/data9.cab" ]] ; then
--				ln -sfn "${CDROM_ROOT}/Disk6/data7.cab" .
--				ln -sfn "${CDROM_ROOT}/Disk7/data8.cab" .
--				ln -sfn "${CDROM_ROOT}/Disk8/data9.cab" .
--			fi
--		fi
-+		for cab in "${CDROM_ROOT}"/[dD]isk?/data?.{cab,hdr}; do
-+			elog "Linking: $cab"
-+			ln -sfn ${cab} .
-+		done
- 
- 		# The big extraction
- 		einfo "Extracting from CAB files - this will take several minutes."
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
deleted file mode 100644
index 5d92445..0000000
--- a/games-fps/ut2004/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX ut2004.xml 370 RMD160 f54254f4af9422b72e93b9f4e2aa126b828c34f4 SHA1 53be0a7e6cd5ea1c5329fee791e527b9f8edf29a SHA256 69d2ad349f8b0464157979518ca3482b6b8bbc34f25d710668775f36581be34c
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d SHA1 a8cc33877a02a0a09c288b5fc248efde282f7bdf SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3
-EBUILD ut2004-3369-r4.ebuild 4915 RMD160 b5e5f16dbd2cf6fb603a355d60d37367d3d1aaef SHA1 e35d482fc4adb65149e654505a48135d442d677b SHA256 335db326c4ffa65da261d0c24eeb7d319b009b8c945fd110f23f65aafc38d17d
diff --git a/games-fps/ut2004/files/ut2004.xml b/games-fps/ut2004/files/ut2004.xml
deleted file mode 100644
index f87f48c..0000000
--- a/games-fps/ut2004/files/ut2004.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<product name="ut2004" desc="Unreal Tournament 2004" xmlversion="1.6" root="GAMES_PREFIX_OPT/ut2004" update_url="http://unreal.epicgames.com/updates/ut2004/updates.txt">
-  <component name="__CDKEY__" version="3369" default="yes">
-    <option name="English"></option>
-    <option name="__CDKEY__" tag="__CDKEY__"></option>
-  </component>
-</product>
diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild
deleted file mode 100644
index f3515b5..0000000
--- a/games-fps/ut2004/ut2004-3369-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils games
-
-MY_P="${PN}-lnxpatch${PV}-2.tar.bz2"
-
-DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
-	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
-	http://treefort.icculus.org/${PN}/${MY_P}
-	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
-RESTRICT="mirror strip"
-
-RDEPEND=">=games-fps/ut2004-data-3186-r2
-	>=games-fps/ut2004-bonuspack-ece-1-r1
-	>=games-fps/ut2004-bonuspack-mega-1-r1
-	opengl? ( virtual/opengl )
-	=virtual/libstdc++-3.3
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp"
-
-S=${WORKDIR}/UT2004-Patch
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_EXECSTACK="${dir:1}/System/ut2004-bin
-	${dir:1}/System/ucc-bin"
-
-GAMES_CHECK_LICENSE="yes"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Newbie check
-	if [[ ! -e "${FILESDIR}/${PN}.xml" ]] ; then
-		die "Missing: ${FILESDIR}/${PN}.xml"
-	fi
-
-	if use x86 ; then
-		rm -f System/{ucc,ut2004}-bin-linux-amd64
-	else
-		mv -f System/ucc-bin-linux-amd64 System/ucc-bin || die
-		mv -f System/ut2004-bin-linux-amd64 System/ut2004-bin || die
-	fi
-}
-
-src_install() {
-	# These files are owned by ut2004-bonuspack-mega
-	rm -f System/{Manifest.in{i,t},Packages.md5}
-
-	# Installing patch files
-	local d
-	for d in Animations Help Speech System Textures Web ; do
-		insinto "${dir}"
-		doins -r "${d}" || die "doins ${p} from patch"
-	done
-
-	rm -f "${D}/${dir}/System"/{ucc,ut2004}-bin
-	exeinto "${dir}/System"
-	doexe System/{ucc,ut2004}-bin || die "doexe failed"
-
-	# Creating .manifest files
-	sed -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${FILESDIR}"/${PN}.xml > \
-		"${T}"/${PN}.xml || die "sed ${PN}.xml failed"
-	insinto "${dir}"/.manifest
-	doins "${T}"/${PN}.xml
-
-	# Creating .loki/installed links
-	mkdir -p "${D}"/root/.loki/installed
-	dosym "${dir}"/.manifest/${PN}.xml /root/.loki/installed/${PN}.xml
-
-	# Replaces the /opt/ut2004/ut2004 script, which is not provided on
-	# the Anthology DVD.
-	# games-mods.eclass requires the /opt/ut2004/ut2004 script, for mods.
-	games_make_wrapper ut2004 ./ut2004 "${dir}"
-
-	echo -e "#!/bin/sh\ncd System\nif [[ \"\${LD_LIBRARY_PATH+set}\" = \"set\" ]] ; then\n\texport LD_LIBRARY_PATH=\"..:.\"\nelse\n\texport LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:..:.\"\nfi\nexec ./ut2004-bin \"\$@\"" \
-		> ut2004 || die
-	exeinto "${dir}"
-	doexe ut2004 || die
-
-	make_desktop_entry ut2004 "Unreal Tournament 2004" ut2004.xpm
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# Here is where we check for the existence of a CD key...
-	# If we don't find one, we ask the user for it.
-	if [[ -f "${dir}/System/cdkey" ]] ; then
-		einfo "A CD key file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can [re]enter your CD key."
-	fi
-	echo
-	elog "Starting with 3369, the game supports render-to-texture. To enable"
-	elog "it, you will need the Nvidia drivers of at least version 7676 and"
-	elog "you should edit the following:"
-	elog
-	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	elog 'section of your UT2004.ini/Default.ini and set "bPlayerShadows=True"'
-	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	elog 'your User.ini/DefUser.ini'
-	if use x86 ; then
-		elog
-		elog "The 32-bit version of UT2004 uses Pixomatic, which means it"
-		elog "really does need an executable stack. It is safe to ignore any"
-		elog "warnings from Portage about this. See:"
-		elog "http://bugs.gentoo.org/show_bug.cgi?id=114733"
-		elog "for more information."
-	fi
-	elog
-	elog "To play the game, run:"
-	elog " ut2004"
-	echo
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a CD key file that you"
-	ewarn "need to remove, to completely get rid of this game's files:"
-	ewarn "${dir}/System/cdkey"
-}
-
-pkg_config() {
-	local cdkey1 cdkey2
-
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read cdkey1
-		if [[ "${cdkey1}" == "" ]] ; then
-			echo "You entered a blank CD key. Try again."
-			continue
-		fi
-		einfo "Please re-enter your CD key:"
-		read cdkey2
-		if [[ "${cdkey2}" == "" ]] ; then
-			echo "You entered a blank CD key. Try again."
-			continue
-		fi
-
-		if [[ "${cdkey1}" == "${cdkey2}" ]] ; then
-			echo "${cdkey1}" | tr a-z A-Z > "${dir}"/System/cdkey
-			einfo "Thanks, created ${dir}/System/cdkey"
-			break
-		else
-			eerror "Your CD key entries do not match. Try again."
-		fi
-	done
-}
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
deleted file mode 100644
index 0ed1539..0000000
--- a/www-servers/lighttpd/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX 1.4.25-fix-multiple-ssl.patch 418 RMD160 9b0b7410fa4ccb8ad874483f8bec8b69d72f80af SHA1 6e46b14b97a68b59260731b1577e531fb412f518 SHA256 0b91569695c7d6b89ce13a8deb069ee83fdcba414853401e480c1ec04760b74b
-AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c
-AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5
-AUX conf/mime-types.conf 3436 RMD160 e4b6024ac6cd48253d4be0abb171ad54e7fbc121 SHA1 2d060ec0d464d73896fdaaedbeb259c2fecac99d SHA256 75a6fce072250ebccde2320996fdace0ebfeb525b03322f0b454f8f4e0e29a85
-AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
-AUX conf/mod_fastcgi.conf 677 RMD160 4403ca232cfcfc51d1d71529be9903bf4123451e SHA1 2b4a3d35215ba8824b5eca943156b373479f1a45 SHA256 954bf2a030e268e7cd880d4cd7d6c13317c09e0ec4e87a8d7d887fb4e7dc83bd
-AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e
-AUX lighttpd.confd 315 RMD160 c2d9c166a1209b853b400b5d21627f5d3f2d5216 SHA1 a09597a0d38d0b4d36a8f16f5d6fd5c4b7462b26 SHA256 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87
-AUX lighttpd.initd 1445 RMD160 0ebf75a57644912748a1c4173aa64c15981e5abc SHA1 0597c93d246639141ca8522f44f24b2431949e2e SHA256 72b08e97eae7de6a33160085bc46c0edd36f6924d6132239cd8191399998ec5a
-AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
-AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
-AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
-AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1
-DIST lighttpd-1.4.26.tar.bz2 627971 RMD160 2d294083fbcd4040dc8efec06090cf1c1bf66bbf SHA1 f9710da0152792d83c223a1248345a2d145d6f32 SHA256 d7c25a5bb08c8dbc3e8d86f9e564c90ebf0c365d7fcf5ee801e912fb3c2357fd
-EBUILD lighttpd-1.4.26-r1.ebuild 5889 RMD160 5ae17b89f3bfb659ce950f22320a59b7a5dfe960 SHA1 e83d7525c2d599627a8dac0247eb8072c1a73ae3 SHA256 a8164e4e56d9afae4775bcc95dd17d62e26fd10824eb1304c49efdb2a524bcc1
diff --git a/www-servers/lighttpd/files/1.4.25-fix-multiple-ssl.patch b/www-servers/lighttpd/files/1.4.25-fix-multiple-ssl.patch
deleted file mode 100644
index e9388a3..0000000
--- a/www-servers/lighttpd/files/1.4.25-fix-multiple-ssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/network.c.orig	2009-10-17 00:03:44.000000000 +0200
-+++ src/network.c	2010-03-25 23:09:56.000000000 +0100
-@@ -82,6 +82,9 @@
- 	buffer_copy_string(con->tlsext_server_name, servername);
- 	buffer_to_lower(con->tlsext_server_name);
- 
-+    /* Sometimes this is still set, confusing COMP_HTTP_HOST */
-+    buffer_reset(con->uri.authority);
-+
- 	config_cond_cache_reset(srv, con);
- 	config_setup_connection(srv, con);
- 
diff --git a/www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch b/www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch
deleted file mode 100644
index 1ef8a1c..0000000
--- a/www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix check of return value
-from upstream svn repo
-
-Index: network.c
-===================================================================
---- src/network.c	(revision 2715)
-+++ src/network.c	(revision 2716)
-@@ -525,7 +525,7 @@
- 
- 		if (!s->ssl_use_sslv2) {
- 			/* disable SSLv2 */
--			if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+			if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
- 						ERR_error_string(ERR_get_error(), NULL));
- 				return -1;
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf
deleted file mode 100644
index b56fa4d..0000000
--- a/www-servers/lighttpd/files/conf/lighttpd.conf
+++ /dev/null
@@ -1,325 +0,0 @@
-###############################################################################
-# Default lighttpd.conf for Gentoo.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.4 2009/05/12 09:54:12 bangert Exp $
-###############################################################################
-
-# {{{ variables
-var.basedir  = "/var/www/localhost"
-var.logdir   = "/var/log/lighttpd"
-var.statedir = "/var/lib/lighttpd"
-# }}}
-
-# {{{ modules
-# At the very least, mod_access and mod_accesslog should be enabled.
-# All other modules should only be loaded if necessary.
-# NOTE: the order of modules is important.
-server.modules = (
-#    "mod_rewrite",
-#    "mod_redirect",
-#    "mod_alias",
-    "mod_access",
-#    "mod_cml",
-#    "mod_trigger_b4_dl",
-#    "mod_auth",
-#    "mod_status",
-#    "mod_setenv",
-#    "mod_proxy",
-#    "mod_simple_vhost",
-#    "mod_evhost",
-#    "mod_userdir",
-#    "mod_compress",
-#    "mod_ssi",
-#    "mod_usertrack",
-#    "mod_expire",
-#    "mod_secdownload",
-#    "mod_rrdtool",
-#    "mod_webdav",
-    "mod_accesslog"
-)
-# }}}
-
-# {{{ includes
-include "mime-types.conf"
-# fcgi and cgi are included below 
-# }}}
-
-# {{{ server settings
-server.username      = "lighttpd"
-server.groupname     = "lighttpd"
-
-server.document-root = var.basedir + "/htdocs"
-server.pid-file      = "/var/run/lighttpd.pid"
-
-server.errorlog      = var.logdir  + "/error.log"
-# log errors to syslog instead
-#   server.errorlog-use-syslog = "enable"
-
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
-
-# server.tag           = "lighttpd"
-
-server.follow-symlink = "enable"
-
-# event handler (defaults to "poll")
-# see performance.txt
-# 
-# for >= linux-2.4
-#   server.event-handler = "linux-rtsig"
-# for >= linux-2.6
-#   server.event-handler = "linux-sysepoll"
-# for FreeBSD
-#   server.event-handler = "freebsd-kqueue"
-
-# chroot to directory (defaults to no chroot)
-# server.chroot      = "/"
-
-# bind to port (defaults to 80)
-# server.port          = 81
-
-# bind to name (defaults to all interfaces)
-# server.bind          = "grisu.home.kneschke.de"
-
-# error-handler for status 404
-# server.error-handler-404 = "/error-handler.html"
-# server.error-handler-404 = "/error-handler.php"
-
-# Format: <errorfile-prefix><status-code>.html
-# -> ..../status-404.html for 'File not found'
-# server.errorfile-prefix    = var.basedir + "/error/status-"
-
-# FAM support for caching stat() calls
-# requires that lighttpd be built with USE=fam
-#   server.stat-cache-engine = "fam"
-# }}}
-
-# {{{ mod_staticfile
-
-# which extensions should not be handled via static-file transfer
-# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc).
-static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi")
-# }}}
-
-# {{{ mod_accesslog
-accesslog.filename   = var.logdir + "/access.log"
-# }}}
-
-# {{{ mod_dirlisting
-# enable directory listings
-#   dir-listing.activate      = "enable"
-#
-# don't list hidden files/directories
-#   dir-listing.hide-dotfiles = "enable"
-#
-# use a different css for directory listings
-#   dir-listing.external-css  = "/path/to/dir-listing.css"
-#
-# list of regular expressions.  files that match any of the
-# specified regular expressions will be excluded from directory
-# listings.
-#   dir-listing.exclude = ("^\.", "~$")
-# }}}
-
-# {{{ mod_access
-# see access.txt
-
-url.access-deny = ("~", ".inc")
-# }}}
-
-# {{{ mod_userdir
-# see userdir.txt
-#
-# userdir.path = "public_html"
-# userdir.exclude-user = ("root")
-# }}}
-
-# {{{ mod_ssi
-# see ssi.txt
-#
-# ssi.extension = (".shtml")
-# }}}
-
-# {{{ mod_ssl
-# see ssl.txt
-#
-# ssl.engine    = "enable"
-# ssl.pemfile   = "server.pem"
-# }}}
-
-# {{{ mod_status
-# see status.txt
-#
-# status.status-url  = "/server-status"
-# status.config-url  = "/server-config"
-# }}}
-
-# {{{ mod_simple_vhost
-# see simple-vhost.txt
-#
-#  If you want name-based virtual hosting add the next three settings and load
-#  mod_simple_vhost
-#
-# document-root =
-#   virtual-server-root + virtual-server-default-host + virtual-server-docroot
-# or
-#   virtual-server-root + http-host + virtual-server-docroot
-#
-# simple-vhost.server-root   = "/home/weigon/wwwroot/servers/"
-# simple-vhost.default-host  = "grisu.home.kneschke.de"
-# simple-vhost.document-root = "/pages/"
-# }}}
-
-# {{{ mod_compress
-# see compress.txt
-#
-# compress.cache-dir   = var.statedir + "/cache/compress"
-# compress.filetype    = ("text/plain", "text/html")
-# }}}
-
-# {{{ mod_proxy
-# see proxy.txt
-#
-# proxy.server               = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "host" => "192.168.0.101",
-#                                   "port" => 80
-#                                 )
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_auth
-# see authentication.txt
-#
-# auth.backend               = "plain"
-# auth.backend.plain.userfile = "lighttpd.user"
-# auth.backend.plain.groupfile = "lighttpd.group"
-
-# auth.backend.ldap.hostname = "localhost"
-# auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-# auth.backend.ldap.filter   = "(uid=$)"
-
-# auth.require               = ( "/server-status" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "user=jan"
-#                               ),
-#                               "/server-info" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "valid-user"
-#                               )
-#                             )
-# }}}
-
-# {{{ mod_rewrite
-# see rewrite.txt
-#
-# url.rewrite = (
-#	"^/$"		=>		"/server-status"
-# )
-# }}}
-
-# {{{ mod_redirect
-# see redirect.txt
-#
-# url.redirect = (
-#	"^/wishlist/(.+)"		=>		"http://www.123.org/$1"
-# )
-# }}}
-
-# {{{ mod_evhost
-# define a pattern for the host url finding
-# %% => % sign
-# %0 => domain name + tld
-# %1 => tld
-# %2 => domain name without tld
-# %3 => subdomain 1 name
-# %4 => subdomain 2 name
-#
-# evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
-# }}}
-
-# {{{ mod_expire
-# expire.url = (
-#	"/buggy/"		=>		"access 2 hours",
-#	"/asdhas/"		=>		"access plus 1 seconds 2 minutes"
-# )
-# }}}
-
-# {{{ mod_rrdtool
-# see rrdtool.txt
-#
-# rrdtool.binary  = "/usr/bin/rrdtool"
-# rrdtool.db-name = var.statedir + "/lighttpd.rrd"
-# }}}
-
-# {{{ mod_setenv
-# see setenv.txt
-#
-# setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
-# setenv.add-response-header = ( "X-Secret-Message" => "42" )
-# }}}
-
-# {{{ mod_trigger_b4_dl
-# see trigger_b4_dl.txt
-#
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
-# }}}
-
-# {{{ mod_cml
-# see cml.txt
-#
-# don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-# }}} 
-
-# {{{ mod_webdav
-# see webdav.txt
-#
-# $HTTP["url"] =~ "^/dav($|/)" {
-#     webdav.activate = "enable"
-#     webdav.is-readonly = "enable"
-# }
-# }}}
-
-# {{{ extra rules
-#
-# set Content-Encoding and reset Content-Type for browsers that
-# support decompressing on-thy-fly (requires mod_setenv)
-# $HTTP["url"] =~ "\.gz$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-gzip")
-#     mimetype.assign = (".gz" => "text/plain")
-# }
-
-# $HTTP["url"] =~ "\.bz2$" {
-#     setenv.add-response-header = ("Content-Encoding" => "x-bzip2")
-#     mimetype.assign = (".bz2" => "text/plain")
-# }
-#
-# }}}
-
-# {{{ debug
-# debug.log-request-header   = "enable"
-# debug.log-response-header  = "enable"
-# debug.log-request-handling = "enable"
-# debug.log-file-not-found   = "enable"
-# }}}
-
-# {{{ cgi includes
-# uncomment for cgi support
-#   include "mod_cgi.conf"
-# uncomment for php/fastcgi support
-#   include "mod_fastcgi.conf"
-# }}}
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/conf/mime-types.conf b/www-servers/lighttpd/files/conf/mime-types.conf
deleted file mode 100644
index f24d4d8..0000000
--- a/www-servers/lighttpd/files/conf/mime-types.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# Default mime-types.conf for Gentoo.
-# include'd from lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $
-###############################################################################
-
-# {{{ mime types
-mimetype.assign             = (
-  ".svg"          =>      "image/svg+xml",
-  ".svgz"         =>      "image/svg+xml",
-  ".pdf"          =>      "application/pdf",
-  ".sig"          =>      "application/pgp-signature",
-  ".spl"          =>      "application/futuresplash",
-  ".class"        =>      "application/octet-stream",
-  ".ps"           =>      "application/postscript",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".dvi"          =>      "application/x-dvi",
-  ".gz"           =>      "application/x-gzip",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".zip"          =>      "application/zip",
-  ".dmg"          =>      "application/x-apple-diskimage",
-  ".mp3"          =>      "audio/mpeg",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".ogg"          =>      "application/ogg",
-  ".wav"          =>      "audio/x-wav",
-  ".gif"          =>      "image/gif",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".css"          =>      "text/css",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".h"            =>      "text/plain",
-  ".cc"           =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".hh"           =>      "text/plain",
-  ".hpp"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".diff"         =>      "text/plain",
-  ".patch"        =>      "text/plain",
-  ".ebuild"       =>      "text/plain",
-  ".eclass"       =>      "text/plain",
-  ".rtf"          =>      "application/rtf",
-  ".bmp"          =>      "image/bmp",
-  ".tif"          =>      "image/tiff",
-  ".tiff"         =>      "image/tiff",
-  ".ico"          =>      "image/x-icon",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar"
- )
-# }}}
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/conf/mod_cgi.conf b/www-servers/lighttpd/files/conf/mod_cgi.conf
deleted file mode 100644
index 1cb3770..0000000
--- a/www-servers/lighttpd/files/conf/mod_cgi.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# mod_cgi.conf
-# include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_cgi.conf,v 1.1 2005/08/27 12:36:13 ka0ttic Exp $
-###############################################################################
-
-#
-# see cgi.txt for more information on using mod_cgi
-#
-
-server.modules += ("mod_cgi")
-
-# NOTE: this requires mod_alias
-alias.url = (
-     "/cgi-bin/"	    =>	    var.basedir + "/cgi-bin/"
-)
-
-#
-# Note that you'll also want to enable the
-# cgi-bin alias via mod_alias (above).
-#
-
-$HTTP["url"] =~ "^/cgi-bin/" {
-    # disable directory listings
-    dir-listing.activate = "disable"
-    # only allow cgi's in this directory
-    cgi.assign = (
-		".pl"	=>	"/usr/bin/perl",
-		".cgi"	=>	"/usr/bin/perl"
-	)
-}
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
deleted file mode 100644
index b70aff1..0000000
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# mod_fastcgi.conf
-# include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.3 2009/04/03 20:59:34 bangert Exp $
-###############################################################################
-
-server.modules += ("mod_fastcgi")
-fastcgi.server = ( ".php" =>
-		            ( "localhost" =>
-			            (
-				            "socket"		=>		"/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
-				            "bin-path"	=>		"/usr/bin/php-cgi"
-			            )
-		            )
-	            )
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2 b/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
deleted file mode 100644
index ca1369a..0000000
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# mod_fastcgi.conf
-# include'd by lighttpd.conf.
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf-1.4.13-r2,v 1.1 2007/04/01 23:22:00 robbat2 Exp $
-###############################################################################
-
-server.modules += ("mod_fastcgi")
-fastcgi.server = ( ".php" =>
-		            ( "localhost" =>
-			            (
-				            "socket"		=>		"/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
-				            "bin-path"	=>		"/usr/bin/php-cgi"
-			            )
-		            )
-	            )
-
-# vim: set ft=conf foldmethod=marker et :
diff --git a/www-servers/lighttpd/files/lighttpd.confd b/www-servers/lighttpd/files/lighttpd.confd
deleted file mode 100644
index 70d4170..0000000
--- a/www-servers/lighttpd/files/lighttpd.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/lighttpd
-
-# Location of a shell used by the 'include_shell' directive
-# in the lighttpd's configuration file
-#export SHELL="/bin/bash"
-
-# Location of the lighttpd configuration file
-LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
-
-# Location of the lighttpd pid file
-LIGHTTPD_PID="/var/run/lighttpd.pid"
-
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
deleted file mode 100644
index 71c72ba..0000000
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.13 2009/04/03 20:59:34 bangert Exp $
-
-opts="reload graceful"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap slapd netmount dns
-	after famd
-	after sshd
-}
-
-checkconfig() {
-	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
-		ewarn "${LIGHTTPD_CONF} does not exist."
-		return 1
-	fi
-
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
-		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
-	eend $?
-}
-
-stop() {
-	local rv=0
-	ebegin "Stopping lighttpd"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
-	eend $?
-}
-
-reload() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal HUP
-	eend $?
-}
-
-graceful() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal INT
-	if eend $? ; then
-		rm -f "${LIGHTTPD_PID}"
-		start
-	fi
-}
diff --git a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3
deleted file mode 100644
index 56c25d8..0000000
--- a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3,v 1.3 2009/04/01 19:03:46 bangert Exp $
-
-opts="reload graceful"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap slapd netmount dns
-	after famd
-	after sshd
-}
-
-checkconfig() {
-	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
-		ewarn "${LIGHTTPD_CONF} does not exist."
-		return 1
-	fi
-
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \
-		--pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}"
-	eend $?
-}
-
-stop() {
-	local rv=0
-	ebegin "Stopping lighttpd"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
-	eend $?
-}
-
-reload() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal HUP
-	eend $?
-}
-
-graceful() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal INT
-	if eend $? ; then
-		rm -f "${LIGHTTPD_PID}"
-		start
-	fi
-}
diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate
deleted file mode 100644
index 76f0ef3..0000000
--- a/www-servers/lighttpd/files/lighttpd.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate,v 1.2 2006/05/30 19:49:29 bangert Exp $
-# lighttpd logrotate script for Gentoo
-
-/var/log/lighttpd/*.log {
-        daily
-        missingok
-		copytruncate
-        rotate 7
-        compress
-        notifempty
-        sharedscripts
-        postrotate
-           if [ -f /var/run/lighttpd.pid ]; then \
-                /etc/init.d/lighttpd reload > /dev/null 2>&1 || true ; \
-           fi;
-        endscript
-}
diff --git a/www-servers/lighttpd/files/spawn-fcgi.confd b/www-servers/lighttpd/files/spawn-fcgi.confd
deleted file mode 100644
index 2a88806..0000000
--- a/www-servers/lighttpd/files/spawn-fcgi.confd
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/spawn-fcgi.confd,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
-
-# Configuration file for the FCGI-Part of /etc/init.d/lighttpd
-
-## Set this to "yes" to enable SPAWNFCGI
-ENABLE_SPAWNFCGI="yes"
-
-## ABSOLUTE path to the spawn-fcgi binary
-SPAWNFCGI="/usr/bin/spawn-fcgi"
-
-## ABSOLUTE path to the PHP binary
-FCGIPROGRAM="/usr/bin/php-cgi"
-
-## bind to tcp-port on localhost
-FCGIPORT="1026"
-
-## number of PHP childs to spawn
-PHP_FCGI_CHILDREN=5
-
-## number of request server by a single php-process until is will be restarted
-PHP_FCGI_MAX_REQUESTS=1000
-
-## IP adresses where PHP should access server connections from
-FCGI_WEB_SERVER_ADDRS="127.0.0.1"
-
-# allowed environment variables sperated by spaces
-ALLOWED_ENV="PATH USER"
-# do NOT change line below
-ALLOWED_ENV="$ALLOWED_ENV PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS"
-
-## if this script is run as root switch to the following user
-USERID=lighttpd
-GROUPID=lighttpd
diff --git a/www-servers/lighttpd/files/spawn-fcgi.initd b/www-servers/lighttpd/files/spawn-fcgi.initd
deleted file mode 100644
index 63daa75..0000000
--- a/www-servers/lighttpd/files/spawn-fcgi.initd
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/spawn-fcgi.initd,v 1.2 2007/04/02 12:46:08 uberlord Exp $
-
-SPAWNFCGI_PID="/var/run/spawn-fcgi.pid"
-
-depend() {
-        need net
-}
-
-start() {
-        local my_end
-
-        ebegin "Starting spawn-fcgi"
-        export PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS
-
-        EX="${SPAWNFCGI} -p ${FCGIPORT} -f ${FCGIPROGRAM} -u ${USERID} \
-                -g ${GROUPID} -C ${PHP_FCGI_CHILDREN}"
-
-        # copy the allowed environment variables
-        unset E
-        for i in ${ALLOWED_ENV}; do
-                E="${E} ${i}=${!i}"
-        done
-
-        # clean environment and set up a new one
-        env - ${E} ${EX} 2>${SPAWNFCGI_PID}
-        my_end=$?
-        if [ "$my_end" != "0" ]; then
-                [ -f ${SPAWNFCGI_PID} ] && rm -f ${SPAWNFCGI_PID}
-                eend $my_end
-        fi
-
-        #extract parent-process-id and write it back to the file
-        FCGI_PPID=`cat ${SPAWNFCGI_PID} | cut -d':' -f4`
-        echo ${FCGI_PPID} > ${SPAWNFCGI_PID}
-        eend 0
-}
-
-stop() {
-        ebegin "Stopping spawn-fcgi"
-        if ! kill `cat ${SPAWNFCGI_PID}` ; then
-	    eend $?
-	    return 1
-	fi
-        if [ -w ${SPAWNFCGI_PID} ]; then
-                rm ${SPAWNFCGI_PID}
-        fi
-        eend 0
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild
deleted file mode 100644
index 14df7db..0000000
--- a/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild,v 1.3 2010/04/07 17:58:01 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND="
-	>=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( virtual/httpd-php )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_prepare() {
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-
-	epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
-	epatch "${FILESDIR}/1.4.25-fix-multiple-ssl.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fastcgi; then
-		ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
-		ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
-		ewarn "you use spawn-fcgi."
-		ewarn "It features a new, more featurefull init script - please migrate"
-		ewarn "your configuration!"
-	fi
-}
author	René 'Necoro' Neumann <necoro@necoro.net>	2011-01-26 18:47:19 +0100
committer	René 'Necoro' Neumann <necoro@necoro.net>	2011-01-26 18:47:19 +0100
commit	79d4ffcc26fa209d92993233ef2382aaf786384d (patch)
tree	c1139a8d3f25c7a44d2db486ce7f624852b69e86
parent	364e853a524cfd4f8464e5349a53d1b04a67b469 (diff)
download	overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.tar.gz overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.tar.bz2 overlay-79d4ffcc26fa209d92993233ef2382aaf786384d.zip