Bump to 0.1.17, remove old, from gnome overlay

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/media-libs/grilo/ChangeLog b/media-libs/grilo/ChangeLog
index 6d662427e9ec787b397763c682e70982896f0070..d5c1c3292b95919af5807b4574e4c6cecd13aca7 100644 (file)
--- a/media-libs/grilo/ChangeLog
+++ b/media-libs/grilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/grilo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.3 2011/08/14 10:52:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.4 2011/10/01 16:29:27 nirbheek Exp $
+
+*grilo-0.1.17 (01 Oct 2011)
+
+  01 Oct 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -grilo-0.1.15.ebuild,
+  +grilo-0.1.17.ebuild:
+  Bump to 0.1.17, remove old, from gnome overlay
 
 *grilo-0.1.16 (14 Aug 2011)
 

diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 22c1c66bd8fab8de8321552be6292fb70821823f..62ab4a8a9806e7309204e88a536af8e440eb7804 100644 (file)
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -4,27 +4,26 @@ Hash: SHA1
 AUX grilo-0.1.16-constants.py 1731 RMD160 212ad196e9ea6cd8723428cc81c8ae566ce9162b SHA1 c095f4d6bb2c74369b150d4b6540cbfb72f5f7d0 SHA256 78bd7ea665746149f8ee3a5919837fbd70a7bab5767f56d905b03af12a72ec9e
 AUX grilo-0.1.16-fix-automagic-test-ui.patch 1085 RMD160 6f7b424e3de5d1e9a427794e1a050be086c113a0 SHA1 b478bf98af30e52ccd3a9259494688577bc1600e SHA256 ed4d2d2a907898837db2764cffa79b8a0a119e0bdd301a80936c2464c6a7d7d1
 AUX grilo-0.1.16-media-source-infinite-loop.patch 1757 RMD160 0b44a616e510cb7b0d47c1bed852f9d88e961be8 SHA1 26878a0175e3b6306321498336c8d8dd89339951 SHA256 12baacea54dc8d98482af57daa6f0bb9b6fb7bc8671409c013623bb13ec341e7
-DIST grilo-0.1.15-patches-0.1.tar.xz 5836 RMD160 377e94f25ea9acf317f0d8e0d25594f7bfdb1f9f SHA1 57556385753d5aaaf29e7eb3c0997af34f5b0c2f SHA256 13c49a91eab01ba73eb1faf5e2253e0c51c6906eb0dd6e5395963f85176c9e03
-DIST grilo-0.1.15.tar.bz2 484976 RMD160 a8f5775632adc1120f6d2c16f77083dd5530dc46 SHA1 2b9905fd308c5bc1fa714d7dbe8841653c2fdd9d SHA256 4276337b56f09c3a448a26e0f41a72812b72faa0e4dbdcc9ab1a314e2c5c7264
 DIST grilo-0.1.16.tar.xz 475812 RMD160 caf93ba9c3cb4f9730bc1051ba27fbcebb7acca9 SHA1 4c3c04a8712882da53457a9d41e6d59a3774e1f8 SHA256 b652ccc6f5693203a46b58f3b6b0449545f38b4f98390b4be8ca0a9434108fa2
-EBUILD grilo-0.1.15.ebuild 1690 RMD160 fa13e9c2644266ef17ecf4d080cf770bd17cc79f SHA1 1821bebbd30bcc818caad40672b75728adeecff5 SHA256 bdfb7c6bbae491c131f86991341475795018ab40e4ace4e02cf06b563300e0d5
+DIST grilo-0.1.17.tar.xz 492740 RMD160 aba3a4bf30b7f6640fa3addc515d52a985fdd8f9 SHA1 1dc55bdee4ec6637b3e76de9fb66615abe14dd54 SHA256 f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf
 EBUILD grilo-0.1.16.ebuild 2091 RMD160 c836f038fa306db3b9bf8db39439be84cc25c0da SHA1 f10104826561bd2c5eb5d4b9be9e14c931e7c3a2 SHA256 6f75f9a69db1a4c6e9d276a86acc2d690aa0baac93f247b7ef3ff3c3075d9cf6
-MISC ChangeLog 798 RMD160 00004ad16c7ec074332106f99ca81c6d4ffce794 SHA1 85df745ceb633ee00f1b63da346d28abc812f6f0 SHA256 3282c9bf5d4cca82e36c6f909b7a9ff2ba94cb8b8ea4c5e1399d8ce0c207e5ca
+EBUILD grilo-0.1.17.ebuild 1991 RMD160 1d338af0d134d58df8b32f2db4b6f31af8485811 SHA1 873afc2448ffe359910a22822960cbdaf020fd34 SHA256 4c298c6f9a1a90b522cafdb70c786ea7d033f468d8ce7a3c592e6109e8f91167
+MISC ChangeLog 977 RMD160 222b3f6aa9aad1834ab7dacdcd0bd3f89e34e820 SHA1 8ec9dc3ea4400bc9eefb4d6e231ab705aa7ae0a6 SHA256 1853415097a0b8dd35678fcbad0b7fab95b1744765f1d414f79406dcf4ea62a0
 MISC metadata.xml 463 RMD160 49494b01dab885727f79469ad0dd99dda5cb66e1 SHA1 f912806be62fb79ee96241c7c85a91e0f7a21aea SHA256 c59761bb44a453a2db84b13804a4551c1d0c28e262ef90c7ce394b414a0a5ffd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOR6juAAoJEO/kOhxWD91kS64QAIMBRns/4Ej0J7p22+jbzwcv
