Recover state of old repository before corruption.

Version bump bsnes-0.059_p2
Add pidgin-omegle-scm
Remove all Manifests
Remove ebuilds that made it into sunrise
Fix dependencies in keynav

27 files changed, 71 insertions, 561 deletions

diff --git a/dev-games/snesfilter/Manifest b/dev-games/snesfilter/Manifest
deleted file mode 100644
index f691520..0000000
--- a/dev-games/snesfilter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX snesfilter-0.007_gentoo.patch 1048 RMD160 a42f9d2ac8396329ec9b59107fb57f816932567b SHA1 687bfcf3f9f9912a26247414c44ca398f8ef9277 SHA256 d1830164351f76b7384ea08203c116f9d95312527beded2b3c2e2760363779a3
-EBUILD snesfilter-0.007.ebuild 718 RMD160 74f3d7ecaf09850da86446ac7efb59d3897375bc SHA1 8e357e05d743d84ddbdfbafa9719c995dee8001a SHA256 28a8b2d6431acfe22379019404820fc193a63270a385cae1b20d71e8f9c6c223
-DIST snesfilter_v007.tar.bz2 49103 RMD160 330c0476557674c254a391c8a5661ac514336138 SHA1 4cdca3f9ffb86bd8b37fa38a197cc073506a210a SHA256 a7f7896749bc8457d76da8560a8f3b4263d9b2a3bacf6f747df1840d46ebcd3c
diff --git a/dev-games/snesfilter/files/snesfilter-0.007_gentoo.patch b/dev-games/snesfilter/files/snesfilter-0.007_gentoo.patch
deleted file mode 100644
index 9f98d80..0000000
--- a/dev-games/snesfilter/files/snesfilter-0.007_gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2009-12-08 02:46:28.000000000 -0500
-+++ b/Makefile	2010-01-01 22:12:33.764566566 -0500
-@@ -2,9 +2,11 @@
- include nall/Makefile-qt
- 
- c     := $(compiler)
--cpp   := $(subst cc,++,$(compiler))
--flags := -O3 -I. -fomit-frame-pointer $(qtinc)
--link  :=
-+cpp   ?= $(subst cc,++,$(compiler))
-+ar    ?= ar
-+flags := $(CXXFLAGS) -I. $(qtinc)
-+cflags := $(CFLAGS) -I. $(qtinc)
-+link  := $(LDFLAGS)
- 
- ifeq ($(platform),osx)
-   flags := -fPIC $(flags)
-@@ -18,7 +20,7 @@
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(c) $(flags) $1 -c $< -o $@, \
-+      $(c) $(cflags) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
-         $(cpp) $(flags) $1 -c $< -o $@ \
-       ) \
-@@ -54,7 +56,7 @@
- 	ar rcs libsnesfilter.a $(objects)
- 	$(cpp) $(link) -o libsnesfilter.dylib -shared -dynamiclib $(objects) $(qtlib)
- else
--	ar rcs libsnesfilter.a $(objects)
-+	$(ar) rcs libsnesfilter.a $(objects)
- 	$(cpp) $(link) -o libsnesfilter.so -shared -Wl,-soname,libsnesfilter.so.1 $(objects) $(qtlib)
- endif
- 
diff --git a/dev-games/snesfilter/snesfilter-0.007.ebuild b/dev-games/snesfilter/snesfilter-0.007.ebuild
deleted file mode 100644
index 0121d87..0000000
--- a/dev-games/snesfilter/snesfilter-0.007.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A bsnes helper library which provides image filters"
-HOMEPAGE="http://byuu.org/bsnes/"
-MY_PV="${PV/0./}"
-SRC_URI="http://byuu.org/files/${PN}_v${MY_PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/qt-gui-4.4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-}
-
-src_compile() {
-	emake platform=x compiler="$(tc-getCC)" cpp="$(tc-getCXX)" ar="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	dolib libsnesfilter.* || die "install failed"
-}
diff --git a/dev-games/snesreader/Manifest b/dev-games/snesreader/Manifest
deleted file mode 100644
index 655f05c..0000000
--- a/dev-games/snesreader/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX snesreader-0.010_gentoo.patch 1035 RMD160 8233f50456cfc57461e31606f801d9c7fea47c1e SHA1 3ce22d7baba940715ad06cf57689ba75da54cd93 SHA256 68280796e007039d118782fe824e643bbb261b7a5e1443c155ff3befe4a5e5bc
-EBUILD snesreader-0.010.ebuild 723 RMD160 2d0f60501087e8c789f266f2c721fd0a0ed7dcb9 SHA1 a62be18ebf48c28c0dac28e2696bda4a9293031e SHA256 049812f5431523ff10548efb8822a43f0614c5378ca0fe285bb478d220dc759d
-DIST snesreader_v010.tar.bz2 208397 RMD160 d85f74c3cc7beda60ad9d8aa1f90d3dd9f978273 SHA1 df500e6015ca357c1bec25025cc25cc02f2a888f SHA256 7aa31584487e00e376b49df069694f4f542260c94bf0f4179806c50ab1a8bb11
diff --git a/dev-games/snesreader/files/snesreader-0.010_gentoo.patch b/dev-games/snesreader/files/snesreader-0.010_gentoo.patch
deleted file mode 100644
index 43b846e..0000000
--- a/dev-games/snesreader/files/snesreader-0.010_gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2009-12-08 02:46:17.000000000 -0500
-+++ b/Makefile	2010-01-01 21:58:00.934621740 -0500
-@@ -2,9 +2,11 @@
- include nall/Makefile-qt
- 
- c     := $(compiler)
--cpp   := $(subst cc,++,$(compiler))
--flags := -O3 -I. -fomit-frame-pointer
--link  :=
-+cpp   ?= $(subst cc,++,$(compiler))
-+flags := $(CXXFLAGS) -fPIC -I.
-+cflags := $(CFLAGS) -fPIC -I.
-+link  := $(LDFLAGS)
-+ar    ?= ar
- 
- ifeq ($(platform),osx)
-   flags := -fPIC $(flags)
-@@ -31,7 +33,7 @@
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(c) $(flags) $1 -c $< -o $@, \
-+      $(c) $(cflags) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
-         $(cpp) $(flags) $1 -c $< -o $@ \
-       ) \
-@@ -156,7 +158,7 @@
- 	ar rcs libsnesreader.a $(objects)
- 	$(cpp) $(link) -o libsnesreader.dylib -shared -dynamiclib $(objects) $(qtlib)
- else
--	ar rcs libsnesreader.a $(objects)
-+	$(ar) rcs libsnesreader.a $(objects)
- 	$(cpp) $(link) -o libsnesreader.so -shared -Wl,-soname,libsnesreader.so.1 $(objects) $(qtlib)
- endif
- 
diff --git a/dev-games/snesreader/snesreader-0.010.ebuild b/dev-games/snesreader/snesreader-0.010.ebuild
deleted file mode 100644
index 1c6f815..0000000
--- a/dev-games/snesreader/snesreader-0.010.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A bsnes helper library needed for extra rom load options"
-HOMEPAGE="http://byuu.org/bsnes/"
-MY_PV="${PV/0./}"
-SRC_URI="http://byuu.org/files/${PN}_v${MY_PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/qt-gui-4.4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-}
-
-src_compile() {
-	emake platform=x compiler="$(tc-getCC)" cpp="$(tc-getCXX)" ar="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	dolib libsnesreader.* || die "install failed"
-}
diff --git a/dev-games/supergameboy/Manifest b/dev-games/supergameboy/Manifest
deleted file mode 100644
index 5d16c0d..0000000
--- a/dev-games/supergameboy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX supergameboy-0.014_gentoo.patch 1179 RMD160 c1bd4be69107131a71b6e51c90ad07a588c50bbe SHA1 a7757ce257a08efb64213fac4601a9dd475a555f SHA256 fe2306f34c49d40ac8ec950d9f850d3cb9fd727c34e35d2eeb025da31c3f6a73
-EBUILD supergameboy-0.014.ebuild 680 RMD160 cfab65acc462ada595ea970a92f1ef48f5e69b35 SHA1 ce1a4fbd16e0c9cf51b438ba4f7d4336a242269a SHA256 5e4e7f31921eeacaeae6c22cc84af15dbce56543b4efd65283c0a55d3923f813
-DIST supergameboy_v014.tar.bz2 122939 RMD160 1124b437251dfc99768d560f0cc2c96304680a77 SHA1 89912df078cd2478b8fc2aa43b519aa5d14c9aae SHA256 b31d5d345ce86cfa5ef47df1e0886a0aa637565de1dc50293aa2fbecf162135a
diff --git a/dev-games/supergameboy/files/supergameboy-0.014_gentoo.patch b/dev-games/supergameboy/files/supergameboy-0.014_gentoo.patch
deleted file mode 100644
index 7d33b68..0000000
--- a/dev-games/supergameboy/files/supergameboy-0.014_gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2009-12-08 02:46:37.000000000 -0500
-+++ b/Makefile	2010-01-01 22:09:35.594592128 -0500
-@@ -1,9 +1,11 @@
- include nall/Makefile
- 
- c     := $(compiler)
--cpp   := $(subst cc,++,$(compiler))
--flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
--link  :=
-+cpp   ?= $(subst cc,++,$(compiler))
-+flags := $(CXXFLAGS) -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
-+cflags := $(CFLAGS) -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src
-+link  := $(LDFLAGS)
-+ar    ?= ar
- 
- ifeq ($(platform),osx)
-   flags := -fPIC $(flags)
-@@ -24,7 +26,7 @@
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(c) $(flags) $1 -c $< -o $@, \
-+      $(c) $(cflags) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
-         $(cpp) $(flags) $1 -c $< -o $@ \
-       ) \
-@@ -105,7 +107,7 @@
- 	ar rcs libsupergameboy.a $(objects)
- 	$(cpp) $(link) -o libsupergameboy.dylib -shared -dynamiclib $(objects) $(qtlib)
- else
--	ar rcs libsupergameboy.a $(objects)
-+	$(ar) rcs libsupergameboy.a $(objects)
- 	$(cpp) $(link) -o libsupergameboy.so -shared -Wl,-soname,libsupergameboy.so.1 $(objects) $(qtlib)
- endif
- 
diff --git a/dev-games/supergameboy/supergameboy-0.014.ebuild b/dev-games/supergameboy/supergameboy-0.014.ebuild
deleted file mode 100644
index 817630f..0000000
--- a/dev-games/supergameboy/supergameboy-0.014.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A bsnes helper library for Super Gameboy emulation"
-HOMEPAGE="http://byuu.org/bsnes/"
-MY_PV="${PV/0./}"
-SRC_URI="http://byuu.org/files/${PN}_v${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-}
-
-src_compile() {
-	emake platform=x compiler="$(tc-getCC)" cpp="$(tc-getCXX)" ar="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	dolib libsupergameboy.* || die "install failed"
-}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
deleted file mode 100644
index fac559b..0000000
--- a/dev-util/idea-community/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD idea-community-9.0.ebuild 948 RMD160 3d5dc560c384c3cc01d2f917076cca1a4105cddd SHA1 65092741034ab2154c0279ee4fbee8ef9dc99ddd SHA256 3f0adda6e2d1532a57710b6bd6200a441a5577f6fea36f03d23f67956dd28f0e
-DIST ideaIC-9.0.tar.gz 68240696 RMD160 f93ff16af7b0732fce918b9b39b550d6b5484a96 SHA1 a95bf688ade2b1d30b26c696bf898f41abdba709 SHA256 b51c4f8b6624f80605717158cf7b4ea07722947868c9965dcd8f21b19c35ba9a
diff --git a/games-emulation/bsnes/Manifest b/games-emulation/bsnes/Manifest
deleted file mode 100644
index bfbe30c..0000000
--- a/games-emulation/bsnes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD bsnes-0.058.ebuild 1974 RMD160 e801048ed304b0fb81506f7c9165bc2d88d28648 SHA1 527a211eb956be0e9170225c56603494187c0d1a SHA256 98c6f4217753fe69e37821fd1010632d831cf7e0a79e6df385763f28f8616c88
-AUX bsnes-0.058_gentoo.patch 930 RMD160 66bf30b179accdf842294369db290eeb1d973aee SHA1 551d35a75a7e59941fb7569385c04fd1cd193249 SHA256 78fff536958fd2ae40724dad107cfe1c3dc04af062179b4bb2eb071add0b7d6e
-DIST bsnes_v058.tar.bz2 450201 RMD160 40eac219f7b298356088b14aadbc46e412c9b1b5 SHA1 366826f188d66165aa3965da21ea4ce74ca9072f SHA256 448ec9170628deca66bf3b9260441489418f695f13f2e78b184bed100c11c93e
diff --git a/games-emulation/bsnes/bsnes-0.058.ebuild b/games-emulation/bsnes/bsnes-0.059_p2.ebuild
index 0df0d7c..35cd063 100644
--- a/games-emulation/bsnes/bsnes-0.058.ebuild
+++ b/games-emulation/bsnes/bsnes-0.059_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,28 +9,30 @@ inherit eutils confutils games toolchain-funcs
 DESCRIPTION="A Super Famicom/SNES emulator written with absolute accuracy in mind"
 HOMEPAGE="http://byuu.org/bsnes/"
 MY_PV="${PV/0./}"
