stable on amd64 and x86, did some cleanup

Package-Manager: portage-2.0.51.19

18 files changed, 23 insertions, 533 deletions

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index b2d5d7da33f5..fd63a16b11b9 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdauthor
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.20 2005/04/13 18:09:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.21 2005/04/22 14:42:15 luckyduck Exp $
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -dvdauthor-0.5.0.ebuild,
+  -dvdauthor-0.5.3.ebuild, dvdauthor-0.6.11.ebuild:
+  stable on amd64 and x86, did some cleanup
 
 *dvdauthor-0.6.11 (13 Apr 2005)
 
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 74c59ea64f38..59e0b97df63b 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1a59ae2b8b346bd0975340933646b873 dvdauthor-0.5.3.ebuild 786
-MD5 456c8700edeb660dc2288d86d617adc4 dvdauthor-0.5.0.ebuild 778
-MD5 946a2296677f7e48583685d0adf183c6 dvdauthor-0.6.11.ebuild 713
+MD5 218e8f0e2ffe913494217fe3fdc52e1b dvdauthor-0.6.11.ebuild 711
 MD5 2d6be818699883eb6009ceaeef8742a9 dvdauthor-0.6.10.ebuild 939
-MD5 9e100b5c8ea3bd0d6c41147094d50417 ChangeLog 3125
+MD5 04740d4416216ccd27995ea42b7818cc ChangeLog 3299
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 f98a1701d0a682dcbaa5be92cfe177d8 files/dvdauthor-0.6.10-debugsegfault.patch 1274
 MD5 d121c9be3efefbcbf6b07a1fba9a8afc files/dvdauthor-0.6.10-im6.patch 360
 MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/0.6.10-gcc34.patch 427
 MD5 8a50d588492e032aad69586764b81edf files/dvdauthor-0.6.10-utf8.patch 464
-MD5 237f7b3b119dec02712a341e3b1ea458 files/digest-dvdauthor-0.5.0 66
-MD5 1c2c588351a939107a17280fd17f351c files/digest-dvdauthor-0.5.3 66
 MD5 7dc0471c612f68f8c3cc66a8064e4263 files/digest-dvdauthor-0.6.10 68
 MD5 79879b2e10592c662bf26806a513a3cb files/digest-dvdauthor-0.6.11 68
 MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/dvdauthor-0.6.10-gcc34.patch 427
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCXWBW06ebR+OMO78RAh/AAJsFk6U8CPbBPX27/5GgzUXewUWTzgCfam7b
-zQJxX8lkzkBVY9DGj1B/zaA=
-=eWFi
------END PGP SIGNATURE-----
diff --git a/media-video/dvdauthor/dvdauthor-0.5.0.ebuild b/media-video/dvdauthor/dvdauthor-0.5.0.ebuild
deleted file mode 100644
index 17784082bdda..000000000000
--- a/media-video/dvdauthor/dvdauthor-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.5.0.ebuild,v 1.7 2005/01/08 00:56:54 luckyduck Exp $
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://dvdauthor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="media-libs/libdvdread
-	media-libs/libpng"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}; sed -e '/CFLAGS =/d' -i.bak Makefile.in
-}
-
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-	dodoc README HISTORY TODO
-}
diff --git a/media-video/dvdauthor/dvdauthor-0.5.3.ebuild b/media-video/dvdauthor/dvdauthor-0.5.3.ebuild
deleted file mode 100644
index 29d59320fad3..000000000000
--- a/media-video/dvdauthor/dvdauthor-0.5.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.5.3.ebuild,v 1.7 2005/01/08 00:56:54 luckyduck Exp $
-
-DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://dvdauthor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-DEPEND="media-libs/libdvdread
-	media-libs/libpng"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}; sed -e '/CFLAGS =/d' -i.bak Makefile.in
-}
-
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-	dodoc README HISTORY TODO
-}
diff --git a/media-video/dvdauthor/dvdauthor-0.6.11.ebuild b/media-video/dvdauthor/dvdauthor-0.6.11.ebuild
index f2d038accd75..19147083b9f1 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.11.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.11.ebuild,v 1.1 2005/04/13 18:09:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.11.ebuild,v 1.2 2005/04/22 14:42:15 luckyduck Exp $
 
 inherit eutils 64-bit
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc amd64 ~ppc64"
 IUSE=""
 
 DEPEND="media-libs/libdvdread
