ersion bump and cleanout. Ebuild and patches thanks to Philippe Weibel<philippe.weibel@free.fr> and Patrick Dawson <pkdawson@gentoo.org> in bug #70529.

9 files changed, 202 insertions, 198 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 7815065d834f..87d7fab977b0 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/dvdstyler
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.5 2004/10/18 21:29:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.6 2004/11/21 09:43:40 dragonheart Exp $
+
+*dvdstyler-1.1 (21 Nov 2004)
+
+  21 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/1.05-AutoMakefile.patch, -files/1.05-code.patch,
+  -files/1.05-gcc34.patch, +files/1.1-AutoMakefile.patch,
+  +files/1.1-code.patch, +files/1.1-gcc34.patch, -dvdstyler-1.05-r1.ebuild,
+  +dvdstyler-1.1.ebuild:
+  version bump and cleanout. Ebuild and patches thanks to Philippe Weibel
+  <philippe.weibel@free.fr> and Patrick Dawson <pkdawson@gentoo.org> in bug
+  #70529.
 
   18 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
   dvdstyler-1.05-r1.ebuild:
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 64576426e2d0..f09170c54600 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,7 +1,17 @@
-MD5 1986d904f5961625877e2789a7d30d00 ChangeLog 1048
-MD5 f203d1f27420cf4e159ed18809106a10 dvdstyler-1.05-r1.ebuild 2071
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 91ab8b08ffb47a28acb6f4881110a17f ChangeLog 1511
 MD5 064a5e97ebac33bbf82005fffee4e20f metadata.xml 346
-MD5 367d9f832440e90da51188f7927b4d7e files/1.05-AutoMakefile.patch 5407
-MD5 17b64d2fe1f60d71550a0a8cff941e10 files/1.05-code.patch 3094
-MD5 371cffa55d3999c3330b141722406ca9 files/digest-dvdstyler-1.05-r1 66
-MD5 ded96db7f434bddeaa25a1f1796beb56 files/1.05-gcc34.patch 1093
+MD5 1dec4a059b38fc63f9d2a7534be3c32a dvdstyler-1.1.ebuild 1750
+MD5 9ce81eab104aea6c7e4e12cecbceaeee files/1.1-code.patch 3454
+MD5 b018800b008dca3d2cea1524d47ce7be files/digest-dvdstyler-1.1 66
+MD5 8c145449d787c3a629954f776193641b files/1.1-AutoMakefile.patch 4326
+MD5 b29bee8b8faea8a0b45d34e6d35cea6e files/1.1-gcc34.patch 1478
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBoGN1mdTrptrqvGERAl4AAJwORiLS11TQ+VoJFTP5qP6SjM1OCQCbBary
+OZQ8Gw2kgpRP1jocGcf4FoQ=
+=3xRq
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild b/media-video/dvdstyler/dvdstyler-1.1.ebuild
index e07a30f0027b..ea2b3085ec03 100644
--- a/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild,v 1.3 2004/10/18 21:29:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.1.ebuild,v 1.1 2004/11/21 09:43:40 dragonheart Exp $
 
 inherit eutils
 
@@ -9,26 +9,26 @@ MY_P=DVDStyler-${PV}
 DESCRIPTION="DVD filesystem Builder"
 HOMEPAGE="http://dvdstyler.sourceforge.net"
 SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+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
-	>=gnome-base/libgnomeui-2.0
 	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
@@ -46,49 +46,32 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 	epatch ${FILESDIR}/${PV}-AutoMakefile.patch
 	epatch ${FILESDIR}/${PV}-code.patch
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	sed -i -e "s:-O3::g" -e "s:wxXML/expat/Makefile::g" ${S}/configure.in ${S}/configure
-
 	cd ${S}
