diff options
Diffstat (limited to 'media-sound/gmpc')
| -rw-r--r-- | media-sound/gmpc/ChangeLog | 10 | ||||
| -rw-r--r-- | media-sound/gmpc/Manifest | 16 | ||||
| -rw-r--r-- | media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch | 46 | ||||
| -rw-r--r-- | media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch | 14 | ||||
| -rw-r--r-- | media-sound/gmpc/gmpc-11.8.16.ebuild | 17 |
5 files changed, 41 insertions, 62 deletions
diff --git a/media-sound/gmpc/ChangeLog b/media-sound/gmpc/ChangeLog index 5275ddb3c6fe..23864d3d067d 100644 --- a/media-sound/gmpc/ChangeLog +++ b/media-sound/gmpc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/gmpc -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.88 2012/05/27 08:59:47 angelos Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/ChangeLog,v 1.89 2013/03/29 20:46:57 angelos Exp $ + + 29 Mar 2013; Christoph Mende <angelos@gentoo.org> + +files/gmpc-11.8.16-underlinking.patch, -files/gmpc-0.20.0-underlinking.patch, + gmpc-11.8.16.ebuild: + Fix underlinking, convert to vala eclass 27 May 2012; Christoph Mende <angelos@gentoo.org> -gmpc-0.20.0.ebuild: Remove old @@ -339,4 +344,3 @@ 23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> : ebuild submitted by Bert Geens <theblackdragon@linux.be> - diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest index aa4037d3c1b4..48fd92820e7e 100644 --- a/media-sound/gmpc/Manifest +++ b/media-sound/gmpc/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gmpc-0.20.0-underlinking.patch 1113 RMD160 a8342d3393258e8eac73ef11fe8b7b5a6bf77479 SHA1 44b8a390352234d96df44ab2aad56de2a4fff969 SHA256 47eb11e678c130a955e942a296f0ca18ebb0883693130c0962ca29617bf4d404 -DIST gmpc-11.8.16.tar.gz 7082909 RMD160 b11662d4b01790a06fe586ab2fa20161d37ecbc5 SHA1 f61845cb8d9a1c1970ecb65565bd4eefc73b0c0a SHA256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c -EBUILD gmpc-11.8.16.ebuild 1285 RMD160 245f273cb50eaa13c1369c6ea777d84927a4b10f SHA1 51b778bb29cab0cc21604343bca74b408bee5e52 SHA256 845bd8a82d14a8815d02fa891c8e97c28773976d3dfdc294e725e00608829cad -MISC ChangeLog 11091 RMD160 b99f2d8147e8c0ec7e4446bc67d1117352177c48 SHA1 f4e546fbd94c9b7a1a6616205d2fb76e10f8a77a SHA256 e53b4cd87d6e0f28b39aee6811781ab1577e263f1cd697c529784a4a7f80d2fd -MISC metadata.xml 437 RMD160 5bec9c1abce7d63e9d69d8e3f7f779c8c96c9ee7 SHA1 d94987d62f5c31d200d0cf237bc44262407a5436 SHA256 b1372498a1a010b3e018a2a38f2324e538e18030d9ddac9e989bdc043a5cc95d +AUX gmpc-11.8.16-underlinking.patch 241 SHA256 5ee44bcafabb2bded0093efbf35fbf180752db30cd48b0c45c1322832849352d SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576 WHIRLPOOL 12d844b2fc1e48c4e05b7547e121f27f3ef3c33fd02ff6cf42e0417a09d9bea397843d0478b1923813716f07d1e61fd049aadab94f9b9b789c08c1992727e1bc +DIST gmpc-11.8.16.tar.gz 7082909 SHA256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623 WHIRLPOOL 4703e62bf6e23b6bdbb6be19fbc7c99e0461dc19f6cdc582653cdc680340544239d5d41aa6033884e46bb277ee3c9e676f0a8fa6bf5e8051c2465b771fbd18d6 +EBUILD gmpc-11.8.16.ebuild 1395 SHA256 d4a0c6c933077dabb3dd025f30c677d7ebf015028ac4d5f1c448b4cbb5ce8bda SHA512 ba419facc82bba98b984a294db3de18ef86ab399bf805351b6bd1989350460ab02c95298f1a31b2f0ddaa00b61f886535fe066390665b36061fa333ba9207e35 WHIRLPOOL b2f5a01dfd195ef9eb3509d92faaa6860ef8c6197b6ede9b104c5e8e3c3a4c3ce257283f95c2786e7597758b6541aa6d08f3523b05b1bfe7f8908140ccffd728 +MISC ChangeLog 11290 SHA256 b7410017377097332407499305951735ff096e2efc0a16933c1d962dd8236a87 SHA512 6b571f42d2570634de8e4a11b76b4cca160bf97ca34ab8d0e2a031a2974d42adfd575f81e1fcc87572ec0ee19eabfea4f1ae05084e88c0b9978d50b524efe0c3 WHIRLPOOL bddb42d77dbe47069312ebc8554a5bd998d8196673fbf4fbf9ce17c676af8075474b792ed51c5d9c5bd390bbcd7fd2d72e5b1152d420f1bd993b08abb03cdcac +MISC metadata.xml 437 SHA256 b1372498a1a010b3e018a2a38f2324e538e18030d9ddac9e989bdc043a5cc95d SHA512 fbdefd156f738e5667af5aec6d97436e9a6531c74add7155f2a8838d184285bfccbbfaed00c66b41e4970a5a01101417978b270dc9b771b3f9744f2d8f17d59d WHIRLPOOL 2304f7331da209bec2d89a50bface9478b565b253b994776d4028c224d8ab7a4b50745c47200b0d15318e18171253a1f4214f2caf652cc0d0633f1e4b43d20b7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAk/B7QgACgkQmWq1bYTyC0PWFwD8CiQqVAc3Q5ivM5GEC2cllc+p -jrvB8KWbZ8k+BrIgQ8YA/A7Nh5lGaUx+Ff95AabKAi7lSqLo7i4CyCQOJTDTbORm -=y7UN +iF4EAREIAAYFAlFV/cIACgkQmWq1bYTyC0MvKAD/fbmBQz8HdNn/ny4bhcJA1Qjr +8QW56GyJBdi6jdxnz+YA/iqSxKiDdED9+LV2ofWOSmc7AF+DzlRL1BrrM1boEbft +=CYNw -----END PGP SIGNATURE----- diff --git a/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch b/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch deleted file mode 100644 index d6b027eb6580..000000000000 --- a/media-sound/gmpc/files/gmpc-0.20.0-underlinking.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ebec29f..0311cc1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,6 +227,11 @@ PKG_CHECK_MODULES([sqlite3], sqlite3) - AC_SUBST(sqlite3_LIBS) - AC_SUBST(sqlite3_CFLAGS) - -+#libx11 -+PKG_CHECK_MODULES([x11], x11) -+AC_SUBST(x11_LIBS) -+AC_SUBST(x11_CFLAGS) -+ - # libsexy - AC_ARG_ENABLE([system-libsexy], - [--enable-system-libsexy Use system libsexy instead of bundles.], -diff --git a/src/Makefile.am b/src/Makefile.am -index 6ef60fd..d63cca7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -118,7 +118,8 @@ LIBS= \ - @libgio_LIBS@\ - @SPIFF_LIBS@\ - @libxspf_LIBS@\ -- @sqlite3_LIBS@ -+ @sqlite3_LIBS@\ -+ @x11_LIBS@ - - if USE_SYSTEM_LIBSEXY - LIBS += @libsexy_LIBS@ -@@ -142,12 +143,13 @@ AM_CFLAGS = @CFLAGS@\ - @gobject_CFLAGS@\ - @gtk_CFLAGS@\ - @gmodule_CFLAGS@\ -- @libxspf_CFLAGS@\ -+ @libxspf_CFLAGS@\ - @libglade_CFLAGS@\ - @gthread_CFLAGS@\ - @libsoup_CFLAGS@\ - @libgio_CFLAGS@\ -- @sqlite3_CFLAGS@\ -+ @sqlite3_CFLAGS@\ -+ @x11_CFLAGS@\ - @EXTRA_CFLAGS@\ - -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\"\ - -DPACKAGE_DATA_DIR=\""$(datarootdir)"\" diff --git a/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch new file mode 100644 index 000000000000..e6cf1ef9f05d --- /dev/null +++ b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 497194b..84c31f0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -174,7 +174,8 @@ LIBS= \ + @libxml2_LIBS@\ + @libx11_LIBS@\ + @sqlite3_LIBS@\ +- -lz ++ -lz\ ++ -lm + + + if HAVE_UNIQUE diff --git a/media-sound/gmpc/gmpc-11.8.16.ebuild b/media-sound/gmpc/gmpc-11.8.16.ebuild index b91a7725c747..9e00a3020558 100644 --- a/media-sound/gmpc/gmpc-11.8.16.ebuild +++ b/media-sound/gmpc/gmpc-11.8.16.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.8 2012/05/27 07:51:26 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.9 2013/03/29 20:46:57 angelos Exp $ EAPI=4 -inherit gnome2-utils +VALA_MIN_API_VERSION=0.12 + +inherit autotools eutils gnome2-utils vala DESCRIPTION="A GTK+2 client for the Music Player Daemon" HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" @@ -25,7 +27,7 @@ RDEPEND="dev-db/sqlite:3 unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )" DEPEND="${RDEPEND} - dev-lang/vala:0.12 + $(vala_depend) >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool @@ -33,8 +35,13 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README ) +src_prepare() { + epatch "${FILESDIR}"/${P}-underlinking.patch + eautoreconf + vala_src_prepare +} + src_configure() { - VALAC=$(type -p valac-0.12) \ econf \ --disable-static \ --disable-libspiff \ |