Changed to use installed dev-libs/expat rather than one that came with the package. Also moved silence.mp2 to the correct directory.

5 files changed, 60 insertions, 20 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 42abd066c1f6..02282eda2b32 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2004/07/30 07:27:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.3 2004/08/05 01:50:43 dragonheart Exp $
+
+*dvdstyler-1.05-r1 (05 Aug 2004)
+
+  05 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  files/1.05-AutoMakefile.patch, +dvdstyler-1.05-r1.ebuild,
+  -dvdstyler-1.05.ebuild:
+  Changed to use installed dev-libs/expat rather than one that came with the
+  package. Also moved silence.mp2 to the correct directory.
 
 *dvdstyler-1.05 (30 Jul 2004)
 
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 6d783a4da501..bc02e0591723 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b76e687b215f136bc9576296151c389d dvdstyler-1.05.ebuild 1416
 MD5 3c40f8c79661f51d37be553c6aff1361 metadata.xml 352
-MD5 dbde5c3974319d588410638bd790f23d ChangeLog 501
-MD5 371cffa55d3999c3330b141722406ca9 files/digest-dvdstyler-1.05 66
+MD5 343b538200c53515efb51c524e1a2510 ChangeLog 812
+MD5 4b398ed95ba672a61436e0188ab05c24 dvdstyler-1.05-r1.ebuild 2028
+MD5 371cffa55d3999c3330b141722406ca9 files/digest-dvdstyler-1.05-r1 66
 MD5 17b64d2fe1f60d71550a0a8cff941e10 files/1.05-code.patch 3094
-MD5 a9cd7610657a1e958ddbb0c5102256ce files/1.05-AutoMakefile.patch 4996
+MD5 367d9f832440e90da51188f7927b4d7e files/1.05-AutoMakefile.patch 5407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBCfaZmdTrptrqvGERAuCFAJ41lT0IvKqceZjuVquWLUtnXn5b6gCgmHW4
-X2MLA749i4Qg8D8DIfPTkTw=
-=KYQc
+iD8DBQFBEYcumdTrptrqvGERAmz1AJ9CFWr+FNI5VienWHKhF9qe0+g1DQCfTflQ
+sE/jb9wBWVE0MjV5aQDw0jE=
+=god6
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.05.ebuild b/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild
index fa38979a456b..59ca01cbeb13 100644
--- a/media-video/dvdstyler/dvdstyler-1.05.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.05-r1.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.ebuild,v 1.1 2004/07/30 04:59:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild,v 1.1 2004/08/05 01:50:43 dragonheart Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ RDEPEND="virtual/x11
 	media-video/mpgtx
 	>=gnome-base/libgnomeui-2.0
 	x11-libs/gtk+
+	dev-libs/expat
 	virtual/libc
 	media-libs/tiff
 	media-libs/libpng
@@ -47,7 +48,24 @@ src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}-AutoMakefile.patch
 	epatch ${FILESDIR}/${PV}-code.patch
-	sed -i -e "s:-O3::g" ${S}/configure.in ${S}/configure
+	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() {
@@ -55,11 +73,14 @@ src_compile() {
 	# autoconf
 	automake
 
-	econf || die "Failed to configure"
+	econf --with-wx-config=${ROOT}/usr/bin/wxgtk-2.4-config \
+		|| 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 || dir "Failed to make"
+	emake -C wxXML CPPFLAGS=-DSYSEXPAT=1 || die "Failed to make wxXML helpers"
+	emake || die "Failed to make"
 }
 
 
@@ -67,5 +88,6 @@ src_install() {
 
 	emake DESTDIR=${D} install
 
-	mv ${D}/usr/share/docs/DVDStyler ${D}/usr/share/docs/${PF}
+	mv ${D}usr/share/docs/DVDStyler/silence.mp2 ${D}usr/share/DVDStyler
+	mv ${D}usr/share/docs/DVDStyler ${D}usr/share/docs/${PF}
 }
diff --git a/media-video/dvdstyler/files/1.05-AutoMakefile.patch b/media-video/dvdstyler/files/1.05-AutoMakefile.patch
index 5d2b338b2ec0..dd1644727cf5 100644
--- a/media-video/dvdstyler/files/1.05-AutoMakefile.patch
+++ b/media-video/dvdstyler/files/1.05-AutoMakefile.patch
@@ -1,6 +1,6 @@
 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-07-30 08:39:40.566063040 +0930
++++ DVDStyler-1.05/Makefile.am	2004-08-05 08:18:54.316885328 +0930
 @@ -3,7 +3,7 @@
  
  ACLOCAL_AMFLAGS=-I.
@@ -12,7 +12,7 @@ diff -ru DVDStyler-1.05.orig/Makefile.am DVDStyler-1.05/Makefile.am
  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-07-30 08:37:53.152392400 +0930
++++ DVDStyler-1.05/backgrounds/Makefile.am	2004-08-05 08:18:54.317885176 +0930
 @@ -1,3 +1,3 @@
  
 -dist_pkgdatadir=$(prefix)/backgrounds
@@ -20,7 +20,7 @@ diff -ru DVDStyler-1.05.orig/backgrounds/Makefile.am DVDStyler-1.05/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-07-30 08:38:19.326413344 +0930
++++ DVDStyler-1.05/buttons/Makefile.am	2004-08-05 08:18:54.319884872 +0930
 @@ -1,3 +1,3 @@
  
 -dist_pkgdatadir=$(prefix)/buttons
@@ -28,7 +28,7 @@ diff -ru DVDStyler-1.05.orig/buttons/Makefile.am DVDStyler-1.05/buttons/Makefile
  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-07-30 08:36:47.052441120 +0930
++++ DVDStyler-1.05/configure.in	2004-08-05 08:18:54.320884720 +0930
 @@ -119,7 +119,6 @@
  
  dnl vars
@@ -39,7 +39,7 @@ diff -ru DVDStyler-1.05.orig/configure.in DVDStyler-1.05/configure.in
  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-07-30 08:36:36.990970696 +0930
++++ DVDStyler-1.05/install.win32/Makefile.am	2004-08-05 08:18:54.322884416 +0930
 @@ -7,13 +7,13 @@
  
  if USE_KDE
@@ -84,7 +84,7 @@ diff -ru DVDStyler-1.05.orig/install.win32/Makefile.am DVDStyler-1.05/install.wi
  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-07-30 08:42:04.506180816 +0930
++++ DVDStyler-1.05/locale/Makefile.in	2004-08-05 08:18:54.323884264 +0930
 @@ -9,7 +9,7 @@
  LINGUAS=de it ru
  
@@ -114,9 +114,19 @@ diff -ru DVDStyler-1.05.orig/locale/Makefile.in DVDStyler-1.05/locale/Makefile.i
  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-07-30 08:38:58.600442784 +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/digest-dvdstyler-1.05 b/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1
index 1f4612556ac6..1f4612556ac6 100644
--- a/media-video/dvdstyler/files/digest-dvdstyler-1.05
+++ b/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1