-	# use installed expat
-	rm -rf wxXML/expat
-
-	if [ -f ${ROOT}usr/share/aclocal/wxwin.m4 ];
-	then
-		rm -f wxwin.m4
-		ln -s ${ROOT}usr/share/aclocal/wxwin.m4
-	fi
-
-	if [ -f ${ROOT}usr/include/wx/xrc/xml.h ];
-	then
-		cd wxXML
-		rm -f xml.h
-		ln -s ${ROOT}usr/include/wx/xrc/xml.h
-	fi
 }
 
 src_compile() {
 	# Propergate automake patch
-	# autoconf
+	autoconf
 	automake
 
-	econf --with-wx-config=${ROOT}/usr/bin/wxgtk-2.4-config \
+	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
+	# 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 -C wxXML CPPFLAGS=-DSYSEXPAT=1 || die "Failed to make wxXML helpers"
 	emake || die "Failed to make"
 }
 
 
 src_install() {
-
-	emake DESTDIR=${D} install
-
+	emake DESTDIR=${D} install || die "failed to install"
 	mv ${D}usr/share/docs/DVDStyler/silence.mp2 ${D}usr/share/DVDStyler
-	mv ${D}usr/share/docs/DVDStyler ${D}usr/share/docs/${PF}
+	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/files/1.05-AutoMakefile.patch b/media-video/dvdstyler/files/1.05-AutoMakefile.patch
deleted file mode 100644
index dd1644727cf5..000000000000
--- a/media-video/dvdstyler/files/1.05-AutoMakefile.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -ru DVDStyler-1.05.orig/Makefile.am DVDStyler-1.05/Makefile.am
---- DVDStyler-1.05.orig/Makefile.am	2004-07-20 21:14:26.000000000 +0930
-+++ DVDStyler-1.05/Makefile.am	2004-08-05 08:18:54.316885328 +0930
-@@ -3,7 +3,7 @@
- 
- ACLOCAL_AMFLAGS=-I.
- 
--dist_pkgdatadir=$(prefix)
-+dist_pkgdatadir=@datadir@/docs/@PACKAGE_NAME@
- dist_pkgdata_DATA = silence.mp2 AUTHORS COPYING INSTALL README ChangeLog
- 
- run: all
-diff -ru DVDStyler-1.05.orig/backgrounds/Makefile.am DVDStyler-1.05/backgrounds/Makefile.am
---- DVDStyler-1.05.orig/backgrounds/Makefile.am	2004-06-15 20:28:06.000000000 +0930
-+++ DVDStyler-1.05/backgrounds/Makefile.am	2004-08-05 08:18:54.317885176 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=$(prefix)/backgrounds
-+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/backgrounds
- dist_pkgdata_DATA = *.jpg
-diff -ru DVDStyler-1.05.orig/buttons/Makefile.am DVDStyler-1.05/buttons/Makefile.am
---- DVDStyler-1.05.orig/buttons/Makefile.am	2004-06-15 20:28:06.000000000 +0930
-+++ DVDStyler-1.05/buttons/Makefile.am	2004-08-05 08:18:54.319884872 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=$(prefix)/buttons
-+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/buttons
- dist_pkgdata_DATA = *.xml
-diff -ru DVDStyler-1.05.orig/configure.in DVDStyler-1.05/configure.in
---- DVDStyler-1.05.orig/configure.in	2004-06-30 04:58:59.000000000 +0930
-+++ DVDStyler-1.05/configure.in	2004-08-05 08:18:54.320884720 +0930
-@@ -119,7 +119,6 @@
- 
- dnl vars
- orig_prefix=$prefix
--prefix=$prefix/dvdstyler
- AC_SUBST(orig_prefix)
- AC_SUBST(LDFLAGS)
- AC_SUBST(CFLAGS)
-diff -ru DVDStyler-1.05.orig/install.win32/Makefile.am DVDStyler-1.05/install.win32/Makefile.am
---- DVDStyler-1.05.orig/install.win32/Makefile.am	2004-06-11 20:36:10.000000000 +0930
-+++ DVDStyler-1.05/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.05.orig/locale/Makefile.in DVDStyler-1.05/locale/Makefile.in
---- DVDStyler-1.05.orig/locale/Makefile.in	2004-06-15 19:25:59.000000000 +0930
-+++ DVDStyler-1.05/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
-@@ -35,13 +35,14 @@
- 
- install: allmo
- 	linguas='$(LINGUAS)'; for lang in $$linguas ; do \
--	   $(INSTALL) -d $(DATADIR)/locale/$$lang/LC_MESSAGES ; \
--	   $(INSTALL) -m 644 $$lang/$(PROGNAME).mo $(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
-+	   $(INSTALL) -d $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES ; \
-+	   $(INSTALL) -m 644 $$lang/$(PROGNAME).mo \
-+		$(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
- 	done
- 
- uninstall:
- 	linguas='$(LINGUAS)'; for lang in $$linguas ; do \
--	   rm -f $(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
-+	   rm -f $(DESTDIR)$(DATADIR)/locale/$$lang/LC_MESSAGES/$(PROGNAME).mo ; \
- 	done
- 
- clean:
-diff -ru DVDStyler-1.05.orig/src/rc/Makefile.am DVDStyler-1.05/src/rc/Makefile.am
---- DVDStyler-1.05.orig/src/rc/Makefile.am	2004-07-04 01:42:44.000000000 +0930
-+++ DVDStyler-1.05/src/rc/Makefile.am	2004-08-05 08:18:54.325883960 +0930
-@@ -1,3 +1,3 @@
- 
--dist_pkgdatadir=@bindir@/rc
-+dist_pkgdatadir=@datadir@/@PACKAGE_NAME@/rc
- dist_pkgdata_DATA = *.png *.cur
-diff -ru DVDStyler-1.05.orig/wxXML/Makefile.am DVDStyler-1.05/wxXML/Makefile.am
---- DVDStyler-1.05.orig/wxXML/Makefile.am	2004-06-15 20:28:49.000000000 +0930
-+++ DVDStyler-1.05/wxXML/Makefile.am	2004-08-05 08:19:14.593802768 +0930
-@@ -1,6 +1,3 @@
--SUBDIRS = expat
--
- noinst_LIBRARIES = libwxxml.a
- 
- libwxxml_a_SOURCES = xml.cpp xmlhelpr.cpp
--libwxxml_a_LIBADD = expat/xmlrole.o expat/xmltok.o expat/xmlparse.o
diff --git a/media-video/dvdstyler/files/1.1-AutoMakefile.patch b/media-video/dvdstyler/files/1.1-AutoMakefile.patch
new file mode 100644
index 000000000000..a800be7e2c23
--- /dev/null
+++ b/media-video/dvdstyler/files/1.1-AutoMakefile.patch
@@ -0,0 +1,112 @@
+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.05-code.patch b/media-video/dvdstyler/files/1.1-code.patch
index 697990e27ab3..517d94e926b3 100644
--- a/media-video/dvdstyler/files/1.05-code.patch
+++ b/media-video/dvdstyler/files/1.1-code.patch
@@ -1,7 +1,7 @@
-diff -ru DVDStyler-1.05.orig/src/MainWin.cpp DVDStyler-1.05/src/MainWin.cpp
---- DVDStyler-1.05.orig/src/MainWin.cpp	2004-07-26 22:10:20.000000000 +0930
-+++ DVDStyler-1.05/src/MainWin.cpp	2004-07-30 13:44:08.146968624 +0930
-@@ -39,8 +39,8 @@
+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"
  
  
@@ -9,10 +9,10 @@ diff -ru DVDStyler-1.05.orig/src/MainWin.cpp DVDStyler-1.05/src/MainWin.cpp
 -#define BUTTONS_DIR wxGetAppPath() + _T("/../buttons")
 +#define BACKGROUNDS_DIR _T("/usr/share/DVDStyler/backgrounds")
 +#define BUTTONS_DIR _T("/usr/share/DVDStyler/buttons")
- #define DATA_DIR(fname) wxGetAppPath() + wxFILE_SEP_PATH + _T("..") + wxFILE_SEP_PATH + fname
  
  //////////////////////////// help functions //////////////////////////////////
-@@ -327,7 +327,7 @@
+ 
+@@ -322,7 +322,7 @@
  {
    ShowDirTree(false);
    m_thumbnails->Clear();
@@ -21,18 +21,9 @@ diff -ru DVDStyler-1.05.orig/src/MainWin.cpp DVDStyler-1.05/src/MainWin.cpp
    while (!fname.IsEmpty())
    {
  	wxThumb* thumb = new wxThumb(fname);
-@@ -708,7 +708,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();
-   
-diff -ru DVDStyler-1.05.orig/src/MenuBox.cpp DVDStyler-1.05/src/MenuBox.cpp
---- DVDStyler-1.05.orig/src/MenuBox.cpp	2004-07-26 22:10:59.000000000 +0930
-+++ DVDStyler-1.05/src/MenuBox.cpp	2004-07-30 13:42:34.552197192 +0930
+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;
@@ -48,9 +39,9 @@ diff -ru DVDStyler-1.05.orig/src/MenuBox.cpp DVDStyler-1.05/src/MenuBox.cpp
  #endif
      }
    }
-diff -ru DVDStyler-1.05.orig/src/dvdstyler.cpp DVDStyler-1.05/src/dvdstyler.cpp
---- DVDStyler-1.05.orig/src/dvdstyler.cpp	2004-07-04 21:12:48.000000000 +0930
-+++ DVDStyler-1.05/src/dvdstyler.cpp	2004-07-30 13:42:34.557196432 +0930
+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())
@@ -69,3 +60,23 @@ diff -ru DVDStyler-1.05.orig/src/dvdstyler.cpp DVDStyler-1.05/src/dvdstyler.cpp
  	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.05-gcc34.patch b/media-video/dvdstyler/files/1.1-gcc34.patch
index b50642df3946..d1c709b43bea 100644
--- a/media-video/dvdstyler/files/1.05-gcc34.patch
+++ b/media-video/dvdstyler/files/1.1-gcc34.patch
@@ -1,16 +1,16 @@
-diff -ur DVDStyler-1.05.orig/src/Config.h DVDStyler-1.05/src/Config.h
---- DVDStyler-1.05.orig/src/Config.h	2004-10-04 19:48:20.715719055 -0400
-+++ DVDStyler-1.05/src/Config.h	2004-10-04 19:48:57.723904668 -0400
-@@ -85,7 +85,7 @@
+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(LogFile,  _T("Generate/LogFile"), DEF_LOG_FILE)
  	CONFIG_PROP(GenerateTemp, _T("Generate/TempDir"), DEF_GEN_TEMP_DIR)
  	CONFIG_PROP(Jpeg2MpegCmd, _T("Generate/Jpeg2MpegCmd"), DEF_JPEG2MPEG_CMD)
-@@ -99,7 +99,7 @@
+ 	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)
  	
@@ -19,3 +19,12 @@ diff -ur DVDStyler-1.05.orig/src/Config.h DVDStyler-1.05/src/Config.h
  	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/digest-dvdstyler-1.05-r1 b/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1
deleted file mode 100644
index 1f4612556ac6..000000000000
--- a/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36e67e16085020305efdb3a008457de1 DVDStyler-1.05.tar.gz 596952
diff --git a/media-video/dvdstyler/files/digest-dvdstyler-1.1 b/media-video/dvdstyler/files/digest-dvdstyler-1.1
new file mode 100644
index 000000000000..4e8e54544c0f
--- /dev/null
+++ b/media-video/dvdstyler/files/digest-dvdstyler-1.1
@@ -0,0 +1 @@
+MD5 219d138c141eed5a06db1b344ca62d95 DVDStyler-1.1.tar.gz 1147550