-N7hiIVVgbfYi0KMG0xWvjLOryaPhYJQWJQUuOW4cMxcvax8u9p/itmqiDAdftLkc
-/ItLl3mAm1FL9VTsYLXG0u2N7xoNG6PB80HWoWiyvnkkbh3a4k7Wr9a5yQ68ohuQ
-4d3KxkdynwhjPYoFMNuEhkeWtpwUWnKm/EeRO2wR0Fb327q9APbBH/YupSvhRZVu
-YuG7848ZK9gBnLwL+T028IwOniyCNjZjrHzSvfm5LzOxG6INW3Ih2kIRz7dcr98A
-orOPVLjiyM+VCXg7/ZaNv+S452kI5tId6/fospNgwZOf0AEiveZLgzsFNt66bCkT
-tQSFbu3zxUBecVfQ0dDuqh2WCZRlr1dlux+AMLEi0HltEhgDp5hA7by7OQARDyid
-lTObf6Q+vmo2Gq2iOkxnnqoceiobRAV5nNef+dadt9BrB3wb4UZSR3dAtmU9+Pgm
-c1r1JL/0AII9nalDTb/oaRt3cg4BihJ96qApK2DpX7Fy2bSoJGTMLKgqiwdz/DTb
-Z/xbiSpFe4Eq5dIp+voBgEPpJvaB78dWQb30Q7C1sG4ZFg5GSj87ig9aDE8pTSdz
-YlPne/Gv0Z4SzKCtpIgaeYxcNHK1cju9p5HArtQXj4Lc+3ALRi8vYNpPwur1VJXW
-hAXL9rTf6QU4ApEFUk1N
-=wBAT
+iQIcBAEBAgAGBQJOhz/rAAoJEO/kOhxWD91k37gP/0WrE56stOJfcI2R7Rz1gFn0
+0n/ERaAD76MwHDaQ2hde1v9Ar2Dm3KaCyMvmvCKx+5NO8TNJvTKXwPndks5u7uTy
+6VUK+ZFiP1R2RZkDGL5AWrsutvqQ2L6UAzDW1KBXFWepN17mdwGWfjZmpUKXnZMF
+wi5LzCTVF13RkBMWYNUPaB2LdUHv8xYszCrSiGbgSGcHJCcIZggX73LW2Wo1wJFU
+l7+MeBq7tCTr5JcM4Xnb96ReXl1P43nJqg9HBYjkFW9T3lpIzeQjnIT233KHJScJ
+SF4oxI9ah9dHyR/t9Vr3xtSPFlbQnaTT40dzOigX7kdnZ2nxrDYAcXdji/IQLIro
++mqTMy4C0V6bLr9lU9UgzWpTODU6dw3kgjRBc/unowBTpY9AkT0wZAB40O/9MAJb
+rXb7BhpIyww4NZye4ZYPIu2tQXMzHednGDliCObO6gnIczdHT8RKw0H1ykLtOYEd
+/bIZr3p72C+oIOu/T1qkRi33XwHE/1vPSaHG9M23vhUJflMCbJjufJUFU9HYNb7c
+m/svnXjtEWf4XCy5eycegbHC+XM2Dl8TCWB/V6LYVOOPO6ixD3GrkfcqjizkPURO
+CZPGD6aEzhIviQpPjE7Ed1KEd2AGccVgh7Rl2ei/qD4yEO+ZdfakeljzaVo0UAAH
+CS/tBD7SWZARerAlTnvz
+=ia/A
 -----END PGP SIGNATURE-----

diff --git a/media-libs/grilo/grilo-0.1.15.ebuild b/media-libs/grilo/grilo-0.1.17.ebuild
similarity index 66%
rename from media-libs/grilo/grilo-0.1.15.ebuild
rename to media-libs/grilo/grilo-0.1.17.ebuild
index 9658ba62d997779f5d1f4ada7fe0fc4ba0b0667e..0a32434ff89f07c5232e3f941a362bbd732a8006 100644 (file)
--- a/media-libs/grilo/grilo-0.1.15.ebuild
+++ b/media-libs/grilo/grilo-0.1.17.ebuild
@@ -1,22 +1,19 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.1.15.ebuild,v 1.2 2011/06/15 16:37:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.1.17.ebuild,v 1.1 2011/10/01 16:29:27 nirbheek Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools eutils gnome2
 
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
-SRC_URI="${SRC_URI}
-       mirror://gentoo/${P}-patches-0.1.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection +network test test-ui vala"
+IUSE="doc examples +introspection +network test test-ui vala"
 
 RDEPEND="
        >=dev-libs/glib-2.22:2
@@ -32,6 +29,9 @@ DEPEND="${RDEPEND}
                dev-python/pygobject:2[introspection?]
                media-plugins/grilo-plugins )"
 
+# Tests fail horribly, but return 0
+RESTRICT="test"
+
 pkg_setup() {
        DOCS="AUTHORS NEWS README TODO"
        # --enable-debug only changes CFLAGS, useless for us
@@ -50,10 +50,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # Various patches from upstream trunk
-       epatch "${WORKDIR}"/*.patch
+       # Don't build examples
+       sed -e '/SUBDIRS/s/examples//' \
+               -i Makefile.am -i Makefile.in || die
+
+       # Fix Test-UI automagic gtk2/gtk3 selection
+       epatch "${FILESDIR}/${PN}-0.1.16-fix-automagic-test-ui.patch"
+
        # Build system doesn't install this file with the tarball
-       cp "${WORKDIR}/constants.py" "${S}/tests/python/"
+       cp "${FILESDIR}/${PN}-0.1.16-constants.py" "${S}/tests/python/constants.py"
        eautoreconf
 
        gnome2_src_prepare
@@ -63,3 +68,13 @@ src_test() {
        cd tests/
        emake check
 }
+
+src_install() {
+       gnome2_src_install
+
+       if use examples; then
+               # Install example code
+               insinto /usr/share/doc/${PF}/examples
+               doins "${S}"/examples/*.c
+       fi
+}