diff --git a/media-video/dvdauthor/files/digest-dvdauthor-0.5.0 b/media-video/dvdauthor/files/digest-dvdauthor-0.5.0
deleted file mode 100644
index e523bde8106f..000000000000
--- a/media-video/dvdauthor/files/digest-dvdauthor-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ae1babef717aa33a4823d272abfcade dvdauthor-0.5.0.tar.gz 69230
diff --git a/media-video/dvdauthor/files/digest-dvdauthor-0.5.3 b/media-video/dvdauthor/files/digest-dvdauthor-0.5.3
deleted file mode 100644
index 5042ea74ea61..000000000000
--- a/media-video/dvdauthor/files/digest-dvdauthor-0.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c5c5dd7bc2863c72a553e7822a10d49 dvdauthor-0.5.3.tar.gz 89671
diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index d127cbb4b75f..7df275cb3ee4 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/dvdstyler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.11 2005/04/19 09:35:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.12 2005/04/22 14:44:39 luckyduck Exp $
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/1.1-AutoMakefile.patch, -files/1.1-code.patch,
+  -files/1.1-gcc34.patch, -files/1.3_beta-code.patch, -dvdstyler-1.1.ebuild,
+  dvdstyler-1.31.ebuild, -dvdstyler-1.3_beta.ebuild:
+  stable on amd64 and x86, did some cleanup
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdstyler-1.31.ebuild:
+  stable on amd64 and x86
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 07e7191a4949..0c653d27535d 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,22 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 890d7a5cb0ea5b991b1499480a99a3a8 ChangeLog 2234
-MD5 512386b3a2454da3d54cff5839b69423 dvdstyler-1.3_beta.ebuild 1393
+MD5 d4ed9d6612f7c9b7ee2401edb8455b4e dvdstyler-1.31.ebuild 1354
+MD5 ffce5d1d882a3236a376a6acc48aa7ee ChangeLog 2619
 MD5 59aae5dcb06a68bd02cec60c627dbe53 metadata.xml 253
-MD5 706e005d20c9ed8ad882589a44e86c74 dvdstyler-1.31.ebuild 1389
-MD5 5b254b68dbe19cec90bc0256025bfea1 dvdstyler-1.1.ebuild 1748
 MD5 adc5cb34c08a386902e03988e795ae18 files/digest-dvdstyler-1.31 66
