diff --git a/media-video/kmediafactory/Manifest b/media-video/kmediafactory/Manifest
index 1a3d558..46042b0 100644
--- a/media-video/kmediafactory/Manifest
+++ b/media-video/kmediafactory/Manifest
@@ -1,18 +1,16 @@
-MD5 8e7af9df7ee6f823fcb79f53a3e32575 kmediafactory-0.1.0.ebuild 563
-MD5 81ab97e5d3bd8c2515d319a38da536e3 kmediafactory-0.2.0.ebuild 580
-MD5 81ab97e5d3bd8c2515d319a38da536e3 kmediafactory-0.2.1.ebuild 580
-MD5 ea88ba73dc9176efca5fe9b7e8793b3e kmediafactory-0.2.2.ebuild 604
-MD5 b9b38a67b18059cae7a2443be08e8c3a kmediafactory-0.3.0.ebuild 651
-MD5 407bb50fb47c98e53c2dee81712b4f5b kmediafactory-0.4.0.ebuild 700
-MD5 70289e730b586cd9756b2cb4bd397f70 kmediafactory-0.4.1.ebuild 765
-MD5 407bb50fb47c98e53c2dee81712b4f5b kmediafactory-20050831.ebuild 700
-MD5 70289e730b586cd9756b2cb4bd397f70 kmediafactory-20051004.ebuild 765
-MD5 cd34df8d29788fbb6cd6928bb37fd316 files/digest-kmediafactory-0.1.0 73
-MD5 30d6ffbc56e8418a10c664f340babe78 files/digest-kmediafactory-0.2.0 73
-MD5 a3e487397c972f946bfb5ae03e668ad3 files/digest-kmediafactory-0.2.1 73
-MD5 79d538379ce7eab3a2ae09005d662456 files/digest-kmediafactory-0.2.2 73
-MD5 ab9d8ee02e78a06838a8fca25c489278 files/digest-kmediafactory-0.3.0 73
-MD5 aa7092c23104bdc099b8b6f5f7c55cea files/digest-kmediafactory-0.4.0 73
-MD5 073402cbf04b754205232c74f03158fb files/digest-kmediafactory-0.4.1 73
-MD5 88db30c07b6bb64a63ad21dc42245678 files/digest-kmediafactory-20050831 76
-MD5 3d6774d7bf86b1341d128fa06822b761 files/digest-kmediafactory-20051004 76
+DIST kmediafactory-0.5.1.tar.bz2 2539471 RMD160 433a6b1aab9bb86b1b551d4aae4ed6fa674dffb0 SHA256 d6c6e6f9525be06b2ad51c3ee154fe178dad142b60aa3bb51dedc47c6c1cbab6 size 2539471
+DIST kmediafactory-20060428.tar.bz2 2396298 RMD160 eb7858bd63e32ff0183235e543c016a58a384159 SHA256 2d142c7e3c9831fbdc4129dd34138cd7ada848370a7fa7c8931f3f4eb06acaea size 2396298
+EBUILD kmediafactory-0.5.1.ebuild 1455 RMD160 d383366278f1c552b8f7cc00128dbd4d8f586bcb SHA1 ab27832dcb38de464aad85d87c71ef8ccfda5e09 SHA256 920eb938fd7d402dc90bbbd9e8ab4333584f3b1b8018fc831fc0f0155d463961 size 1455
+MD5 7a1f5c556835254371d40d5a2d0dae4b kmediafactory-0.5.1.ebuild 1455
+RMD160 d383366278f1c552b8f7cc00128dbd4d8f586bcb kmediafactory-0.5.1.ebuild 1455
+SHA256 920eb938fd7d402dc90bbbd9e8ab4333584f3b1b8018fc831fc0f0155d463961 kmediafactory-0.5.1.ebuild 1455
+EBUILD kmediafactory-20060428.ebuild 1457 RMD160 f5937cbae7bfd22218359f4180f20d24e84d60ed SHA1 cdc98809d628064f81d60af80faf18a4befdd427 SHA256 7d8b7dcaa8d14ac63bb69bb50371a97003ecd772ffac8225c6a8843449d48aad size 1457
+MD5 7ada492110011c977443c45554c3d72a kmediafactory-20060428.ebuild 1457
+RMD160 f5937cbae7bfd22218359f4180f20d24e84d60ed kmediafactory-20060428.ebuild 1457
+SHA256 7d8b7dcaa8d14ac63bb69bb50371a97003ecd772ffac8225c6a8843449d48aad kmediafactory-20060428.ebuild 1457
+MD5 ceb051900c00ba75d9d58356897463dd files/digest-kmediafactory-0.5.1 265
+RMD160 fc883afc07809f84856322d3f2154a6377280519 files/digest-kmediafactory-0.5.1 265
+SHA256 56c6cef441ea0692b9e368df9dd02a13041dc7e0d682a5fcb821d4983c51be7b files/digest-kmediafactory-0.5.1 265
+MD5 5cbb5d9f0c50c5a9e9e0e36348f121d0 files/digest-kmediafactory-20060428 274
+RMD160 305ff9cbb69bcd45617dca765c5543d38882ef8c files/digest-kmediafactory-20060428 274
+SHA256 8dceb7f2bb23b115c438a76cdbf28158a32d3e3c44bcb731ad1eab08d090b5e1 files/digest-kmediafactory-20060428 274
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.1.0 b/media-video/kmediafactory/files/digest-kmediafactory-0.1.0
deleted file mode 100644
index e0e33a2..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25cabd7bbd2fdc13a635afd72a829869 kmediafactory-0.1.0.tar.bz2 1611673
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.2.0 b/media-video/kmediafactory/files/digest-kmediafactory-0.2.0
deleted file mode 100644
index d1b7323..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 690bb5c4b8ede908eecc3428f1b0929e kmediafactory-0.2.0.tar.bz2 1710208
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.2.1 b/media-video/kmediafactory/files/digest-kmediafactory-0.2.1
deleted file mode 100644
index cb1413d..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3360bd0040a50c10e934e25718380e98 kmediafactory-0.2.1.tar.bz2 1721591
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.2.2 b/media-video/kmediafactory/files/digest-kmediafactory-0.2.2
deleted file mode 100644
index 15675cf..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ccf5a43aaa6f054378b6444c94f24b5 kmediafactory-0.2.2.tar.bz2 1733623
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.3.0 b/media-video/kmediafactory/files/digest-kmediafactory-0.3.0
deleted file mode 100644
index 9154af2..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2901674bc558112837e356e45b93a5a kmediafactory-0.3.0.tar.bz2 2267142
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.4.0 b/media-video/kmediafactory/files/digest-kmediafactory-0.4.0
deleted file mode 100644
index 5e25ba8..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a51d5b6a0a5d9f0dcf819b6f81dc2e83 kmediafactory-0.4.0.tar.bz2 2332377
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.4.1 b/media-video/kmediafactory/files/digest-kmediafactory-0.4.1
deleted file mode 100644
index 6dfae26..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8acea22f25bb24e829c6b04b64126d29 kmediafactory-0.4.1.tar.bz2 2440361
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-0.5.1 b/media-video/kmediafactory/files/digest-kmediafactory-0.5.1
new file mode 100644
index 0000000..ff5bb23
--- /dev/null
+++ b/media-video/kmediafactory/files/digest-kmediafactory-0.5.1
@@ -0,0 +1,3 @@
+MD5 314177d2f7d52a22fbb36f23e770a603 kmediafactory-0.5.1.tar.bz2 2539471
+RMD160 433a6b1aab9bb86b1b551d4aae4ed6fa674dffb0 kmediafactory-0.5.1.tar.bz2 2539471
+SHA256 d6c6e6f9525be06b2ad51c3ee154fe178dad142b60aa3bb51dedc47c6c1cbab6 kmediafactory-0.5.1.tar.bz2 2539471
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-20050831 b/media-video/kmediafactory/files/digest-kmediafactory-20050831
deleted file mode 100644
index 13c87c4..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-20050831
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1b7e0d0a599f9f1aa49b167844e38ba kmediafactory-20050831.tar.bz2 2378400
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-20051004 b/media-video/kmediafactory/files/digest-kmediafactory-20051004
deleted file mode 100644
index 228a8cb..0000000
--- a/media-video/kmediafactory/files/digest-kmediafactory-20051004
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3a76b3a730c555cab45ac378a0fab80 kmediafactory-20051004.tar.bz2 2438150
diff --git a/media-video/kmediafactory/files/digest-kmediafactory-20060428 b/media-video/kmediafactory/files/digest-kmediafactory-20060428
new file mode 100644
index 0000000..66c9e16
--- /dev/null
+++ b/media-video/kmediafactory/files/digest-kmediafactory-20060428
@@ -0,0 +1,3 @@
+MD5 3ca3f65efed2158b375d276cf3396e75 kmediafactory-20060428.tar.bz2 2396298
+RMD160 eb7858bd63e32ff0183235e543c016a58a384159 kmediafactory-20060428.tar.bz2 2396298
+SHA256 2d142c7e3c9831fbdc4129dd34138cd7ada848370a7fa7c8931f3f4eb06acaea kmediafactory-20060428.tar.bz2 2396298
diff --git a/media-video/kmediafactory/kmediafactory-0.1.0.ebuild b/media-video/kmediafactory/kmediafactory-0.1.0.ebuild
deleted file mode 100644
index e71e59d..0000000
--- a/media-video/kmediafactory/kmediafactory-0.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.3
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.10
-    media-sound/toolame
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.2.0.ebuild b/media-video/kmediafactory/kmediafactory-0.2.0.ebuild
deleted file mode 100644
index 9ba3c3e..0000000
--- a/media-video/kmediafactory/kmediafactory-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.3
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-sound/toolame
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.2.1.ebuild b/media-video/kmediafactory/kmediafactory-0.2.1.ebuild
deleted file mode 100644
index 9ba3c3e..0000000
--- a/media-video/kmediafactory/kmediafactory-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.3
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-sound/toolame
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.2.2.ebuild b/media-video/kmediafactory/kmediafactory-0.2.2.ebuild
deleted file mode 100644
index d35f5bb..0000000
--- a/media-video/kmediafactory/kmediafactory-0.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.3
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip
-    media-libs/xine-lib"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-sound/toolame
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.3.0.ebuild b/media-video/kmediafactory/kmediafactory-0.3.0.ebuild
deleted file mode 100644
index ab55257..0000000
--- a/media-video/kmediafactory/kmediafactory-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.2
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip
-    media-libs/xine-lib
-    media-libs/libdv
-    media-libs/fontconfig"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-sound/toolame
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.4.0.ebuild b/media-video/kmediafactory/kmediafactory-0.4.0.ebuild
deleted file mode 100644
index b992241..0000000
--- a/media-video/kmediafactory/kmediafactory-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.2
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip
-    media-libs/xine-lib
-    media-libs/libdv
-    media-libs/libdvdread
-    media-libs/fontconfig"
-
-RDEPEND="${RDEPEND}
-    || ( media-sound/sox media-sound/toolame )
-    >=media-video/dvdauthor-0.6.11
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.4.1.ebuild b/media-video/kmediafactory/kmediafactory-0.4.1.ebuild
deleted file mode 100644
index 7fef628..0000000
--- a/media-video/kmediafactory/kmediafactory-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.2
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE="xine dv dvdread theora"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    sys-devel/gettext
-    >=media-gfx/imagemagick-6.1.3.2
-    media-libs/fontconfig
-    app-arch/zip
-    xine? ( media-libs/xine-lib )
-    dv? ( media-libs/libdv )
-    dvdread? ( media-libs/libdvdread )
-    theora? ( media-libs/libtheora )"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-0.5.1.ebuild b/media-video/kmediafactory/kmediafactory-0.5.1.ebuild
new file mode 100644
index 0000000..5d275e0
--- /dev/null
+++ b/media-video/kmediafactory/kmediafactory-0.5.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde
+need-kde 3.2
+
+DESCRIPTION="Template based DVD authoring software"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
+SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
+
+RESTRICT="nomirror"
+IUSE="xine ogg dv dvdread theora slideshow office dvb"
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+DEPEND="${DEPEND}
+    sys-devel/gettext
+    >=media-gfx/imagemagick-6.1.3.2
+    media-libs/fontconfig
+    app-arch/zip
+    xine? ( media-libs/xine-lib )
+    ogg? ( media-libs/libogg )
+    dv? ( media-libs/libdv )
+    dvdread? ( media-libs/libdvdread )
+    theora? ( media-libs/libtheora )"
+
+RDEPEND="${RDEPEND}
+    >=media-video/dvdauthor-0.6.11
+    media-video/mjpegtools
+    slideshow? ( >=media-video/dvd-slideshow-0.7.2 )
+    office? ( >=virtual/ooo-2.0 )
+    dvb? ( >=media-video/projectx-0.90.0.00 )"
+
+src_compile()
+{
+  econf --with-unopkg=no
+  emake || die "emake failed"
+}
+
+find_unopkg()
+{
+  for lib in "/usr/lib32" "/usr/lib"; do
+    if test -x ${lib}/openoffice/program/unopkg; then
+      UNOPKG=${lib}/openoffice/program/unopkg
+      return 0
+    fi
+  done
+  return 1
+}
+
+pkg_postinst()
+{
+  if find_unopkg; then
+    ${UNOPKG} add --shared /usr/share/apps/kmediafactory/kmf_converter.zip
+  fi
+}
+
+pkg_postrm()
+{
+  if find_unopkg; then
+    ${UNOPKG} remove --shared kmf_converter.zip
+  fi
+}
diff --git a/media-video/kmediafactory/kmediafactory-20050831.ebuild b/media-video/kmediafactory/kmediafactory-20050831.ebuild
deleted file mode 100644
index b992241..0000000
--- a/media-video/kmediafactory/kmediafactory-20050831.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.2
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    >=media-gfx/imagemagick-6.1.3.2
-    app-arch/zip
-    media-libs/xine-lib
-    media-libs/libdv
-    media-libs/libdvdread
-    media-libs/fontconfig"
-
-RDEPEND="${RDEPEND}
-    || ( media-sound/sox media-sound/toolame )
-    >=media-video/dvdauthor-0.6.11
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-20051004.ebuild b/media-video/kmediafactory/kmediafactory-20051004.ebuild
deleted file mode 100644
index 7fef628..0000000
--- a/media-video/kmediafactory/kmediafactory-20051004.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit kde
-need-kde 3.2
-
-DESCRIPTION="Template based DVD authoring software"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
-SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
-
-RESTRICT="nomirror"
-IUSE="xine dv dvdread theora"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-    sys-devel/gettext
-    >=media-gfx/imagemagick-6.1.3.2
-    media-libs/fontconfig
-    app-arch/zip
-    xine? ( media-libs/xine-lib )
-    dv? ( media-libs/libdv )
-    dvdread? ( media-libs/libdvdread )
-    theora? ( media-libs/libtheora )"
-
-RDEPEND="${RDEPEND}
-    >=media-video/dvdauthor-0.6.11
-    media-video/mjpegtools"
-
diff --git a/media-video/kmediafactory/kmediafactory-20060428.ebuild b/media-video/kmediafactory/kmediafactory-20060428.ebuild
new file mode 100644
index 0000000..bcafe57
--- /dev/null
+++ b/media-video/kmediafactory/kmediafactory-20060428.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde
+need-kde 3.3
+
+DESCRIPTION="Template based DVD authoring software"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.iki.fi/damu/software/kmediafactory/"
+SRC_URI="http://www.iki.fi/damu/software/kmediafactory/${P}.tar.bz2"
+
+RESTRICT="nomirror"
+IUSE="xine ogg dv dvdread theora slideshow office dvb"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="${DEPEND}
+    sys-devel/gettext
+    >=media-gfx/imagemagick-6.1.3.2
+    media-libs/fontconfig
+    app-arch/zip
+    xine? ( media-libs/xine-lib )
+    ogg? ( media-libs/libogg )
+    dv? ( media-libs/libdv )
+    dvdread? ( media-libs/libdvdread )
+    theora? ( media-libs/libtheora )"
+
+RDEPEND="${RDEPEND}
+    >=media-video/dvdauthor-0.6.11
+    media-video/mjpegtools
+    slideshow? ( >=media-video/dvd-slideshow-0.7.2 )
+    office? ( >=virtual/ooo-2.0 )
+    dvb? ( >=media-video/projectx-0.90.0.00 )"
+
+src_compile()
+{
+  econf --with-unopkg=no
+  emake || die "emake failed"
+}
+
+find_unopkg()
+{
+  for lib in "/usr/lib32" "/usr/lib"; do
+    if test -x ${lib}/openoffice/program/unopkg; then
+      UNOPKG=${lib}/openoffice/program/unopkg
+      return 0
+    fi
+  done
+  return 1
+}
+
+pkg_postinst()
+{
+  if find_unopkg; then
+    ${UNOPKG} add --shared /usr/share/apps/kmediafactory/kmf_converter.zip
+  fi
+}
+
+pkg_postrm()
+{
+  if find_unopkg; then
+    ${UNOPKG} remove --shared kmf_converter.zip
+  fi
+}