Version bump, remove development versions.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index fa415d2dcb62f44a99d16e6097723be3685c5e72..ce09c17b205411d697c7a98d3581d17263907f91 100644 (file)
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.16 2011/09/09 17:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.17 2011/10/15 22:59:07 pacho Exp $
+
+*clutter-gst-1.4.2 (15 Oct 2011)
+
+  15 Oct 2011; Pacho Ramos <pacho@gentoo.org> -clutter-gst-1.3.12.ebuild,
+  -clutter-gst-1.3.14.ebuild, +clutter-gst-1.4.2.ebuild:
+  Version bump, remove development versions.
 
 *clutter-gst-1.3.14 (09 Sep 2011)
 

diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index ca9d7aa8428cfd299260d03325b03db8bb7959bb..56a47dcf179ce2014edcb8cadf6e8a3e218411b4 100644 (file)
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST clutter-gst-1.0.0.tar.bz2 414768 RMD160 f5c825e6c5da62a39a98e5515c0ede2e3e801907 SHA1 22f262b8d4d70d5d0ef499614fc0332a7a641241 SHA256 ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696
-DIST clutter-gst-1.3.12.tar.xz 390452 RMD160 e9a0d1014f5489aded30e0aa142c58f602bc8825 SHA1 fde01a712c18c98af851ea0ccca53e6d6dcf4d9b SHA256 0a5492f4f257192236fc4133f51dacd9036431edb11df738b0ca60d65d6d9297
-DIST clutter-gst-1.3.14.tar.xz 398392 RMD160 2ba518dc1d233f33d3aa6aeaa4cb4958ee9f2b62 SHA1 b2ec3d70420da938f01c0f9d5c80dcc770ac35cb SHA256 cbe042e33dc8561523c000799ce45315afa41ff95d55a0e86f8efc4b871e5dad
+DIST clutter-gst-1.4.2.tar.xz 336984 RMD160 6ba971e947da8050176abd0f647d2cb39f63aff4 SHA1 b71ee6bf05fe34f46ed0f7ab506ea47d3b6b8593 SHA256 48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e
 EBUILD clutter-gst-1.0.0.ebuild 940 RMD160 01c6e9cde34856beb33334f16f12407bfdbc86ac SHA1 0b839edaacb4fa13cd9b91b4492ea3d12f21862d SHA256 c160ac3523d1837176923caf63603951eb76d9712f15bf14aba503f1ed936f11
-EBUILD clutter-gst-1.3.12.ebuild 1578 RMD160 e82b2db7cbe011f6d99b66db1655cb01836856a2 SHA1 1b4f57a0b9d9e372fdaf78b3cbdc09d607ddd998 SHA256 46689b7833109e06be18cd99dfd25e2df7c3dcc1a0f886c1d6f9879025db77f7
-EBUILD clutter-gst-1.3.14.ebuild 1575 RMD160 5330a4b79985b13a5806f09dcf3db6d01102e710 SHA1 0b67076f1ca52e4a19ce362b9fbcca365f622a0b SHA256 62bd3290d54a015150958589c0acdfdb22f72700e8b27f156871f40cbe1808f0
-MISC ChangeLog 2864 RMD160 0404ca112d7446c2e6fccecc5064e78683e4b65f SHA1 afec9c54f50fd4465269c3f11b6d61bfb579e5ec SHA256 89523ae468296baf7c9baea9a94bb33725d8b87079737be367b49f08fbf995db
+EBUILD clutter-gst-1.4.2.ebuild 1527 RMD160 402e457f89f593bc8aaff5b01d992655902fd623 SHA1 32362439cec4f8720efbb798511a11226da05c8b SHA256 fae82866ce0dedea5112e9bb7ce6a8ac0c19d69a675f121bfdc01d6a64e039ab
+MISC ChangeLog 3075 RMD160 81d592f2b6e6d6706d0a2bcfe5a75d07e4891bd2 SHA1 59bddf5c48fbbe468079ce7054672a1d575c11f6 SHA256 f86a0d248ee3e883c04e246adce740fc0b5cac31943cf5ecbfa38211dd00c8e0
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5qSZgACgkQCaWpQKGI+9RxrACfZrvtPEWv7spLKFU3T4/1mwLZ
-w7YAniJtthAM9tJxoqY0x1qadSc5Zsdi
-=jbbS
+iEYEARECAAYFAk6aEEEACgkQCaWpQKGI+9SX0wCcD/HOb4HQk/Q5qiV3uYmwirnf
+s40An0F7iyUC+pyEK0voVrqb7f5O1QSI
+=R5GQ
 -----END PGP SIGNATURE-----