-MD5 8c145449d787c3a629954f776193641b files/1.1-AutoMakefile.patch 4326
-MD5 b018800b008dca3d2cea1524d47ce7be files/digest-dvdstyler-1.1 66
-MD5 727730301ffb80c4919553979e944b02 files/digest-dvdstyler-1.3_beta 66
-MD5 9ce81eab104aea6c7e4e12cecbceaeee files/1.1-code.patch 3454
-MD5 b29bee8b8faea8a0b45d34e6d35cea6e files/1.1-gcc34.patch 1478
-MD5 cf6a58ba273d670bca95ef3a956f11c8 files/1.3_beta-code.patch 2479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZNDeKf2g/qXtneoRArjUAJ44P4GkJHSfzcwiKHnmS1T6tu3XjQCgsVHL
-uJ3o4cLadXcR73abTrTHMF0=
-=9UtB
------END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.1.ebuild b/media-video/dvdstyler/dvdstyler-1.1.ebuild
deleted file mode 100644
index a6d2bdaa10ce..000000000000
--- a/media-video/dvdstyler/dvdstyler-1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.1.ebuild,v 1.2 2005/01/15 22:51:16 luckyduck Exp $
-
-inherit eutils
-
-MY_P=DVDStyler-${PV}
-
-DESCRIPTION="DVD filesystem Builder"
-HOMEPAGE="http://dvdstyler.sourceforge.net"
-SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gnome"
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="virtual/x11
-	>=x11-libs/wxGTK-2.4.2
-	>=media-video/mjpegtools-1.6.2
-	>=media-video/dvdauthor-0.6.10
-	gnome? ( >=gnome-base/libgnomeui-2.0 )
-	media-video/mpgtx
-	x11-libs/gtk+
-	dev-libs/expat
-	virtual/libc
-	media-libs/tiff
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/netpbm
-	dev-libs/glib
-	sys-libs/zlib
-	app-cdr/dvd+rw-tools
-	virtual/cdrtools"
-
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gcc
-	sys-devel/automake
-	>=sys-apps/sed-4"
-
-#	sys-devel/autoconf"
-#PDEPEND= kde? and gnome
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	epatch ${FILESDIR}/${PV}-AutoMakefile.patch
-	epatch ${FILESDIR}/${PV}-code.patch
-	cd ${S}
-}
-
-src_compile() {
-	# Propergate automake patch
-	autoconf
-	automake
-
-	econf \
-		|| die "Failed to configure"
-
-	# sed -i -e "s:^prefix=.*${PN}\$::g" configure*
-	# sed -i -e "s:^dvdstyler_LDADD =:dvdstyler_LDADD =-lexpat:" src/Makefile.in
-
-	# emake -C wxXML CPPFLAGS=-DSYSEXPAT=1 || die "Failed to make wxXML helpers"
-	emake || die "Failed to make"
-}
-
-
-src_install() {
-	emake DESTDIR=${D} install || die "failed to install"
-	mv ${D}usr/share/docs/DVDStyler/silence.mp2 ${D}usr/share/DVDStyler
-	dodir /usr/share/doc/${PF}
-	mv ${D}usr/share/docs/DVDStyler ${D}usr/share/doc/${PF}
-	rmdir ${D}usr/share/docs
-}
diff --git a/media-video/dvdstyler/dvdstyler-1.31.ebuild b/media-video/dvdstyler/dvdstyler-1.31.ebuild
index 57a6bd7d6e3e..180cc972fff3 100644
--- a/media-video/dvdstyler/dvdstyler-1.31.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.31.ebuild,v 1.2 2005/03/30 10:55:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.31.ebuild,v 1.3 2005/04/22 14:44:39 luckyduck Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="gnome"
 S=${WORKDIR}/${MY_P}
 
@@ -33,8 +33,6 @@ RDEPEND="virtual/x11
 	sys-libs/zlib
 	app-cdr/dvd+rw-tools
 	virtual/cdrtools"
-
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gcc
@@ -44,10 +42,6 @@ DEPEND="${RDEPEND}
 #	sys-devel/autoconf"
 #PDEPEND= kde? and gnome
 
