diff --git a/media-libs/libvorbis/libvorbis-1.2.3.recipe b/media-libs/libvorbis/libvorbis-1.2.3.recipe
deleted file mode 100644
index 17e3e87eb..000000000
--- a/media-libs/libvorbis/libvorbis-1.2.3.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="libvorbis" 
-HOMEPAGE="http://www.xiph.org" 
-SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz"
-CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/pkgconfig >= 0.23"
-BUILD()
-{
-	cd libvorbis-1.2.3
-	libtoolize --force --copy --install
-	mkdir -p m4
-	aclocal --install -I m4
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libvorbis-1.2.3
-	make install
-}
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1994-2010 Xiph.Org Foundation"
diff --git a/media-libs/libvorbis/libvorbis-1.3.1.recipe b/media-libs/libvorbis/libvorbis-1.3.1.recipe
deleted file mode 100644
index 1fb63be62..000000000
--- a/media-libs/libvorbis/libvorbis-1.3.1.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="libvorbis" 
-HOMEPAGE="http://www.xiph.org" 
-SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.gz"
-CHECKSUM_MD5="016e523fac70bdd786258a9d15fd36e9"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/pkgconfig >= 0.23
-	media-libs/libogg >= 1.2.0"
-BUILD()
-{
-	cd libvorbis-1.3.1
-	libtoolize --force --copy --install
-	mkdir -p m4
-	aclocal --install -I m4
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libvorbis-1.3.1
-	make install
-}
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1994-2010 Xiph.Org Foundation"
diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch b/media-libs/libvorbis/patches/libvorbis-1.2.0.patch
deleted file mode 100644
index bbec77239..000000000
--- a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN libvorbis-1.2.0/aclocal.m4 libvorbis-1.2.0-haiku/aclocal.m4
---- libvorbis-1.2.0/aclocal.m4	2007-07-25 16:46:33.000000000 +0000
-+++ libvorbis-1.2.0-haiku/aclocal.m4	2008-07-14 09:15:18.000000000 +0000
-@@ -1291,7 +1291,7 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
- 
--beos*)
-+beos* | haiku*)
-   library_names_spec='${libname}${shared_ext}'
-   dynamic_linker="$host_os ld.so"
-   shlibpath_var=LIBRARY_PATH
-@@ -2276,7 +2276,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--beos*)
-+beos* | haiku*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -2492,7 +2492,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -4825,7 +4825,7 @@
-       # like `-m68040'.
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-       ;;
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
-     mingw* | os2* | pw32*)
-@@ -5098,7 +5098,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-       ;;
- 
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+    beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
- 
diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch b/media-libs/libvorbis/patches/libvorbis-1.2.3.patch
deleted file mode 100644
index e3dea0b64..000000000
--- a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN libvorbis-1.2.3/configure.ac libvorbis-1.2.3-haiku/configure.ac
---- libvorbis-1.2.3/configure.ac	2009-07-09 10:02:25.000000000 +0000
-+++ libvorbis-1.2.3-haiku/configure.ac	2009-09-13 21:56:38.000000000 +0000
-@@ -185,6 +185,10 @@
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-+ 	*-*-haiku*)
-+		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-  	*)
- 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch b/media-libs/libvorbis/patches/libvorbis-1.3.1.patch
deleted file mode 100644
index ecacce794..000000000
--- a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN libvorbis-1.3.1-orig/configure.ac libvorbis-1.3.1/configure.ac
---- libvorbis-1.3.1-orig/configure.ac	2010-03-26 06:56:58.061079552 +0000
-+++ libvorbis-1.3.1/configure.ac	2010-05-12 05:56:55.536870912 +0000
-@@ -206,6 +206,10 @@
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-+ 	*-*-haiku*)
-+		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-  	*)
- 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"