-SRC_URI="http://byuu.org/files/${PN}_v${MY_PV}.tar.bz2"
+MY_PV="${MY_PV/_p/r0}"
+SRC_URI="http://bsnes.googlecode.com/files/${PN}_v${MY_PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ao alsa debug openal opengl oss pulseaudio sdl sgb snesfilter +snesreader xv"
 
-DEPEND="ao? ( media-libs/libao )
+RDEPEND="ao? ( media-libs/libao )
 	openal? ( media-libs/openal )
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )
 	xv? ( x11-libs/libXv )
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl[joystick] )
-	snesfilter? ( >=dev-games/snesfilter-0.006 )
+	snesfilter? ( !dev-games/snesfilter )
 	>=x11-libs/qt-gui-4.4
-	snesreader? ( >=dev-games/snesreader-0.010 )
-	sgb? ( >=dev-games/supergameboy-0.014 )
+	snesreader? ( !dev-games/snesreader )
+	sgb? ( !dev-games/supergameboy )
 	x11-libs/libX11
 	x11-libs/libXext"
 
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	app-arch/unzip"
 
 S=${WORKDIR}/src
 
@@ -38,13 +40,27 @@ disable_module() {
 	sed -i Makefile -e "s|$1||"
 }
 
+build_plugin() {
+	einfo "Building $1..."
+	cd "${WORKDIR}/$1"
+	sed -e "s/-O3/${CXXFLAGS}/" \
+	    -i Makefile \
+	    || die "sed failed"
+
+	emake platform=x compiler=gcc || die "emake $1 failed"
+}
+
+install_plugin() {
+	dolib "${WORKDIR}/$1/lib$1.so" || die "dolib failed"
+}
+
 pkg_setup() {
 	confutils_require_any ao openal alsa pulseaudio oss
 	confutils_require_any xv opengl sdl
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}_gentoo.patch
+	epatch "${FILESDIR}"/${PN}-0.58_gentoo.patch
 
 	if use debug
 	then