diff --git a/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild
deleted file mode 100644 (file)
index d3e87f2..0000000
--- a/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild,v 1.2 2011/08/24 07:31:33 nirbheek Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2" # Just a build-time dependency
-GNOME_TARBALL_SUFFIX="xz"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
-inherit python gnome2 clutter gnome.org
-
-DESCRIPTION="GStreamer Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
-
-RDEPEND="
-       >=dev-libs/glib-2.20:2
-       >=media-libs/clutter-1.4.0:1.0[introspection?]
-       >=media-libs/gstreamer-0.10.20:0.10[introspection?]
-       media-libs/gst-plugins-base:0.10[introspection?]
-       introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
-DEPEND="${RDEPEND}
-       sys-apps/sed
-       doc? ( >=dev-util/gtk-doc-1.8 )"
-
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-src_prepare() {
-       # XXX: debug default is "minimum" in even releases; "yes" in odd releases
-       G2CONF="${G2CONF}
-               $(use_enable introspection)"
-
-       gnome2_src_prepare
-       python_convert_shebangs 2 "${S}"/scripts/pso2h.py
-}
-
-src_compile() {
-       # Clutter tries to access dri without userpriv
-       # Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-       shopt -s nullglob
-       local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-       shopt -u nullglob
-       test -n "${cards}" && addpredict "${cards}"
-
-       emake || die "emake failed"
-}

diff --git a/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
similarity index 67%
rename from media-libs/clutter-gst/clutter-gst-1.3.14.ebuild
rename to media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
index f83e806f30608e04310b4ffeefab59ae55bf8aca..626f39d7f59b39a6fc4136df68159bcfc7cf6015 100644 (file)
--- a/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild,v 1.1 2011/09/09 17:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild,v 1.1 2011/10/15 22:59:07 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GCONF_DEBUG="yes"
 PYTHON_DEPEND="2" # Just a build-time dependency
-GNOME_TARBALL_SUFFIX="xz"
 CLUTTER_LA_PUNT="yes"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
@@ -15,7 +15,7 @@ DESCRIPTION="GStreamer Integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
+IUSE="doc examples +introspection"
 
 RDEPEND="
        >=dev-libs/glib-2.20:2
@@ -27,25 +27,26 @@ DEPEND="${RDEPEND}
        sys-apps/sed
        doc? ( >=dev-util/gtk-doc-1.8 )"
 
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-src_prepare() {
-       # XXX: debug default is "minimum" in even releases; "yes" in odd releases
+pkg_setup() {
+       DOCS="AUTHORS NEWS README"
+       EXAMPLES="examples/{*.c,*.png,README}"
        G2CONF="${G2CONF}
                $(use_enable introspection)"
 
+       python_pkg_setup
+}
+
+src_prepare() {
        gnome2_src_prepare
        python_convert_shebangs 2 "${S}"/scripts/pso2h.py
+
+       # Remove *_DISABLE_DEPRECATED, bug #385171
+       sed -e 's/-D.*_DISABLE_DEPRECATED//g' \
+               -i clutter-gst/Makefile.am clutter-gst/Makefile.in || die
 }
 
 src_compile() {
-       # Clutter tries to access dri without userpriv
+       # Clutter tries to access dri without userpriv, upstream bug #661873
        # Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-       shopt -s nullglob
-       local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-       shopt -u nullglob
-       test -n "${cards}" && addpredict "${cards}"
-
-       emake || die "emake failed"
+       DISPLAY="999invalid" emake
 }