add missing xmlto dependency as was noticed on irc #gentoo (by I forget who). Added version bump

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 149 insertions, 4 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 3338213d038f..bec46178c2a4 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/dvdstyler
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.38 2009/09/16 11:14:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.39 2009/10/14 07:16:49 dragonheart Exp $
+
+*dvdstyler-1.7.4 (14 Oct 2009)
+
+  14 Oct 2009; Daniel Black <dragonheart@gentoo.org>
+  dvdstyler-1.7.4_rc1.ebuild, +dvdstyler-1.7.4.ebuild,
+  +files/dvdstyler-1.7.4-autoconf.patch:
+  add missing xmlto dependency as was noticed on irc #gentoo (by I forget
+  who). Added version bump
 
 *dvdstyler-1.7.4_rc1 (16 Sep 2009)
 
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index e9a084a8841a..1782e4b31b81 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,10 +1,13 @@
 AUX dvdstyler-1.7.2-skipxmlvalidation.patch 623 RMD160 a836ceffdfbf625b2d3c75585ad98eb8e6ecf4bb SHA1 7580daa5da0efc89f82b36837f2a55352ce79d31 SHA256 5e620ae9b3e9bd3491c3e6e2fab13622abd11d6bd433ab94fd8b9adbe8a3e020
 AUX dvdstyler-1.7.3_beta3_p1-link_to_wxgtk_adv.patch 562 RMD160 1d144d5c002a32fd988f592200c38aee7aaadcbd SHA1 e1c7e2eac69b19fcd007360c39c89c8f9f2cb2cd SHA256 5a7c17c60a35393fdfcaf19ada8f8e62c56ddef690127f020928e41e9b45f7f7
+AUX dvdstyler-1.7.4-autoconf.patch 3058 RMD160 d3f3263edfb55729a6e8ecb83b00126e328fa25b SHA1 5a386c3a8ecd6afb58cc19653e4a65f3b46b2f2d SHA256 b85ca996bb831f79d2e61497d09f19313db097207935d3727f145354f8108143
 DIST DVDStyler-1.7.2.tar.bz2 1151254 RMD160 926952466c1277be96673fb625d5beaac2e79e6a SHA1 b44089c894c731ea703cf8175dafc81958dbfe40 SHA256 312dea3af5ed984ec12c53ba31f2038d2bd8206a5b5c3bc342837504e00bb9e8
 DIST DVDStyler-1.7.3b3_1.tar.bz2 1180201 RMD160 e57093841aef80441a56e221980c0225421f521f SHA1 ca0cc47a5d2db09e4f6857d7681c57bd952e82fc SHA256 6cd7a76e031a8c85db2f7bc2ffb231d28e1f2e4430656fe0d2ae92ad3f5b61f9
+DIST DVDStyler-1.7.4.tar.bz2 1652556 RMD160 e8d769aad270b391d814ef83cba0e951fe18cce9 SHA1 c39d68e61ce3eff97410648ddf6607cc60dc7abb SHA256 475656dc07dbaf18c4e1771c9634bfbd74bffc1a53616bce46c094a82683ad5b
 DIST DVDStyler-1.7.4rc1.tar.bz2 1647217 RMD160 2f85415e685108413cdbc4549bd5c9041c147591 SHA1 ad2099776a7b4d07f6b78057ada5310022677859 SHA256 bc89c436eab0ad5018901c2ee8bbde8d15efe5ad5463ee7356fd4c66b7a5a64f
 EBUILD dvdstyler-1.7.2.ebuild 1400 RMD160 dad81acc10cf1a0e3397afbdb66229216f0d5b74 SHA1 59300cd8728d83700ca2f9c51245e5fbe9672f82 SHA256 48c503494159cfd1d82248cea9f66dd94b4491fdba69693b88ad93afbcd350a9
 EBUILD dvdstyler-1.7.3_beta3_p1.ebuild 1579 RMD160 a2e4ba734e0d2c2c6e8e9e927a3bcf700df3dba5 SHA1 b468288068cc04a0fdc7789e5c685e89bb309a31 SHA256 3635c707cfd6e8420275cc308f704a46b87f61bb2381bc5136bc19b73cc3948a