@@ -59,6 +75,7 @@ src_compile() {
 	use ao || disable_module audio.ao
 	use openal || disable_module audio.openal
 	use pulseaudio || disable_module audio.pulseaudio
+	use pulseaudio || disable_module audio.pulseaudiosimple
 	use oss || disable_module audio.oss
 	use alsa || disable_module audio.alsa
 
@@ -71,12 +88,23 @@ src_compile() {
 	use sdl || disable_module input.sdl
 
 	emake platform=x compiler="$(tc-getCC)" cpp="$(tc-getCXX)" || die "emake failed"
+
+	# build bundled plugins
+	use snesfilter && build_plugin snesfilter
+	use snesreader && build_plugin snesreader
+	use sgb && build_plugin supergameboy
 }
 
 src_install() {
 	dogamesbin ../${PN} || die "failed bin"
 	doicon data/${PN}.png || die "failed icon"
+	#dodoc ../*.txt || die "failed docs"
 	make_desktop_entry ${PN}
 
+	# install plugins
+	use snesfilter && install_plugin snesfilter
+	use snesreader && install_plugin snesreader
+	use sgb && install_plugin supergameboy
+
 	prepgamesdirs
 }
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
deleted file mode 100644
index deb7fed..0000000
--- a/media-sound/abcmidi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD abcmidi-2009.12.21.ebuild 798 RMD160 fd29b9296090c5262ba0de3aa554982cc5369146 SHA1 50231a8eb3e3c2c2455e5af2ba7761cb73d2aafc SHA256 02d4d5119b3f2ae914b8100203266c4abcdaeba98cd2ede63309356a8147ba59
-AUX abcmidi-2009.12.21_gentoo.patch 3295 RMD160 8b95f4397d5b274d0639141e6529b8a44e4d703a SHA1 f48b5a8946ddece4a4589008056581bc0c645938 SHA256 36f1dd35ae7c5aa2f0ee3efba9fee5d917c27472009ee6be099bca44ab093dfb
-DIST abcMIDI-2009-12-21.zip 383764 RMD160 a3a8f4d388853bf65a54fe18816bb9221b6f6e04 SHA1 32da6f8ec8dfc05feaf87fca413a712bb05ee60c SHA256 ea954d6e4b83e36b3a45adbf183213dd81f01eb7828e636d902c0d916099da44
diff --git a/media-sound/abcmidi/abcmidi-2009.12.21.ebuild b/media-sound/abcmidi/abcmidi-2009.12.21.ebuild
deleted file mode 100644
index b226097..0000000
--- a/media-sound/abcmidi/abcmidi-2009.12.21.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PV//./-}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-${MY_PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-	rm -rf doc/programming/cvs
-}
-
-src_compile() {
-	tc-export CC
-	export LNK="$CC"
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install prefix="/usr" docdir="share/doc/${PF}" || die "Unable to install"
-	docinto programming
-	dodoc doc/programming/* *.abc || die "Unable to install documentation"
-}
diff --git a/media-sound/abcmidi/files/abcmidi-2009.12.21_gentoo.patch b/media-sound/abcmidi/files/abcmidi-2009.12.21_gentoo.patch
deleted file mode 100644
index f103c8f..0000000
--- a/media-sound/abcmidi/files/abcmidi-2009.12.21_gentoo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur a/makefile b/makefile
---- a/makefile	2008-06-07 18:04:48.000000000 -0400
-+++ b/makefile	2009-12-31 19:04:15.462990041 -0500
-@@ -31,10 +31,10 @@
- # cure the problem, change this file from using PC-style end-of-line (carriage 

- # return and line feed) to unix style end-of-line (line feed).

- 

--CC=gcc

-+CC?=gcc

- #CFLAGS=-DANSILIBS -O2 

--CFLAGS=-DANSILIBS -g 

--LNK=gcc

-+CFLAGS+=-DANSILIBS 

-+LNK?=gcc

- INSTALL=install

- 

- prefix=/usr/local

-@@ -48,26 +48,26 @@
- 

- abc2midi : parseabc.o store.o genmidi.o midifile.o queues.o parser2.o

- 	$(LNK) -o abc2midi parseabc.o store.o genmidi.o queues.o \

--	parser2.o midifile.o

-+	parser2.o midifile.o $(LDFLAGS)

- 

- abc2abc : parseabc.o toabc.o

--	$(LNK) -o abc2abc parseabc.o toabc.o

-+	$(LNK) -o abc2abc parseabc.o toabc.o $(LDFLAGS)

- 

- midi2abc : midifile.o midi2abc.o 

--	$(LNK) midifile.o midi2abc.o -o midi2abc

-+	$(LNK) midifile.o midi2abc.o -o midi2abc $(LDFLAGS)

- 

- mftext : midifile.o mftext.o crack.o

--	$(LNK) midifile.o mftext.o crack.o -o mftext

-+	$(LNK) midifile.o mftext.o crack.o -o mftext $(LDFLAGS)

- 

- yaps : parseabc.o yapstree.o drawtune.o debug.o pslib.o position.o parser2.o

- 	$(LNK) -o yaps parseabc.o yapstree.o drawtune.o debug.o \

--	position.o pslib.o parser2.o -o yaps

-+	position.o pslib.o parser2.o -o yaps $(LDFLAGS)

- 

- midicopy : midicopy.o

--	$(LNK) -o midicopy midicopy.o

-+	$(LNK) -o midicopy midicopy.o $(LDFLAGS)

- 

- abcmatch : abcmatch.o matchsup.o parseabc.o

--	$(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch

-+	$(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch $(LDFLAGS)

- 

- parseabc.o : parseabc.c abc.h parseabc.h

- 

-diff -ur a/makefiles/unix.mak b/makefiles/unix.mak
---- a/makefiles/unix.mak	2008-05-30 19:22:22.000000000 -0400
-+++ b/makefiles/unix.mak	2009-12-31 19:04:28.373020771 -0500
-@@ -31,9 +31,9 @@
- # cure the problem, change this file from using PC-style end-of-line (carriage 

- # return and line feed) to unix style end-of-line (line feed).

- 

--CC=gcc

--CFLAGS=-DANSILIBS -O2 

--LNK=gcc

-+CC?=gcc

-+CFLAGS+=-DANSILIBS 

-+LNK?=gcc

- INSTALL=install

- 

- prefix=/usr/local

-@@ -47,26 +47,26 @@
- 

- abc2midi : parseabc.o store.o genmidi.o midifile.o queues.o parser2.o

- 	$(LNK) -o abc2midi parseabc.o store.o genmidi.o queues.o \

--	parser2.o midifile.o

-+	parser2.o midifile.o $(LDFLAGS)

- 

- abc2abc : parseabc.o toabc.o

--	$(LNK) -o abc2abc parseabc.o toabc.o

-+	$(LNK) -o abc2abc parseabc.o toabc.o $(LDFLAGS)

- 

- midi2abc : midifile.o midi2abc.o 

--	$(LNK) midifile.o midi2abc.o -o midi2abc

-+	$(LNK) midifile.o midi2abc.o -o midi2abc $(LDFLAGS)

- 

- mftext : midifile.o mftext.o crack.o

--	$(LNK) midifile.o mftext.o crack.o -o mftext

-+	$(LNK) midifile.o mftext.o crack.o -o mftext $(LDFLAGS)

- 

- yaps : parseabc.o yapstree.o drawtune.o debug.o pslib.o position.o parser2.o

- 	$(LNK) -o yaps parseabc.o yapstree.o drawtune.o debug.o \

--	position.o pslib.o parser2.o -o yaps

-+	position.o pslib.o parser2.o -o yaps $(LDFLAGS)

- 

- midicopy : midicopy.o

--	$(LNK) -o midicopy midicopy.o

-+	$(LNK) -o midicopy midicopy.o $(LDFLAGS)

- 

- abcmatch : abcmatch.o matchsup.o parseabc.o

--	$(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch

-+	$(LNK) abcmatch.o matchsup.o parseabc.o -o abcmatch $(LDFLAGS)

- 

- parseabc.o : parseabc.c abc.h parseabc.h

- 

diff --git a/sys-block/compcache-tools/Manifest b/sys-block/compcache-tools/Manifest
deleted file mode 100644
index 7970e19..0000000
--- a/sys-block/compcache-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD compcache-tools-0.6.ebuild 646 RMD160 c92d90af181585c03aa58885c628d7e4726969ba SHA1 b47d950744850a2157a7308b4194274a7b862620 SHA256 ff884a763b9382a6dacac14fa96d4196f4de05043a283ebf4f12a391e5218693
-AUX compcache-tools-0.6_gentoo.patch 482 RMD160 cdbe4ec6250801fda0aec7ec57df6985221ec2eb SHA1 2449d1d0c9bd588521681c19f5a191c3bc521315 SHA256 790a860f39d77a0a6b81f4f343c780cb3f685c1ad5721cd8c2a94e8313187a6d
-DIST compcache-0.6.tar.gz 33881 RMD160 3305a428247d7e187a43fba84104ff0ca8ff2daf SHA1 4e9bada83a32654bcb18a8dc5830a13c43848547 SHA256 e5f697be6c1b7bfb9ac9ba5b8d836ff20f880c161f998c482caba83caf443c0c
diff --git a/sys-block/compcache-tools/compcache-tools-0.6.ebuild b/sys-block/compcache-tools/compcache-tools-0.6.ebuild
deleted file mode 100644
index 98e0703..0000000
--- a/sys-block/compcache-tools/compcache-tools-0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/-tools/}"
-DESCRIPTION="Compressed in-memory swap device for Linux"
-HOMEPAGE="http://code.google.com/p/compcache/"
-SRC_URI="http://compcache.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/sub-projects/rzscontrol"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	dobin rzscontrol || die
-	doman man/rzscontrol.1 || die
-}
diff --git a/sys-block/compcache-tools/files/compcache-tools-0.6_gentoo.patch b/sys-block/compcache-tools/files/compcache-tools-0.6_gentoo.patch
deleted file mode 100644
index 9c454b1..0000000
--- a/sys-block/compcache-tools/files/compcache-tools-0.6_gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur a/sub-projects/rzscontrol/Makefile b/sub-projects/rzscontrol/Makefile
---- a/sub-projects/rzscontrol/Makefile	2009-08-18 20:10:04.000000000 -0400
-+++ b/sub-projects/rzscontrol/Makefile	2010-01-01 07:17:16.659296141 -0500
-@@ -1,5 +1,5 @@
- all:
--	@gcc -g -Wall -D_GNU_SOURCE rzscontrol.c -o rzscontrol -I ../include -I../..
-+	$(CC) $(CFLAGS) -Wall -D_GNU_SOURCE rzscontrol.c -o rzscontrol -I ../include -I../.. $(LDFLAGS)
- 
- doc:
- 	@xmllint --noout --valid man/rzscontrol.xml
diff --git a/x11-misc/keynav/Manifest b/x11-misc/keynav/Manifest
deleted file mode 100644
index d0cf41a..0000000
--- a/x11-misc/keynav/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD keynav-20091231.04.ebuild 806 RMD160 21a1b06d66fa6a6a72801f2bc57555a157c7e9a0 SHA1 12e269464bc65066a175ed632c9c4f7fdb914ecd SHA256 4f9dc6dae227ea560fc25675cc52f4fffedfd01ce1e8b483bef03beaa074e39d
-DIST keynav-20091231.04.tar.gz 37958 RMD160 b2103bb8b23740e07cab513f0c52d8e1fdd71955 SHA1 922d01c822796fd421d6ee8566e40349789fb448 SHA256 4ddf3587d86db3b4424f8c182c12526b05c40c3c91bb227359272e8ef94ed9a9
diff --git a/x11-misc/keynav/keynav-20091231.04.ebuild b/x11-misc/keynav/keynav-20091231.04.ebuild
index 608f808..bd00a6b 100644
--- a/x11-misc/keynav/keynav-20091231.04.ebuild
+++ b/x11-misc/keynav/keynav-20091231.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXinerama
 	x11-libs/libXext
 	x11-libs/libXtst
-	x11-misc/xdotool"
+	>=x11-misc/xdotool-20091231.02"
 DEPEND="x11-proto/xproto
 	${RDEPEND}"
 
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
deleted file mode 100644
index 632cd0d..0000000
--- a/x11-misc/xdotool/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xdotool-20091231.01_as-needed.patch 655 RMD160 71a6393f466fcafd78c5a794137bc4d164c9e79b SHA1 2943fb88f3770de9db73b026dcb0b442c2b8daf2 SHA256 bc0fe2ef8127a145d81a78d00d3c094e6331fad67fa36103f3b6b8a6c1380bc5
-AUX xdotool-20091231.01_install-D.patch 1187 RMD160 8488e4728adfe542d19968455471b9f104213de1 SHA1 fdaa02f0e308711b27567e0e411075b9491454e4 SHA256 3f7702b4949ff0c8b9d4d37a7f2b6b504e52b1488466a1791ced94195ea9c0c5
-EBUILD xdotool-20091231.01.ebuild 1053 RMD160 0850343a93370c5ddef964780468a10cb0d0431b SHA1 6faf7358c7bf9aed98142b1112305ce3dec00c73 SHA256 c6076300c2687662c8dde71ea58dbbb7fcc651f90b5b4be5c2e5ae94e0cb2675
-DIST xdotool-20091231.01.tar.gz 23913 RMD160 ac567df0b8a2b6bbb9cb9b87bbe8f735592c276d SHA1 6f0b2404b2fa477bfb28f1cf437250e0a54308b9 SHA256 d880ee63a9bbf59c6d1e269987729594fd85003ffa08cf92b7c26d8ce762e0c2
diff --git a/x11-misc/xdotool/files/xdotool-20091231.01_as-needed.patch b/x11-misc/xdotool/files/xdotool-20091231.01_as-needed.patch
deleted file mode 100644
index 4b23e54..0000000
--- a/x11-misc/xdotool/files/xdotool-20091231.01_as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a1ab3272ba6d1b3b3ce6aa16ecf6b69f9c087dea Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 12:22:59 -0500
-Subject: [PATCH] Fix building with --as-needed
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e1d755f..6fb5c04 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,7 +63,7 @@ xdo.c: xdo.h
- xdotool.c: xdo.h
- 
- libxdo.so: xdo.o
--	$(LD) $(LDFLAGS) -shared -soname=libxdo.so.$(MINOR) $< -o $@
-+	$(LD) -shared -soname=libxdo.so.$(MINOR) $< -o $@ $(LDFLAGS)
- 
- xdotool: xdotool.o xdo.o
- 	$(CC) $(CFLAGS) xdotool.o xdo.o $(LDFLAGS) -o $@
--- 
-1.6.4.4
-
diff --git a/x11-misc/xdotool/files/xdotool-20091231.01_install-D.patch b/x11-misc/xdotool/files/xdotool-20091231.01_install-D.patch
deleted file mode 100644
index 89b2c6a..0000000
--- a/x11-misc/xdotool/files/xdotool-20091231.01_install-D.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2fd48166c8481ba441c3866d189f8f0396e0d89d Mon Sep 17 00:00:00 2001
-From: Russell Harmon <russ@eatnumber1.com>
-Date: Thu, 31 Dec 2009 11:00:25 -0500
-Subject: [PATCH 1/2] Use -D when installing to create directories.
-
----
- Makefile |   10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 308a5d5..1ac0746 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,19 +29,17 @@ all: xdotool xdotool.1
- install: installlib installprog installman installheader
- 
- installprog: xdotool
--	install -m 755 xdotool $(INSTALLBIN)/
-+	install -D -m 755 xdotool $(INSTALLBIN)/xdotool
- 
- installlib: libxdo.so
--	install libxdo.so $(INSTALLLIB)/libxdo.so.$(MINOR)
-+	install -D libxdo.so $(INSTALLLIB)/libxdo.so.$(MINOR)
- 	ln -sf libxdo.so.$(MINOR) $(INSTALLLIB)/libxdo.so
- 
- installheader: xdo.h
--	install xdo.h $(INSTALLINCLUDE)/xdo.h
-+	install -D xdo.h $(INSTALLINCLUDE)/xdo.h
- 
- installman: xdotool.1
--	[ -d $(INSTALLMAN) ] || mkdir $(INSTALLMAN)
--	[ -d $(INSTALLMAN)/man1 ] || mkdir $(INSTALLMAN)/man1
--	install -m 644 xdotool.1 $(INSTALLMAN)/man1/
-+	install -D -m 644 xdotool.1 $(INSTALLMAN)/man1/xdotool.1
- 
- deinstall: uninstall
- uninstall: 
--- 
-1.6.4.4
-
diff --git a/x11-misc/xdotool/xdotool-20091231.01.ebuild b/x11-misc/xdotool/xdotool-20091231.01.ebuild
deleted file mode 100644
index cae5bd2..0000000
--- a/x11-misc/xdotool/xdotool-20091231.01.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/xdotool-20090815.ebuild,v 1.1 2009/10/21 10:17:23 joker Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows."
-HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
-SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="examples"
-
-DEPEND="x11-libs/libXtst
-	x11-libs/libX11"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_install-D.patch" \
-		"${FILESDIR}/${P}_as-needed.patch"
-}
-
-src_compile() {
-	tc-export CC LD
-	export LDFLAGS="$(raw-ldflags)"
-	default
-	emake libxdo.so || die "Unable to build libxdo.so"
-}
-
-src_install() {
-	emake PREFIX="${D}usr" INSTALLLIB="${D}usr/$(get_libdir)" install || die
-
-	dodoc CHANGELIST README
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/x11-plugins/pidgin-omegle/files/Makefile b/x11-plugins/pidgin-omegle/files/Makefile
deleted file mode 100644
index 035cf3e..0000000
--- a/x11-plugins/pidgin-omegle/files/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CC ?= gcc
-LD ?= ld
-CFLAGS += -fPIC
-
-CFLAGS += `pkg-config --cflags pidgin`
-CFLAGS += `pkg-config --cflags json-glib-1.0`
-LDFLAGS += `pkg-config --libs pidgin`
-LDFLAGS += `pkg-config --cflags json-glib-1.0`
-
-OBJECTS=libomegle.o om_connection.o
-
-.PHONY: all clean
-
-all: libomegle
-
-libomegle: $(OBJECTS)
-	$(LD) $(LDFLAGS) $(OBJECTS) -shared -soname $@.so -o $@.so
-
-.c.o:
-	$(CC) -c $(CFLAGS) $< -o $@
-
-clean:
-	$(RM) $(OBJECTS) libomegle.so
diff --git a/x11-plugins/pidgin-omegle/files/pidgin-omegle-scm_Makefile.patch b/x11-plugins/pidgin-omegle/files/pidgin-omegle-scm_Makefile.patch
new file mode 100644
index 0000000..ee66301
--- /dev/null
+++ b/x11-plugins/pidgin-omegle/files/pidgin-omegle-scm_Makefile.patch
@@ -0,0 +1,28 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 0)
++++ Makefile	(revision 0)
+@@ -0,0 +1,23 @@
++CC ?= gcc
++LD ?= ld
++CFLAGS += -fPIC
++
++CFLAGS += `pkg-config --cflags pidgin`
++CFLAGS += `pkg-config --cflags json-glib-1.0`
++LDFLAGS += `pkg-config --libs pidgin`
++LDFLAGS += `pkg-config --cflags json-glib-1.0`
++
++OBJECTS=libomegle.o om_connection.o
++
++.PHONY: all clean
++
++all: libomegle
++
++libomegle: $(OBJECTS)
++	$(LD) $(LDFLAGS) $(OBJECTS) -shared -soname $@.so -o $@.so
++
++.c.o:
++	$(CC) -c $(CFLAGS) $< -o $@
++
++clean:
++	$(RM) $(OBJECTS) libomegle.so
diff --git a/x11-plugins/pidgin-omegle/pidgin-omegle-scm.ebuild b/x11-plugins/pidgin-omegle/pidgin-omegle-scm.ebuild
index 1d9be66..4f8d282 100644
--- a/x11-plugins/pidgin-omegle/pidgin-omegle-scm.ebuild
+++ b/x11-plugins/pidgin-omegle/pidgin-omegle-scm.ebuild
@@ -22,8 +22,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	cp "${FILESDIR}"/Makefile .
+	epatch "${FILESDIR}/${P}_Makefile.patch"
+}
+
+src_compile() {
 	tc-export CC LD
+	default
 }
 
 src_install() {