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.

Package-Manager: portage-2.1.4

7 files changed, 50 insertions, 40 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/Manifest b/media-libs/schroedinger/Manifest
index 9791d6f92cac..3b0930be6ffa 100644
--- a/media-libs/schroedinger/Manifest
+++ b/media-libs/schroedinger/Manifest
@@ -1,20 +1,20 @@
-AUX schroedinger-0.6.1-asneeded.patch 652 RMD160 e9793e66cd3343e9d71732ff83e479a80a2f76ec SHA1 a4c102058d6476e49456d792d359dfb762914924 SHA256 cb6834792d9fdcd613a0cc065ab9de8282ca65c449b4bc61fe972d2781cda9be
-MD5 2bd275076e33a073bd128876e0d08f2a files/schroedinger-0.6.1-asneeded.patch 652
-RMD160 e9793e66cd3343e9d71732ff83e479a80a2f76ec files/schroedinger-0.6.1-asneeded.patch 652
-SHA256 cb6834792d9fdcd613a0cc065ab9de8282ca65c449b4bc61fe972d2781cda9be files/schroedinger-0.6.1-asneeded.patch 652
-DIST schroedinger-0.6.1.tar.gz 531849 RMD160 598ea8941cf44df46d995ec09d259b2f7b4fd890 SHA1 32e1a55e21edc3f24bc94dbda35fda0d41fdcf63 SHA256 a6d4e3f5a390bc7880836d052d0b671d6edafca1899fc945e41dc70aa7e70c04
-EBUILD schroedinger-0.6.1.ebuild 1040 RMD160 073b4a4876cde1095d717461ddb58ff9d55526d0 SHA1 43b5ed3b86973815ed73d68ad6be66fca52e8cb1 SHA256 19454f10ec5e3b18a4baef45f34e676d056e1d956aefa4ee0dc88a27bc997b80
-MD5 b15c66554d86758dcd468a882aa619c9 schroedinger-0.6.1.ebuild 1040
-RMD160 073b4a4876cde1095d717461ddb58ff9d55526d0 schroedinger-0.6.1.ebuild 1040
-SHA256 19454f10ec5e3b18a4baef45f34e676d056e1d956aefa4ee0dc88a27bc997b80 schroedinger-0.6.1.ebuild 1040
-MISC ChangeLog 1223 RMD160 14f575aa6a6a2077892910225038c78efb33bf73 SHA1 59cd6f0210bd16a7a2782d0563b11a097563f0f1 SHA256 bf54f28d89a49eec96044aa20eaef408e7d3b20b103e62fa47785fbcb198a9fc
-MD5 053a5b7fdb5d6b5e56a02571b3d5cf7f ChangeLog 1223
-RMD160 14f575aa6a6a2077892910225038c78efb33bf73 ChangeLog 1223
-SHA256 bf54f28d89a49eec96044aa20eaef408e7d3b20b103e62fa47785fbcb198a9fc ChangeLog 1223
+AUX schroedinger-0.9.0-asneeded.patch 623 RMD160 d743744d521988ab3ee91f4d60b5f168c9e30964 SHA1 ea2e0677da6563295818a05040e2a4ac1b7dfeb1 SHA256 2797d7662f066ab537eb26805ccc8975c7dda5ca90e36e9c61c9a607fb20b581
+MD5 318b1574c3b90256a85d03f6a5162f86 files/schroedinger-0.9.0-asneeded.patch 623
+RMD160 d743744d521988ab3ee91f4d60b5f168c9e30964 files/schroedinger-0.9.0-asneeded.patch 623
+SHA256 2797d7662f066ab537eb26805ccc8975c7dda5ca90e36e9c61c9a607fb20b581 files/schroedinger-0.9.0-asneeded.patch 623
+DIST schroedinger-0.9.0.tar.gz 713773 RMD160 279b57148bfd8f81120e598b91fd128d4ff87848 SHA1 7dfb28b10b4cd3c57dcf8e1134d301a4b184c544 SHA256 ac078d33d4d44ac0dc4e0abc73fde6f8fe7dd024d2d9518bdceed6d9e1aca94d
+EBUILD schroedinger-0.9.0.ebuild 1086 RMD160 3be484f1d6036a3b0aa0942fbb9abdb64165c67f SHA1 268c0c1b0d713e14864ecc30862a9bbde1a11e71 SHA256 e731cce71221e73fb174560298063acf05d2640de33947cbce0e7b421399ed9b
+MD5 1fa4cff772d3f8cfa69c2bcac2081292 schroedinger-0.9.0.ebuild 1086
+RMD160 3be484f1d6036a3b0aa0942fbb9abdb64165c67f schroedinger-0.9.0.ebuild 1086
+SHA256 e731cce71221e73fb174560298063acf05d2640de33947cbce0e7b421399ed9b schroedinger-0.9.0.ebuild 1086
+MISC ChangeLog 1661 RMD160 08d0e5c3e98aa76832a8aaa4eda7d48e85c50051 SHA1 494eca3967fd183002d3cf5cbf4aeaf8bcea10fc SHA256 8a2407c2815fe86d9672a1357a38549af91960c37370a374d1c7f4f88431f78f
+MD5 a0e31b39f907458f76cc3f05dee2c863 ChangeLog 1661
+RMD160 08d0e5c3e98aa76832a8aaa4eda7d48e85c50051 ChangeLog 1661
+SHA256 8a2407c2815fe86d9672a1357a38549af91960c37370a374d1c7f4f88431f78f ChangeLog 1661
 MISC metadata.xml 275 RMD160 42f439fba1a5e257faae1816b9cc0fc18219fed5 SHA1 34ecd51be9f76b4637d91138641106513f18b685 SHA256 3ae7db9576ba39c1c15c3375d308fd166ca5e49a4d59451422bd5b3b20d58184
 MD5 3c81dba9a8cfdd6ebfc76dd9cee7a532 metadata.xml 275
 RMD160 42f439fba1a5e257faae1816b9cc0fc18219fed5 metadata.xml 275
 SHA256 3ae7db9576ba39c1c15c3375d308fd166ca5e49a4d59451422bd5b3b20d58184 metadata.xml 275
-MD5 0733226c4331f2459ef7d2b813517375 files/digest-schroedinger-0.6.1 256
-RMD160 6e291ae6723d406792ef923f677ce3b079edd20b files/digest-schroedinger-0.6.1 256
-SHA256 4653ff654700d849814063b0640389335a9d0a219acc2bf4976e6a3c5dccbcad files/digest-schroedinger-0.6.1 256
+MD5 3b39e8d05bd02ea8af9c2ef9755cc049 files/digest-schroedinger-0.9.0 256
+RMD160 4506d3596714c0d60bb38f41d712d135f586d67d files/digest-schroedinger-0.9.0 256
+SHA256 488e08b341a2a6b0e8765c1fb59555714848b41ffaa5d66f4de6a7d605a4a54d files/digest-schroedinger-0.9.0 256
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."
 }