-EBUILD dvdstyler-1.7.4_rc1.ebuild 1342 RMD160 b3069ce4790e3b23badc12258eb6211dac8aefdc SHA1 94e7640249f6a5560781e093cbbbbfbbab9d40a5 SHA256 4104943978c0e744b50d3798a578a0329016e25306513c9baf1b8ad5b8c86737
-MISC ChangeLog 7417 RMD160 d77a6fb9f8eb1f4a4b845ebf452fb5f1f450b04c SHA1 98bfdd709b64c386dabfc37ca2d5967393ca6855 SHA256 4608e6a8c1af6f9599477ed828c7e6b4c3d10f39d17a7d1b615b8318446f2cb9
+EBUILD dvdstyler-1.7.4.ebuild 1392 RMD160 ec193c6a18c7797e7ad62a4ce2f0f43b7f076c1b SHA1 e411afb557320a6c9f94fb367275f710fe2ee847 SHA256 511302f3041d657b8660be3916a8edf37d790109c07911433b2d38fd1034c7b2
+EBUILD dvdstyler-1.7.4_rc1.ebuild 1360 RMD160 c2233b71d730cfa2178fbcb17996644c7a205c2b SHA1 b45be81aacbec7418452e0eb1f65449f98011010 SHA256 b4985b71db0414a17f2e7172f9af1cdba7cdd36027406fc1c1087a0da62358dc
+MISC ChangeLog 7702 RMD160 bc3f03da7291463421d42fe72f23b44fb64da5ad SHA1 f201016efb450370c19757f8fb67cb0ee86d8081 SHA256 047265e2124a8be03da8a89d9af254a9e70ac155964d84a69498d8a791872cde
 MISC metadata.xml 253 RMD160 4017dbee50ab0fca6eee1ae8103bdcba5e3ec08c SHA1 eba5ea7101cd9bb7d2e8acbd28507cd49268d8b2 SHA256 4d56e96fb54c7825dbf341dbac673b7bbae83b48ee32352091126c632ac09239
