Move joystick use flags around, fix nls build, bug 157064

Package-Manager: portage-2.1.1-r2

diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index 61890b1eb23b60b273872b02c774a1193e01e528..74942733a2b1839a1b90ae8110366d95ded98e22 100644 (file)
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/oxine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.21 2006/12/21 16:36:52 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.22 2006/12/21 16:39:01 beandog Exp $
+
+*oxine-0.6.3-r1 (21 Dec 2006)
+
+  21 Dec 2006; Steve Dibb <beandog@gentoo.org> +oxine-0.6.3-r1.ebuild:
+  Move joystick use flags around, fix nls build, bug 157064
 
   21 Dec 2006; Steve Dibb <beandog@gentoo.org> oxine-0.5.ebuild,
   oxine-0.6.3.ebuild:

diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index 348c011229aa78e2ea3f5814686ea1c75dcf2803..1b351cb21848e7aac4a73f8bafb0c63e895da4e0 100644 (file)
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -5,14 +5,18 @@ EBUILD oxine-0.5.ebuild 3046 RMD160 113f500ffd820fdd2bc361ccdd0c8a988bf4ea68 SHA
 MD5 5beff7d8a14ae4989ce9767d70387fb6 oxine-0.5.ebuild 3046
 RMD160 113f500ffd820fdd2bc361ccdd0c8a988bf4ea68 oxine-0.5.ebuild 3046
 SHA256 262795921a67bc22a379bbb923a539d0ab0b3148126a565239a44d71a661ea79 oxine-0.5.ebuild 3046
+EBUILD oxine-0.6.3-r1.ebuild 3372 RMD160 fecb34c13f13a2bb703334eb3694079959d822b5 SHA1 78d8f53179e68978a06566e95ff3f5c6c972a6bb SHA256 111e6922ae75839054c9432b181a14f0b921742acb1012e7b1e5ee12d99b6fe3
+MD5 cc2180f7fa9797d225df601fb37c8506 oxine-0.6.3-r1.ebuild 3372
+RMD160 fecb34c13f13a2bb703334eb3694079959d822b5 oxine-0.6.3-r1.ebuild 3372
+SHA256 111e6922ae75839054c9432b181a14f0b921742acb1012e7b1e5ee12d99b6fe3 oxine-0.6.3-r1.ebuild 3372
 EBUILD oxine-0.6.3.ebuild 3295 RMD160 441d19f9d37d99dafc60e8f286ec35a0e36d70e7 SHA1 25197649700fbfc0c448db5f291d1a399259e108 SHA256 f300e766f6890cc7199f6176e70559619f9c2991cda73e346f607cf96a113813
 MD5 6d80c0ba457ad822cafbb59b250aefa2 oxine-0.6.3.ebuild 3295
 RMD160 441d19f9d37d99dafc60e8f286ec35a0e36d70e7 oxine-0.6.3.ebuild 3295
 SHA256 f300e766f6890cc7199f6176e70559619f9c2991cda73e346f607cf96a113813 oxine-0.6.3.ebuild 3295
-MISC ChangeLog 2587 RMD160 1f206ce0044664be6ee011d267247c782e7197a0 SHA1 bfdc254e0f0822a15683bd41a05ec1f273ab37d8 SHA256 4e60e66f4a930a98a3ca25a8360f23c14b8a0685e41abba881ac59302709e8f9
-MD5 5d34ca08e6dd22d59f7495ca02f1dd15 ChangeLog 2587
-RMD160 1f206ce0044664be6ee011d267247c782e7197a0 ChangeLog 2587
-SHA256 4e60e66f4a930a98a3ca25a8360f23c14b8a0685e41abba881ac59302709e8f9 ChangeLog 2587
+MISC ChangeLog 2750 RMD160 64854b8790a3ef5ecedd268824ef145794879285 SHA1 bfba60ba8a2d4edf3b68a494ebcdd88dd1047e58 SHA256 05c9581f0e9da76d7a0005a02a594ddc4922a2fa623990df2fe3d501d11c9ab4
+MD5 67944f71437f134aab790eda825090c9 ChangeLog 2750
+RMD160 64854b8790a3ef5ecedd268824ef145794879285 ChangeLog 2750
+SHA256 05c9581f0e9da76d7a0005a02a594ddc4922a2fa623990df2fe3d501d11c9ab4 ChangeLog 2750
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -23,3 +27,6 @@ SHA256 19f21104f1b367ffbc5a4c69aafb5e303b0ee997246f99e4b65629c9dc790da8 files/di
 MD5 5caa823b527d355b18145f5c08a9ef98 files/digest-oxine-0.6.3 491
 RMD160 9909705ed088ea2721f669997fa88a944b70848e files/digest-oxine-0.6.3 491
 SHA256 11251e9d2a83ba97ffb6918edc5d2509f66683a22936152df6b853f2cdad7ac8 files/digest-oxine-0.6.3 491
+MD5 5caa823b527d355b18145f5c08a9ef98 files/digest-oxine-0.6.3-r1 491
+RMD160 9909705ed088ea2721f669997fa88a944b70848e files/digest-oxine-0.6.3-r1 491
+SHA256 11251e9d2a83ba97ffb6918edc5d2509f66683a22936152df6b853f2cdad7ac8 files/digest-oxine-0.6.3-r1 491