-src_unpack() {
-	unpack ${A}
-}
-
 src_compile() {
 	# Propergate automake patch
 	autoconf
diff --git a/media-video/dvdstyler/dvdstyler-1.3_beta.ebuild b/media-video/dvdstyler/dvdstyler-1.3_beta.ebuild
deleted file mode 100644
index f8c5a458c37b..000000000000
--- a/media-video/dvdstyler/dvdstyler-1.3_beta.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.3_beta.ebuild,v 1.2 2005/01/15 22:51:16 luckyduck Exp $
-
-inherit eutils
-
-MY_P=DVDStyler-${PV/_beta/b}
-
-DESCRIPTION="DVD filesystem Builder"
-HOMEPAGE="http://dvdstyler.sourceforge.net"
-SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gnome"
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="virtual/x11
-	>=x11-libs/wxGTK-2.4.2
-	>=media-video/mjpegtools-1.6.2
-	>=media-video/dvdauthor-0.6.10
-	gnome? ( >=gnome-base/libgnomeui-2.0 )
-	media-video/mpgtx
-	x11-libs/gtk+
-	dev-libs/expat
-	virtual/libc
-	media-libs/tiff
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/netpbm
-	dev-libs/glib
-	sys-libs/zlib
-	app-cdr/dvd+rw-tools
-	virtual/cdrtools"
-
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gcc
-	sys-devel/automake
-	>=sys-apps/sed-4"
-
-#	sys-devel/autoconf"
-#PDEPEND= kde? and gnome
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-code.patch || die "patch failed"
-}
-
-src_compile() {
-	# Propergate automake patch
-	autoconf
-	automake
-
-	econf || die "Failed to configure"
-	emake || die "Failed to make"
-}
-
-
-src_install() {
-	emake DESTDIR=${D} install || die "failed to install"
-	mv ${D}usr/share/docs ${D}usr/share/doc
-	mv ${D}usr/share/doc/${PN} ${D}usr/share/doc/${PF}
-}
diff --git a/media-video/dvdstyler/files/1.1-AutoMakefile.patch b/media-video/dvdstyler/files/1.1-AutoMakefile.patch
deleted file mode 100644
index a800be7e2c23..000000000000
--- a/media-video/dvdstyler/files/1.1-AutoMakefile.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ru DVDStyler-1.1.orig/Makefile.am DVDStyler-1.1/Makefile.am
---- DVDStyler-1.1.orig/Makefile.am	2004-07-20 21:14:26.000000000 +0930
-+++ DVDStyler-1.1/Makefile.am	2004-08-05 08:18:54.316885328 +0930
-@@ -3,7 +3,7 @@
- 
- ACLOCAL_AMFLAGS=-I.
- 
--dist_pkgdatadir=$(prefix)
-+dist_pkgdatadir=@datadir@/docs/DVDStyler
- dist_pkgdata_DATA = silence.mp2 AUTHORS COPYING INSTALL README ChangeLog
- 
- run: all
-diff -ru DVDStyler-1.1.orig/backgrounds/Makefile.am DVDStyler-1.1/backgrounds/Makefile.am
---- DVDStyler-1.1.orig/backgrounds/Makefile.am	2004-06-15 20:28:06.000000000 +0930
-+++ DVDStyler-1.1/backgrounds/Makefile.am	2004-08-05 08:18:54.317885176 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=$(prefix)/backgrounds
-+dist_pkgdatadir=@datadir@/DVDStyler/backgrounds
- dist_pkgdata_DATA = *.jpg
-diff -ru DVDStyler-1.1.orig/buttons/Makefile.am DVDStyler-1.1/buttons/Makefile.am
---- DVDStyler-1.1.orig/buttons/Makefile.am	2004-06-15 20:28:06.000000000 +0930
-+++ DVDStyler-1.1/buttons/Makefile.am	2004-08-05 08:18:54.319884872 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=$(prefix)/buttons
-+dist_pkgdatadir=@datadir@/DVDStyler/buttons
- dist_pkgdata_DATA = *.xml
-diff -ru DVDStyler-1.1.orig/install.win32/Makefile.am DVDStyler-1.1/install.win32/Makefile.am
---- DVDStyler-1.1.orig/install.win32/Makefile.am	2004-06-11 20:36:10.000000000 +0930
-+++ DVDStyler-1.1/install.win32/Makefile.am	2004-08-05 08:18:54.322884416 +0930
-@@ -7,13 +7,13 @@
- 
- if USE_KDE
- install-kde:
--	mkdir -p $(KDE_DATA_DIR)/icons
--	if test -w $(KDE_DATA_DIR)/icons ; then \
--	  install -m 644 $(top_srcdir)/src/rc/$(ICON) $(KDE_DATA_DIR)/icons/$(ICON); \
-+	$(INSTALL) -d $(DESTDIR)$(KDE_DATA_DIR)/icons
-+	if test -w $(DESTDIR)$(KDE_DATA_DIR)/icons ; then \
-+	  install -m 644 $(top_srcdir)/src/rc/$(ICON) $(DESTDIR)$(KDE_DATA_DIR)/icons/$(ICON); \
- 	fi
--	mkdir -p $(KDE_DATA_DIR)/applnk/Multimedia
--	if test -w $(KDE_DATA_DIR)/applnk/Multimedia ; then \
--	  install -m 644 $(srcdir)/$(DESK) $(KDE_DATA_DIR)/applnk/Multimedia; \
-+	$(INSTALL) -d $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia
-+	if test -w $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia ; then \
-+	  install -m 644 $(srcdir)/$(DESK) $(DESTDIR)$(KDE_DATA_DIR)/applnk/Multimedia; \
- 	fi
- 
- else
-@@ -25,14 +25,14 @@
- 
- if USE_GNOME
- install-gnome:
--	mkdir -p $(GNOME_DATA_DIR)/pixmaps
--	if test -w $(GNOME_DATA_DIR)/pixmaps ; then \
--	  install -m 644 $(top_srcdir)/src/rc/$(XPM) $(GNOME_DATA_DIR)/pixmaps/$(XPM); \
--	  install -m 644 $(top_srcdir)/src/rc/$(ICON) $(GNOME_DATA_DIR)/pixmaps/$(ICON); \
-+	$(INSTALL) -d $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps
-+	if test -w $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps ; then \
-+	  install -m 644 $(top_srcdir)/src/rc/$(XPM) $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps/$(XPM); \
-+	  install -m 644 $(top_srcdir)/src/rc/$(ICON) $(DESTDIR)$(GNOME_DATA_DIR)/pixmaps/$(ICON); \
- 	fi
--	mkdir -p $(GNOME_DATA_DIR)/gnome/apps/
--	if test -w $(GNOME_DATA_DIR)/gnome/apps/Multimedia ; then \
--	  install -m 644 $(srcdir)/$(DESK) $(GNOME_DATA_DIR)/gnome/apps/Multimedia; \
-+	$(INSTALL) -d $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/
-+	if test -w $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/Multimedia ; then \
-+	  install -m 644 $(srcdir)/$(DESK) $(DESTDIR)$(GNOME_DATA_DIR)/gnome/apps/Multimedia; \
- 	fi
- 
- else
-diff -ru DVDStyler-1.1.orig/locale/Makefile.in DVDStyler-1.1/locale/Makefile.in
---- DVDStyler-1.1.orig/locale/Makefile.in	2004-06-15 19:25:59.000000000 +0930
-+++ DVDStyler-1.1/locale/Makefile.in	2004-08-05 08:18:54.323884264 +0930
-@@ -9,7 +9,7 @@
- LINGUAS=de it ru
- 
- prefix=@prefix@
--DATADIR=@prefix@
-+DATADIR=@datadir@
- INSTALL=@INSTALL@
- 
- all: allmo
-diff -ru DVDStyler-1.1.orig/src/rc/Makefile.am DVDStyler-1.1/src/rc/Makefile.am
---- DVDStyler-1.1.orig/src/rc/Makefile.am	2004-07-04 01:42:44.000000000 +0930
-+++ DVDStyler-1.1/src/rc/Makefile.am	2004-08-05 08:18:54.325883960 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=@bindir@/rc
-+dist_pkgdatadir=@datadir@/DVDStyler/rc
- dist_pkgdata_DATA = *.png *.cur
---- DVDStyler-1.1/configure.in.orig	2004-08-01 19:19:01.000000000 +0930
-+++ DVDStyler-1.1/configure.in	2004-11-21 19:01:30.640750216 +0930
-@@ -40,7 +40,7 @@
-   DEBUG_FLAGS="-g -Wall -DDEBUG"
-   ;;    
- *)
--  DEBUG_FLAGS="-O3"
-+  DEBUG_FLAGS=""
-   ;;
- esac
- 
-@@ -120,7 +120,6 @@
- 
- dnl vars
- orig_prefix=$prefix
--prefix=$prefix/dvdstyler
- AC_SUBST(orig_prefix)
- AC_SUBST(LDFLAGS)
- AC_SUBST(CFLAGS)
diff --git a/media-video/dvdstyler/files/1.1-code.patch b/media-video/dvdstyler/files/1.1-code.patch
deleted file mode 100644
index 517d94e926b3..000000000000
--- a/media-video/dvdstyler/files/1.1-code.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -ru DVDStyler-1.1.orig/src/MainWin.cpp DVDStyler-1.1/src/MainWin.cpp
---- DVDStyler-1.1.orig/src/MainWin.cpp	2004-07-26 22:10:20.000000000 +0930
-+++ DVDStyler-1.1/src/MainWin.cpp	2004-07-30 13:44:08.146968624 +0930
-@@ -38,8 +38,8 @@
- #include "rc/files.xpm"
- 
- 
--#define BACKGROUNDS_DIR wxGetAppPath() + _T("/../backgrounds")
--#define BUTTONS_DIR wxGetAppPath() + _T("/../buttons")
-+#define BACKGROUNDS_DIR _T("/usr/share/DVDStyler/backgrounds")
-+#define BUTTONS_DIR _T("/usr/share/DVDStyler/buttons")
- 
- //////////////////////////// help functions //////////////////////////////////
- 
-@@ -322,7 +322,7 @@
- {
-   ShowDirTree(false);
-   m_thumbnails->Clear();
--  wxString fname = wxFindFirstFile(BUTTONS_DIR + _T("/*.xml"));
-+  wxString fname = wxFindFirstFile(_T("/usr/share/DVDStyler/buttons/*.xml"));
-   while (!fname.IsEmpty())
-   {
- 	wxThumb* thumb = new wxThumb(fname);
-diff -ru DVDStyler-1.1.orig/src/MenuBox.cpp DVDStyler-1.1/src/MenuBox.cpp
---- DVDStyler-1.1.orig/src/MenuBox.cpp	2004-07-26 22:10:59.000000000 +0930
-+++ DVDStyler-1.1/src/MenuBox.cpp	2004-07-30 13:42:34.552197192 +0930
-@@ -284,11 +284,11 @@
-       case ttTR:
-       case ttBL: SetCursor(wxCursor(wxCURSOR_SIZENESW)); break;
- #else
--	  case ttIn: SetCursor(wxImage(wxGetAppPath() + _T("/rc/move.cur")));break;
-+	  case ttIn: SetCursor(wxImage(_T("/usr/share/DVDStyler/rc/move.cur")));break;
-       case ttTL:
--      case ttBR: SetCursor(wxImage(wxGetAppPath() + _T("/rc/nwse.cur")));break;
-+      case ttBR: SetCursor(wxImage(_T("/usr/share/DVDStyler/rc/nwse.cur")));break;
-       case ttTR:
--      case ttBL: SetCursor(wxImage(wxGetAppPath() + _T("/rc/nesw.cur")));break;
-+      case ttBL: SetCursor(wxImage(_T("/usr/share/DVDStyler/rc/nesw.cur")));break;
- #endif
-     }
-   }
-diff -ru DVDStyler-1.1.orig/src/dvdstyler.cpp DVDStyler-1.1/src/dvdstyler.cpp
---- DVDStyler-1.1.orig/src/dvdstyler.cpp	2004-07-04 21:12:48.000000000 +0930
-+++ DVDStyler-1.1/src/dvdstyler.cpp	2004-07-30 13:42:34.557196432 +0930
-@@ -58,7 +58,7 @@
-   // Pop up a dialog the first time the program is run
-   if (!lang.length())
-   {
--    m_locale.AddCatalogLookupPathPrefix(wxGetAppPath() + _T("/../locale"));
-+    m_locale.AddCatalogLookupPathPrefix(_T("/usr/share/locale"));
-     m_locale.AddCatalog(_T("dvdstyler"));
-     m_locale.Init(wxLANGUAGE_DEFAULT);
- 	lang = ChooseLanguage(NULL);
-@@ -68,7 +68,7 @@
-   if (lang != _T("en"))
-   {
- 	m_locale.Init(_T(""), lang, _T(""), true, true);
--	m_locale.AddCatalogLookupPathPrefix(wxGetAppPath() + _T("/../locale"));
-+	m_locale.AddCatalogLookupPathPrefix(_T("/usr/share/locale"));
- 	m_locale.AddCatalog(_T("dvdstyler"));
-   }
- 
---- DVDStyler-1.1.orig/src/ProgressDlg.cpp	2004-10-20 23:44:10.611351992 +0200
-+++ DVDStyler-1.1/src/ProgressDlg.cpp	2004-10-20 23:45:14.313667768 +0200
-@@ -15,7 +15,7 @@
- #include <wxVillaLib/utils.h>
- #include <wx/dir.h>
- 
--#define DATA_DIR(fname) wxGetAppPath() + wxFILE_SEP_PATH + _T("..") + wxFILE_SEP_PATH + fname
-+#define DATA_DIR(fname) _T("/usr/share/DVDStyler") + wxFILE_SEP_PATH + fname
- 
- void DeleteDir(wxString dir, bool subdirs = false)
- {
-@@ -237,7 +237,7 @@
-   wxString hlFile  = menuFile + _T("_highlight.png");
-   wxString selFile = menuFile + _T("_select.png");
-   wxString spuFile = menuFile + _T("_spumux.xml");
--  wxString silenceFile = DATA_DIR(_T("silence.mp2"));
-+  wxString silenceFile = _T("/usr/share/DVDStyler/silence.mp2");
-   
-   bool videoMenu = menu->HasVideoBackground();
-   // save background
diff --git a/media-video/dvdstyler/files/1.1-gcc34.patch b/media-video/dvdstyler/files/1.1-gcc34.patch
deleted file mode 100644
index d1c709b43bea..000000000000
--- a/media-video/dvdstyler/files/1.1-gcc34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur DVDStyler-1.1.orig/src/Config.h DVDStyler-1.1/src/Config.h
---- DVDStyler-1.1.orig/src/Config.h	2004-10-05 12:49:10.953845245 -0400
-+++ DVDStyler-1.1/src/Config.h	2004-10-05 12:49:53.346475208 -0400
-@@ -88,7 +88,7 @@
- 	
- 	CONFIG_PROP(Version,  _T("Version"), DEF_VERSION)
- 	CONFIG_PROP(Language, _T("Interface/Language"), DEF_LANGUAGE)
--	CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), DEF_MENU_FORMAT)
-+	CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), (long)DEF_MENU_FORMAT)
- 	CONFIG_PROP(GenerateTemp, _T("Generate/TempDir"), DEF_GEN_TEMP_DIR)
- 	CONFIG_PROP(Jpeg2MpegCmd, _T("Generate/Jpeg2MpegCmd"), DEF_JPEG2MPEG_CMD)
- 	CONFIG_PROP(FrameRatePAL, _T("Generate/FrameRatePAL"), DEF_FRAMERATE_PAL)
-@@ -101,7 +101,7 @@
- 	CONFIG_PROP_BOOL(PreviewDo, _T("Preview/Do"), DEF_PREVIEW_DO)
- 	CONFIG_PROP(PreviewCmd, _T("Preview/Cmd"), DEF_PREVIEW_CMD)
- 	
--	CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), DEF_ISO_DO)
-+	CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), (long)DEF_ISO_DO)
- 	CONFIG_PROP(IsoCmd, _T("Iso/Cmd"), DEF_ISO_CMD)
- 	CONFIG_PROP(IsoSaveTo, _T("Iso/SaveTo"), DEF_ISO_SAVETO)
- 	
-@@ -110,7 +110,7 @@
- 	CONFIG_PROP(BurnDevice, _T("Burn/Device"), DEF_BURN_DEVICE)
- 	CONFIG_PROP(CdrSecurity, _T("Burn/CdrSecurity"), DEF_CDR_SECURITY)
- 	
--	CONFIG_PROP_BOOL(FormatDo, _T("Burn/FormatDo"), DEF_FORMAT_DO)
-+	CONFIG_PROP_BOOL(FormatDo, _T("Burn/FormatDo"), (long)DEF_FORMAT_DO)
- 	CONFIG_PROP(FormatCmd, _T("Burn/FormatCmd"), DEF_FORMAT_CMD)
-     
-   protected:
diff --git a/media-video/dvdstyler/files/1.3_beta-code.patch b/media-video/dvdstyler/files/1.3_beta-code.patch
deleted file mode 100644
index 6bf4779e839e..000000000000
--- a/media-video/dvdstyler/files/1.3_beta-code.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ru DVDStyler-1.3b-orig/configure.in DVDStyler-1.3b/configure.in
---- DVDStyler-1.3b-orig/configure.in	2004-11-05 00:46:59.000000000 +0930
-+++ DVDStyler-1.3b/configure.in	2004-11-21 19:25:54.101644232 +0930
-@@ -39,7 +39,7 @@
-   DEBUG_FLAGS="-g -Wall -DDEBUG"
-   ;;    
- *)
--  DEBUG_FLAGS="-O3"
-+  DEBUG_FLAGS=""
-   ;;
- esac
- 
-Only in DVDStyler-1.3b-orig/install.win32: Makefile.am
-diff -ru DVDStyler-1.3b-orig/src/Config.h DVDStyler-1.3b/src/Config.h
---- DVDStyler-1.3b-orig/src/Config.h	2004-11-02 22:23:48.000000000 +0930
-+++ DVDStyler-1.3b/src/Config.h	2004-11-21 19:41:57.788634728 +0930
-@@ -89,9 +89,9 @@
- 	
- 	CONFIG_PROP(Version,  _T("Version"), DEF_VERSION)
- 	CONFIG_PROP(Language, _T("Interface/Language"), DEF_LANGUAGE)
--	CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), DEF_MENU_FORMAT)
-+	CONFIG_PROP_INT(DefMenuFormat, _T("Interface/DefMenuFormat"), (long)DEF_MENU_FORMAT)
- 	CONFIG_PROP(TempDir, _T("Generate/TempDir"), DEF_GEN_TEMP_DIR)
--	CONFIG_PROP_BOOL(RemoveTempFiles, _T("Generate/RemoveTempFiles"), DEF_REMOVE_TEMP)
-+	CONFIG_PROP_BOOL(RemoveTempFiles, _T("Generate/RemoveTempFiles"), (long)DEF_REMOVE_TEMP)
- 	CONFIG_PROP(Jpeg2MpegCmd, _T("Generate/Jpeg2MpegCmd"), DEF_JPEG2MPEG_CMD)
- 	CONFIG_PROP(FrameRatePAL, _T("Generate/FrameRatePAL"), DEF_FRAMERATE_PAL)
- 	CONFIG_PROP(FrameRateNTSC,_T("Generate/FrameRateNTSC"), DEF_FRAMERATE_NTSC)
-@@ -100,19 +100,19 @@
- 	CONFIG_PROP(SpumuxCmd,  _T("Generate/SpumuxCmd"), DEF_SPUMUX_CMD)
- 	CONFIG_PROP(DvdauthorCmd, _T("Generate/DvdauthorCmd"), DEF_DVDAUTHOR_CMD)
- 	
--	CONFIG_PROP_BOOL(PreviewDo, _T("Preview/Do"), DEF_PREVIEW_DO)
-+	CONFIG_PROP_BOOL(PreviewDo, _T("Preview/Do"), (long)DEF_PREVIEW_DO)
- 	CONFIG_PROP(PreviewCmd, _T("Preview/Cmd"), DEF_PREVIEW_CMD)
- 	
--	CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), DEF_ISO_DO)
-+	CONFIG_PROP_BOOL(IsoDo, _T("Iso/Do"), (long)DEF_ISO_DO)
- 	CONFIG_PROP(IsoCmd, _T("Iso/Cmd"), DEF_ISO_CMD)
- 	CONFIG_PROP(IsoSizeCmd, _T("Iso/SizeCmd"), DEF_ISO_SIZE_CMD)
- 	CONFIG_PROP(IsoSaveTo,  _T("Iso/SaveTo"), DEF_ISO_SAVETO)
- 	
--	CONFIG_PROP_BOOL(BurnDo, _T("Burn/Do"), DEF_BURN_DO)
-+	CONFIG_PROP_BOOL(BurnDo, _T("Burn/Do"), (long)DEF_BURN_DO)
- 	CONFIG_PROP(BurnCmd, _T("Burn/Cmd"), DEF_BURN_CMD)
- 	CONFIG_PROP(BurnDevice, _T("Burn/Device"), DEF_BURN_DEVICE)
- 	
--	CONFIG_PROP_BOOL(FormatDo, _T("Burn/FormatDo"), DEF_FORMAT_DO)
-+	CONFIG_PROP_BOOL(FormatDo, _T("Burn/FormatDo"), (long)DEF_FORMAT_DO)
- 	CONFIG_PROP(FormatCmd, _T("Burn/FormatCmd"), DEF_FORMAT_CMD)
-     
-   protected:
diff --git a/media-video/dvdstyler/files/digest-dvdstyler-1.1 b/media-video/dvdstyler/files/digest-dvdstyler-1.1
deleted file mode 100644
index 4e8e54544c0f..000000000000
--- a/media-video/dvdstyler/files/digest-dvdstyler-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 219d138c141eed5a06db1b344ca62d95 DVDStyler-1.1.tar.gz 1147550
diff --git a/media-video/dvdstyler/files/digest-dvdstyler-1.3_beta b/media-video/dvdstyler/files/digest-dvdstyler-1.3_beta
deleted file mode 100644
index baf4b95b752f..000000000000
--- a/media-video/dvdstyler/files/digest-dvdstyler-1.3_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d43a44093223663ed3128548e0dd39f6 DVDStyler-1.3b.tar.gz 644257