diff --git a/media-video/dvdstyler/dvdstyler-1.7.4.ebuild b/media-video/dvdstyler/dvdstyler-1.7.4.ebuild
new file mode 100644
index 000000000000..552ca4299221
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-1.7.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.7.4.ebuild,v 1.1 2009/10/14 07:16:49 dragonheart Exp $
+
+EAPI=2
+inherit autotools wxwidgets eutils
+
+MY_P=${PN/dvds/DVDS}-${PV/_}
+
+DESCRIPTION="DVDStyler is a cross-platform DVD authoring System"
+HOMEPAGE="http://www.dvdstyler.de"
+SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnome"
+
+COMMON_DEPEND=">=media-video/ffmpeg-0.5[encode]
+	>=media-video/xine-ui-0.99.1
+	x11-libs/wxGTK:2.8
+	>=media-libs/wxsvg-1[ffmpeg]
+	>=media-libs/libexif-0.6.16
+	gnome? ( >=gnome-base/libgnomeui-2 )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/cdrtools
+	>=media-video/dvdauthor-0.6.14
+	>=app-cdr/dvd+rw-tools-7.1"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	app-text/xmlto
+	>=sys-devel/gettext-0.17"
+PDEPEND=">=app-cdr/dvdisaster-0.71.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autoconf.patch
+	eautoreconf
+}
+
+src_configure() {
+	export WX_GTK_VER="2.8"
+	need-wxwidgets gtk2
+	econf \
+	 	--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		--with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	#rm -rf "${D}"/usr/share/doc/${PN}
+	#dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild b/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild
index 667a25cb2119..ca4ab63881e1 100644
--- a/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild,v 1.1 2009/09/16 11:14:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.7.4_rc1.ebuild,v 1.2 2009/10/14 07:16:49 dragonheart Exp $
 
 EAPI=2
 inherit autotools wxwidgets
@@ -28,6 +28,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=app-cdr/dvd+rw-tools-7.1"
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
+	app-text/xmlto
 	>=sys-devel/gettext-0.17"
 PDEPEND=">=app-cdr/dvdisaster-0.71.0"
 
diff --git a/media-video/dvdstyler/files/dvdstyler-1.7.4-autoconf.patch b/media-video/dvdstyler/files/dvdstyler-1.7.4-autoconf.patch
new file mode 100644
index 000000000000..a9d6a2b278eb
--- /dev/null
+++ b/media-video/dvdstyler/files/dvdstyler-1.7.4-autoconf.patch
@@ -0,0 +1,77 @@
+--- /tmp/DVDStyler-1.7.4/./src/Makefile.am	2009-09-04 15:49:32.000000000 +1000
++++ ./src/Makefile.am	2009-10-14 15:34:46.000000000 +1100
+@@ -7,7 +7,7 @@
+  VobListBox.cpp TitlePropDlg.cpp TitlesetManager.cpp\
+  BurnDlg.cpp ProgressDlg.cpp DirCtrl.cpp StatusBar.cpp MainWin.cpp dvdstyler.cpp
+ 
+-CXXFLAGS = @CXXFLAGS@ -I..
++AM_CXXFLAGS = @CXXFLAGS@ -I..
+ LDADD = ../wxVillaLib/libwxvilla.a
+ 
+ SUBDIRS = rc
+--- /tmp/DVDStyler-1.7.4/./Makefile.am	2008-07-15 07:58:46.000000000 +1000
++++ ./Makefile.am	2009-10-14 15:23:26.000000000 +1100
+@@ -1,6 +1,5 @@
+ SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs
+ ACLOCAL_AMFLAGS=-I.
+-pkgdatadir=@datadir@/doc/@PACKAGE@
+-pkgdata_DATA = AUTHORS COPYING INSTALL README ChangeLog
++doc_DATA = AUTHORS COPYING INSTALL README ChangeLog
+ run: all
+ 	$(MAKE) -C src run
+--- /tmp/DVDStyler-1.7.4/./wxVillaLib/Makefile.am	2007-12-31 09:51:35.000000000 +1100
++++ ./wxVillaLib/Makefile.am	2009-10-14 15:35:32.000000000 +1100
+@@ -3,4 +3,4 @@
+  PipeExecute.cpp PropDlg.cpp SConv.cpp\
+  Thumbnails.cpp ThumbnailFactory.cpp\
+  utils.cpp VerticalToolbar.cpp
+-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG
++AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG
+--- /tmp/DVDStyler-1.7.4/locale/Makefile.in	2009-09-19 18:46:38.000000000 +1000
++++ locale/Makefile.in	2009-10-14 15:46:49.000000000 +1100
+@@ -4,8 +4,10 @@
+ # building lang.mo files from the translated lang.po catalogs.
+ 
+ PROGNAME=dvdstyler
+-LINGUAS=cs da de el es eu fr hu it ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW
+-LINGUAS_ALL=ca cs da de el es eu fr hu it ja ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW
++# ls *.po | cut -f1 -d . | xargs echo  >> Makefile.in          
++LINGUAS=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW
++LINGUAS_ALL=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW
++
+ 
+ prefix=@prefix@
+ datarootdir=@datarootdir@
+--- /tmp/DVDStyler-1.7.4/docs/Makefile.am	2009-08-30 00:30:10.000000000 +1000
++++ docs/Makefile.am	2009-10-14 16:08:10.000000000 +1100
+@@ -1,22 +1,19 @@
+-pkgdatadir=@datadir@/man/man1
+-pkgdata_DATA = dvdstyler.1
++dist_man_MANS = dvdstyler.1
+ 
+ LINGUAS=en de
+-docdir=@datadir@/@PACKAGE@/docs
+ doc_DATA = $(LINGUAS:%=help_%.zip)
+ 
+ help%.zip: DVDStylerGuide%.xml
+-	mkdir temp
+-	(cd temp && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html)
+-	rm -f temp/*.html
+-	rmdir temp
++	t=`mktemp -d tempXXXXXXX`; \
++	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html) ; \
++	rm -f "$$t"/*.html ; \
++	rmdir "$$t"
+ 	$(ZIP) help$*.zip htmlhelp.hhp toc.hhc images/*.png
+ 
+ html: $(LINGUAS:%=html_%)
+ 
+ html%: DVDStylerGuide%.xml
+-	rm -rf html$*
+-	mkdir html$*
+-	(cd html$* && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*)
+-	mkdir html$*/images
++	t=`mktemp -d htmlXXXXXX` ; \
++	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*) ; \
++	mkdir "$$t"/images
+ 	cp images/*.png html$*/images/