Version bump. Patch Makefile.in instead of Makefile.am to avoid the need for .m4 macro from gtk-doc wrt #205755. Stop depending on gtk-doc, the documentation has been prebuilt and is installed anyway.

(Portage version: 2.1.4)

6 files changed, 34 insertions, 24 deletions

diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index f1084923e2df..4a1a40024e37 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/schroedinger
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.7 2007/09/23 13:50:29 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.8 2008/01/26 08:35:04 drac Exp $
+
+*schroedinger-0.9.0 (26 Jan 2008)
+
+  26 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/schroedinger-0.6.1-asneeded.patch,
+  +files/schroedinger-0.9.0-asneeded.patch, -schroedinger-0.6.1.ebuild,
+  +schroedinger-0.9.0.ebuild:
+  Version bump. Patch Makefile.in instead of Makefile.am to avoid the need for
+  .m4 macro from gtk-doc wrt #205755. Stop depending on gtk-doc, the
+  documentation has been prebuilt and is installed anyway.
 
 *schroedinger-0.6.1 (23 Sep 2007)
 
diff --git a/media-libs/schroedinger/files/digest-schroedinger-0.6.1 b/media-libs/schroedinger/files/digest-schroedinger-0.6.1
deleted file mode 100644
index ea6d5a8b88c0..000000000000
--- a/media-libs/schroedinger/files/digest-schroedinger-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 66cb093505f9d56068e80ebc4e674275 schroedinger-0.6.1.tar.gz 531849
-RMD160 598ea8941cf44df46d995ec09d259b2f7b4fd890 schroedinger-0.6.1.tar.gz 531849
-SHA256 a6d4e3f5a390bc7880836d052d0b671d6edafca1899fc945e41dc70aa7e70c04 schroedinger-0.6.1.tar.gz 531849
diff --git a/media-libs/schroedinger/files/digest-schroedinger-0.9.0 b/media-libs/schroedinger/files/digest-schroedinger-0.9.0
new file mode 100644
index 000000000000..f08352818b3b
--- /dev/null
+++ b/media-libs/schroedinger/files/digest-schroedinger-0.9.0
@@ -0,0 +1,3 @@
+MD5 06aff4ff30a9a6ac05b3ba4f35398779 schroedinger-0.9.0.tar.gz 713773
+RMD160 279b57148bfd8f81120e598b91fd128d4ff87848 schroedinger-0.9.0.tar.gz 713773
+SHA256 ac078d33d4d44ac0dc4e0abc73fde6f8fe7dd024d2d9518bdceed6d9e1aca94d schroedinger-0.9.0.tar.gz 713773
diff --git a/media-libs/schroedinger/files/schroedinger-0.6.1-asneeded.patch b/media-libs/schroedinger/files/schroedinger-0.6.1-asneeded.patch
deleted file mode 100644
index f48450cce90f..000000000000
--- a/media-libs/schroedinger/files/schroedinger-0.6.1-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur schroedinger-0.6.1.orig/schroedinger/Makefile.am schroedinger-0.6.1/schroedinger/Makefile.am
---- schroedinger-0.6.1.orig/schroedinger/Makefile.am	2007-04-25 18:44:46.000000000 +0300
-+++ schroedinger-0.6.1/schroedinger/Makefile.am	2007-09-23 16:44:12.000000000 +0300
-@@ -59,7 +59,7 @@
- 	schrowavelet.c
- 
- libschroedinger_@SCHRO_MAJORMINOR@_la_CFLAGS = $(SCHRO_CFLAGS) $(LIBOIL_CFLAGS) $(ERROR_CFLAGS)
--libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = $(LIBOIL_LIBS)
-+libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = -lpthread $(LIBOIL_LIBS)
- libschroedinger_@SCHRO_MAJORMINOR@_la_LDFLAGS = \
- 	-no-undefined \
- 	-version-info $(SCHRO_LIBVERSION) \
diff --git a/media-libs/schroedinger/files/schroedinger-0.9.0-asneeded.patch b/media-libs/schroedinger/files/schroedinger-0.9.0-asneeded.patch
new file mode 100644
index 000000000000..9ea5e6a931f3
--- /dev/null
+++ b/media-libs/schroedinger/files/schroedinger-0.9.0-asneeded.patch
@@ -0,0 +1,12 @@
+diff -ur schroedinger-0.9.0.orig/schroedinger/Makefile.in schroedinger-0.9.0/schroedinger/Makefile.in
+--- schroedinger-0.9.0.orig/schroedinger/Makefile.in	2007-11-07 23:53:14.000000000 +0200
++++ schroedinger-0.9.0/schroedinger/Makefile.in	2008-01-26 10:28:13.000000000 +0200
+@@ -339,7 +339,7 @@
+ 	$(SCHRO_CFLAGS) $(LIBOIL_CFLAGS) $(ERROR_CFLAGS) \
+ 	-DSCHRO_ENABLE_UNSTABLE_API
+ 
+-libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = $(LIBOIL_LIBS)
++libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = -lpthread $(LIBOIL_LIBS)
+ libschroedinger_@SCHRO_MAJORMINOR@_la_LDFLAGS = \
+ 	-no-undefined \
+ 	-version-info $(SCHRO_LIBVERSION) \
diff --git a/media-libs/schroedinger/schroedinger-0.6.1.ebuild b/media-libs/schroedinger/schroedinger-0.9.0.ebuild
index 28854668567d..067a2469058f 100644
--- a/media-libs/schroedinger/schroedinger-0.6.1.ebuild
+++ b/media-libs/schroedinger/schroedinger-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-0.6.1.ebuild,v 1.2 2007/10/01 02:24:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-0.9.0.ebuild,v 1.1 2008/01/26 08:35:04 drac Exp $
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="C-based libraries and GStreamer plugins for the Dirac video codec"
 HOMEPAGE="http://schrodinger.sourceforge.net"
@@ -11,24 +11,24 @@ SRC_URI="mirror://sourceforge/schrodinger/${P}.tar.gz"
 LICENSE="|| ( MPL-1.1 LGPL-2.1 GPL-2 MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gstreamer test"
+IUSE="gstreamer test"
 
 RDEPEND=">=dev-libs/liboil-0.3.12
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
 	test? ( >=dev-libs/check-0.9.2 )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# Patch Makefile.in instead of Makefile.am to avoid
+	# the need for .m4 macro from gtk-doc wrt #205755.
 	epatch "${FILESDIR}"/${P}-asneeded.patch
-	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	econf $(use_enable gstreamer)
+	econf --disable-gtk-doc $(use_enable gstreamer)
 	emake || die "emake failed."
 }