diff --git a/media-video/oxine/files/digest-oxine-0.6.3-r1 b/media-video/oxine/files/digest-oxine-0.6.3-r1
new file mode 100644 (file)
index 0000000..b058add
--- /dev/null
+++ b/media-video/oxine/files/digest-oxine-0.6.3-r1
@@ -0,0 +1,6 @@
+MD5 618a8cb76ca0f6b3d21c5f8e2be75d72 oxine-0.6.tar.gz 8336102
+RMD160 8d9ba313cbb24d8f2011d58035ca87da41df4982 oxine-0.6.tar.gz 8336102
+SHA256 3c02716dcaecf98e518aaf8b04f16d387c73bcf1aa21f71f60684f1a7e5956d2 oxine-0.6.tar.gz 8336102
+MD5 18c2c27a198ffeb8f271d984d57c5a78 oxine-0_6_0-to-0_6_3.patch 603146
+RMD160 95fe1124bd070a4330534dc2742a05cb8deff062 oxine-0_6_0-to-0_6_3.patch 603146
+SHA256 32531361b3ec6579e598259ab90cf9f685491fbee7be735c17e3db10d8e88816 oxine-0_6_0-to-0_6_3.patch 603146

diff --git a/media-video/oxine/oxine-0.6.3-r1.ebuild b/media-video/oxine/oxine-0.6.3-r1.ebuild
new file mode 100644 (file)
index 0000000..310435f
--- /dev/null
+++ b/media-video/oxine/oxine-0.6.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.6.3-r1.ebuild,v 1.1 2006/12/21 16:39:01 beandog Exp $
+
+WANT_AUTOMAKE="1.9"
+inherit eutils autotools
+
+MY_P="${PN}-0.6"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="OSD frontend for xine"
+HOMEPAGE="http://oxine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/oxine/${MY_P}.tar.gz
+       mirror://sourceforge/oxine/${PN}-0_6_0-to-0_6_3.patch"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="X curl debug dvb jpeg nls png polling lirc v4l input_devices_joystick"
+
+DEPEND="media-libs/xine-lib
+       curl? ( net-misc/curl )
+       input_devices_joystick? ( media-libs/libjsw )
+       jpeg? ( media-gfx/imagemagick
+               media-libs/netpbm
+               media-video/mjpegtools )
+       lirc? ( app-misc/lirc )
+       nls? ( virtual/libintl sys-devel/gettext )
+       png? ( media-gfx/imagemagick
+               media-libs/netpbm
+               media-video/mjpegtools )
+       X? ( || ( ( x11-libs/libXext x11-libs/libX11 ) <virtual/x11-7 ) )
+       virtual/eject"
+
+pkg_setup() {
+
+       # Check for USE flag deps
+       ewarn "Checking USE flags of dependencies .. this may take a moment"
+
+       # Video4Linux support
+       if use v4l && ! built_with_use media-libs/xine-lib v4l ; then
+               eerror "Re-emerge xine-lib with the 'v4l' USE flag"
+               REBUILD_DEPS=1
+       fi
+
+       # X
+       if ! built_with_use media-libs/xine-lib X ; then
+               eerror "Re-emerge xine-lib with the 'X' USE flag"
+               REBUILD_DEPS=1
+       fi
+
+       # Image support
+       if (use png || use jpeg ) && ! built_with_use media-libs/netpbm zlib ; then
+               eerror "In order to enable image support, media-libs/netpbm must be"
+               eerror "emerged with the 'zlib' USE flag"
+               REBUILD_DEPS=1
+       fi
+
+       if (use png || use jpeg ) && ! built_with_use media-libs/netpbm png ; then
+               eerror "To view PNG images, media-libs/netpbm must be emerged with"
+               eerror "the 'png' USE flag"
+               REBUILD_DEPS=1
+       fi
+
+       if (use png || use jpeg ) && ! built_with_use media-libs/netpbm jpeg ; then
+               eerror "To view JPEG images, media-libs/netpbm must be emerged with"
+               eerror "with the 'jpeg' USE flag"
+               REBUILD_DEPS=1
+       fi
+
+       if [[ ${REBUILD_DEPS} = 1 ]]; then
+               eerror "Check your USE flags, re-emerge the dependencies and then"
+               eerror "emerge this package."
+               die
+       fi
+
+}
+
+src_unpack() {
+       unpack ${MY_P}.tar.gz
+       cd ${S}
+       epatch ${DISTDIR}/${PN}-0_6_0-to-0_6_3.patch
+       AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+
+       # Note: Initial testing on amd64 indicates that the build will break
+       # on --disable-curltest or --disable-xinetest so don't enable them
+       # if debug is set.
+
+       # Note on images: Image support will be automatically disabled if
+       # netpbm, imagemagick or mjpegtools is not installed, irregardless
+       # of what the USE flags are set to.
+
+       # If one of the image USE flags is unset, disable image support
+       if use !png && use !jpeg ; then
+               myconf="${myconf} --disable-images"
+       fi
+
+       econf ${myconf} \
+               $( use_with X x ) \
+               $( use_with curl ) \
+               $( use_enable curl curltest ) \
+               $( use_enable debug ) \
+               $( use_enable dvb ) \
+               $( use_enable input_devices_joystick joystick ) \
+               $( use_enable lirc ) \
+               $( use_enable nls ) \
+               $( use_enable polling ) \
+               $( use_enable v4l ) \
+               --disable-rpath --disable-weather || die "econf died"
+       emake || die "emake failed"
+}
+
+src_install() {
+
+       emake DESTDIR="${D}" install || die "emake install died"
+
+       dodoc AUTHORS ChangeLog NEWS README TODO
+       dohtml doc/doc.html
+
+}