diff --git a/dev-games/supertux-editor/Manifest b/dev-games/supertux-editor/Manifest
new file mode 100644
--- /dev/null
+++ b/dev-games/supertux-editor/Manifest
@@ -0,0 +1,2 @@
+EBUILD supertux-editor-9999.ebuild 756 RMD160 adfef07d4e4296da9d0426e2d1b6095c1dbf1455 SHA1 8343a5f39b664ae1a7fea595fc7d13a62f1ba55a SHA256 82ac355b1f4cb55d44a088e2a86159e8078aea15309ed0edc165e2f9640c561f
+MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/dev-games/supertux-editor/metadata.xml b/dev-games/supertux-editor/metadata.xml
new file mode 100644
--- /dev/null
+++ b/dev-games/supertux-editor/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/dev-games/supertux-editor/supertux-editor-9999.ebuild b/dev-games/supertux-editor/supertux-editor-9999.ebuild
new file mode 100644
--- /dev/null
+++ b/dev-games/supertux-editor/supertux-editor-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils mono multilib subversion
+
+DESCRIPTION="Level editor for supertux milestone 2"
+HOMEPAGE="http://supertux.lethargik.org/wiki/Editor_FAQ"
+ESVN_REPO_URI="http://supertux.lethargik.org/svn/supertux/trunk/supertux-editor"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-lang/mono
+	dev-dotnet/glade-sharp:2
+	dev-dotnet/gtk-sharp:2"
+RDEPEND="${DEPEND}
+	=media-libs/libsdl-1.2*[opengl,X]
+	media-libs/sdl-image[png]
+	virtual/glu
+	virtual/opengl"
+
+src_install()
+{
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.{config,dll,exe} || die
+
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/supertux-editor.exe"
+}
diff --git a/dev-libs/tinygettext/ChangeLog b/dev-libs/tinygettext/ChangeLog
--- a/dev-libs/tinygettext/ChangeLog
+++ b/dev-libs/tinygettext/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-libs/tinygettext
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2011; Nathan Brink <ohnobinki@gentoo.org>
+  +tinygettext-0.1_pre20110220.ebuild:
+  Add tinygettext-0.1_pre20110220, which can have unstable keywords unlike
+  the SVN ebuild.
+
   15 Sep 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> tinygettext-9999.ebuild, metadata.xml:
   Fixed metadata.xml and use of cmake-utils eclass.
diff --git a/dev-libs/tinygettext/Manifest b/dev-libs/tinygettext/Manifest
--- a/dev-libs/tinygettext/Manifest
+++ b/dev-libs/tinygettext/Manifest
@@ -1,13 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+DIST tinygettext-0.1_pre20110220.tar.bz2 35984 RMD160 c3b44ce9cb49cbdc8ba92eae89e81d2a7549cf09 SHA1 2bd3b80833b603fecb3f64bbcd8250874fb42173 SHA256 8a09cf4f60b36ad0f4bdd1c19ab0b0ff750418019262958c2cb29403d4475433
+EBUILD tinygettext-0.1_pre20110220.ebuild 491 RMD160 733ed805c9ee1433c4a251eadb18a57118010652 SHA1 cac91e7b540a2b1d455fc2b37cdc8fa0a0ac5239 SHA256 e383f685fedda35825c0142f5535ba47af18b0bdff1eaee63e93fd03aed7b993
 EBUILD tinygettext-9999.ebuild 525 RMD160 4ecad4a1d882a08e97aa9c4256799875972ef942 SHA1 87cb9220562da29b00babd1ac3a17168603e4830 SHA256 ad062cb594f024b2508ef5e9596a7a3f100ab294bc9fb3ef476dcd5a30866134
-MISC ChangeLog 471 RMD160 b4def04b19df32957d1e239a58fe5b67595772e4 SHA1 f55e5f2a08943ccfc174bd44ec511d4dc7f8cc3a SHA256 80b278f1cf1cde27093fe7959f924aa21dff6da97f9395c868cb8f2979c2ce67
+MISC ChangeLog 655 RMD160 b94139875d4528708ac81f8a29196ddd17a1c524 SHA1 cce2e8d94deaa84a2038aadbb175fc53aacad206 SHA256 460e27018c4675a5b7e8520573f18a8dd654b946f33a9b49d34be9e5d87dd4c1
 MISC metadata.xml 218 RMD160 0325320469a495bd5ebc0027a3cb795f0e2dc3f0 SHA1 73201ca4e86313a75325786ec88fdcd7d90628bb SHA256 c2becfc3260a1b57a64c3de67159aee663b596fbb18448656d1deddabe18b668
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkyQWnsACgkQni8M22OVw8DQzACgmU0xUaiQNGY3eu70vlDiGdzJ
-6IgAnRkxIQ58ner7SvResrU5fo8Wzxwn
-=Lw8W
------END PGP SIGNATURE-----
diff --git a/dev-libs/tinygettext/tinygettext-0.1_pre20110220.ebuild b/dev-libs/tinygettext/tinygettext-0.1_pre20110220.ebuild
new file mode 100644
--- /dev/null
+++ b/dev-libs/tinygettext/tinygettext-0.1_pre20110220.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Simple gettext replacement by SuperTux devs"
+HOMEPAGE="http://tinygettext.googlecode.com/"
+SRC_URI="ftp://ohnopub.net/mirror/${P}.tar.bz2
+	http://protofusion.org/mirror/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DWERROR=OFF
+	)
+
+	cmake-utils_src_configure
+}