From 85a07c6d6a368ef6eda5e58c17b200d9abbe4d50 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 5 Aug 2004 01:50:43 +0000 Subject: Changed to use installed dev-libs/expat rather than one that came with the package. Also moved silence.mp2 to the correct directory. --- media-video/dvdstyler/ChangeLog | 10 ++- media-video/dvdstyler/Manifest | 16 +--- media-video/dvdstyler/dvdstyler-1.05-r1.ebuild | 93 ++++++++++++++++++++++ media-video/dvdstyler/dvdstyler-1.05.ebuild | 71 ----------------- .../dvdstyler/files/1.05-AutoMakefile.patch | 24 ++++-- media-video/dvdstyler/files/digest-dvdstyler-1.05 | 1 - .../dvdstyler/files/digest-dvdstyler-1.05-r1 | 1 + 7 files changed, 123 insertions(+), 93 deletions(-) create mode 100644 media-video/dvdstyler/dvdstyler-1.05-r1.ebuild delete mode 100644 media-video/dvdstyler/dvdstyler-1.05.ebuild delete mode 100644 media-video/dvdstyler/files/digest-dvdstyler-1.05 create mode 100644 media-video/dvdstyler/files/digest-dvdstyler-1.05-r1 (limited to 'media-video/dvdstyler') 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 + 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..42712a2ae41e 100644 --- a/media-video/dvdstyler/Manifest +++ b/media-video/dvdstyler/Manifest @@ -1,16 +1,6 @@ ------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 086aa7de4c5ceb954f546d0d1be05430 dvdstyler-1.05-r1.ebuild 1840 +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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFBCfaZmdTrptrqvGERAuCFAJ41lT0IvKqceZjuVquWLUtnXn5b6gCgmHW4 -X2MLA749i4Qg8D8DIfPTkTw= -=KYQc ------END PGP SIGNATURE----- +MD5 367d9f832440e90da51188f7927b4d7e files/1.05-AutoMakefile.patch 5407 diff --git a/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild b/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild new file mode 100644 index 000000000000..59ca01cbeb13 --- /dev/null +++ b/media-video/dvdstyler/dvdstyler-1.05-r1.ebuild @@ -0,0 +1,93 @@ +# 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.1 2004/08/05 01:50:43 dragonheart 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" +RESTRICT="nomirror" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" +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 + 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 + dev-libs/glib + sys-libs/zlib + app-cdr/dvd+rw-tools + app-cdr/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}-AutoMakefile.patch + epatch ${FILESDIR}/${PV}-code.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 + automake + + 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 -C wxXML CPPFLAGS=-DSYSEXPAT=1 || die "Failed to make wxXML helpers" + emake || die "Failed to make" +} + + +src_install() { + + emake DESTDIR=${D} install + + 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/dvdstyler-1.05.ebuild b/media-video/dvdstyler/dvdstyler-1.05.ebuild deleted file mode 100644 index fa38979a456b..000000000000 --- a/media-video/dvdstyler/dvdstyler-1.05.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# 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 $ - -inherit eutils - -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" -IUSE="" -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 - media-video/mpgtx - >=gnome-base/libgnomeui-2.0 - x11-libs/gtk+ - virtual/libc - media-libs/tiff - media-libs/libpng - media-libs/jpeg - dev-libs/glib - sys-libs/zlib - app-cdr/dvd+rw-tools - app-cdr/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}-AutoMakefile.patch - epatch ${FILESDIR}/${PV}-code.patch - sed -i -e "s:-O3::g" ${S}/configure.in ${S}/configure -} - -src_compile() { - # Propergate automake patch - # autoconf - automake - - econf || die "Failed to configure" - - sed -i -e "s:^prefix=.*${PN}\$::g" configure* - - emake || dir "Failed to make" -} - - -src_install() { - - emake DESTDIR=${D} install - - 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 deleted file mode 100644 index 1f4612556ac6..000000000000 --- a/media-video/dvdstyler/files/digest-dvdstyler-1.05 +++ /dev/null @@ -1 +0,0 @@ -MD5 36e67e16085020305efdb3a008457de1 DVDStyler-1.05.tar.gz 596952 diff --git a/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1 b/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1 new file mode 100644 index 000000000000..1f4612556ac6 --- /dev/null +++ b/media-video/dvdstyler/files/digest-dvdstyler-1.05-r1 @@ -0,0 +1 @@ +MD5 36e67e16085020305efdb3a008457de1 DVDStyler-1.05.tar.gz 596952 -- cgit v1.2.3-65-gdbad