From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q2WpE-0007oQ-4T for garchives@archives.gentoo.org; Wed, 23 Mar 2011 22:46:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA415E0512; Wed, 23 Mar 2011 22:46:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 67748E0512 for ; Wed, 23 Mar 2011 22:46:40 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC4F91B40A3 for ; Wed, 23 Mar 2011 22:46:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3918F8006A for ; Wed, 23 Mar 2011 22:46:39 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: Subject: [gentoo-commits] dev/eva:master commit in: net-libs/libdmapsharing/, net-libs/libdmapsharing/files/ X-VCS-Repository: dev/eva X-VCS-Files: net-libs/libdmapsharing/Manifest net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch net-libs/libdmapsharing/libdmapsharing-2.0.4.ebuild net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild X-VCS-Directories: net-libs/libdmapsharing/ net-libs/libdmapsharing/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: cabdb628e64415556310f638b2d939e079122e3a Date: Wed, 23 Mar 2011 22:46:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a25bd488871b71128fd32bef11e0d6b2 commit: cabdb628e64415556310f638b2d939e079122e3a Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Mar 23 22:46:00 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Mar 23 22:46:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/eva.git;a=3Dco= mmit;h=3Dcabdb628 net-libs/libdmapsharing: fix slotability of 2.* * remove slot 2.0 * use slot dependencies --- net-libs/libdmapsharing/Manifest | 5 +- .../libdmapsharing-2.1.13-slotability-fix.patch | 121 ++++++++++++++= ++++++ .../libdmapsharing/libdmapsharing-2.0.4.ebuild | 46 -------- .../libdmapsharing/libdmapsharing-2.1.13.ebuild | 18 ++-- 4 files changed, 133 insertions(+), 57 deletions(-) diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/M= anifest index 9f877f3..4571d9e 100644 --- a/net-libs/libdmapsharing/Manifest +++ b/net-libs/libdmapsharing/Manifest @@ -1,4 +1,3 @@ -DIST libdmapsharing-2.0.4.tar.gz 610256 RMD160 bf09404fc00675fdc1d64b387= 3ab057ae4a20c28 SHA1 1a4057578d8ae3126eb186f73cb23c2d20994ea4 SHA256 7520= 163f0a616e2efc15820c5e7f983a22ce41084ba9fc5f415fe384e43eed06 +AUX libdmapsharing-2.1.13-slotability-fix.patch 3445 RMD160 85f24f799c2b= 249528392b72bcb94292f2a9affd SHA1 e3e856a66af2d68bd9c3601f90d6665dc08788f= 8 SHA256 7659b94122cfccd96fe06a46e2eff851982e5b87d205c530506de04d23d884ac DIST libdmapsharing-2.1.13.tar.gz 645475 RMD160 144ff83e87096ea77031eef8= dac3fece266084e9 SHA1 f5873a7cfe61228aabe763d1692bede1e9050b20 SHA256 bc4= bcedf5da41c1f85fc36931877044f6eaf6043277a0fcfe7d1dc24a401ee1a -EBUILD libdmapsharing-2.0.4.ebuild 969 RMD160 53ec8b5d553cb94c341b1dbcda= ebf4d0f3561ff3 SHA1 2497b435720639898e46abe8ac4d1cc87f17c273 SHA256 c827c= d3a2c0013a0f31c8ac37b87f29ee2f6a38ca6e2df3dfe7eb99896e7d517 -EBUILD libdmapsharing-2.1.13.ebuild 1017 RMD160 b2b036f299f6af609eda844b= c60fc1970635f952 SHA1 2e4a794e374c160132f30418a4745b5885546385 SHA256 da3= 7f9a44115794114bf36de1cd7b749418edcfa7532895b8769e51300d627bd +EBUILD libdmapsharing-2.1.13.ebuild 1071 RMD160 b8c81c98d89721fb73a8d903= 7ac5bda1982b3333 SHA1 c26cda016eb3f53a0d31a2ded19b09bf51292822 SHA256 166= 6b967b72390a8b766ceb40ed423c55828f33e4d8ba508d30259d1ffcded86 diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotabil= ity-fix.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slota= bility-fix.patch new file mode 100644 index 0000000..f4f68ef --- /dev/null +++ b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix= .patch @@ -0,0 +1,121 @@ +From 6b9b056cdf128c7d40b26ee6615b56510d71c341 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 23 Mar 2011 23:31:07 +0100 +Subject: [PATCH] gentoo: fix slotability + +--- + docs/Makefile.am | 2 +- + libdmapsharing.pc.in | 2 +- + libdmapsharing/Makefile.am | 16 ++++++++-------- + tests/Makefile.am | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index bd6f455..d88a349 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS =3D 1.6 + # of using the various options. +=20 + # The name of the module, e.g. 'glib'. +-DOC_MODULE=3Dlibdmapsharing ++DOC_MODULE=3Dlibdmapsharing-@API_VERSION@ +=20 + # Uncomment for versioned docs and specify the version of the module, e= .g. '2'. + #DOC_MODULE_VERSION=3D2 +diff --git a/libdmapsharing.pc.in b/libdmapsharing.pc.in +index c95a5cf..c46f912 100644 +--- a/libdmapsharing.pc.in ++++ b/libdmapsharing.pc.in +@@ -7,5 +7,5 @@ Name: libdmapsharing + Description: libdmapsharing + Version: @VERSION@ + Requires: glib-2.0 libsoup-2.4 +-Libs: -L${libdir} -ldmapsharing ++Libs: -L${libdir} -ldmapsharing-@API_VERSION@ + Cflags: -I${includedir}/libdmapsharing-@API_VERSION@ +diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am +index 6a589d4..293b042 100644 +--- a/libdmapsharing/Makefile.am ++++ b/libdmapsharing/Makefile.am +@@ -1,8 +1,8 @@ +-lib_LTLIBRARIES =3D libdmapsharing.la ++lib_LTLIBRARIES =3D libdmapsharing-2.2.la +=20 + BUILT_SOURCES =3D dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums= .h +=20 +-libdmapsharing_la_SOURCES =3D \ ++libdmapsharing_2_2_la_SOURCES =3D \ + $(BUILT_SOURCES) \ + daap-record.c \ + daap-share.c \ +@@ -21,15 +21,15 @@ libdmapsharing_la_SOURCES =3D \ + dpap-share.c +=20 + if USE_HOWL +-libdmapsharing_la_SOURCES +=3D \ ++libdmapsharing_2_2_la_SOURCES +=3D \ + dmap-mdns-browser-howl.c + else + if USE_DNS_SD +-libdmapsharing_la_SOURCES +=3D \ ++libdmapsharing_2_2_la_SOURCES +=3D \ + dmap-mdns-browser-dnssd.c \ + dmap-mdns-publisher-dnssd.c + else +-libdmapsharing_la_SOURCES +=3D \ ++libdmapsharing_2_2_la_SOURCES +=3D \ + dmap-mdns-avahi.c \ + dmap-mdns-browser-avahi.c \ + dmap-mdns-publisher-avahi.c +@@ -37,14 +37,14 @@ endif + endif +=20 + if USE_GSTREAMERAPP +-libdmapsharing_la_SOURCES +=3D \ ++libdmapsharing_2_2_la_SOURCES +=3D \ + g-gst-input-stream.c \ + g-gst-mp3-input-stream.c \ + g-gst-wav-input-stream.c \ + gst-util.c + endif +=20 +-libdmapsharing_la_CFLAGS =3D \ ++libdmapsharing_2_2_la_CFLAGS =3D \ + -DG_LOG_DOMAIN=3D\"libdmapsharing\" \ + -I$(top_srcdir) \ + $(GDKPIXBUF_CFLAGS) \ +@@ -52,7 +52,7 @@ libdmapsharing_la_CFLAGS =3D \ + $(GSTREAMERAPP_CFLAGS) \ + $(MDNS_CFLAGS) +=20 +-libdmapsharing_la_LDFLAGS =3D \ ++libdmapsharing_2_2_la_LDFLAGS =3D \ + -version-info @SO_VERSION@ \ + $(GLIB_LIBS) \ + $(GTHREAD_LIBS) \ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index acf0ee5..60e64c9 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -9,7 +9,7 @@ test_dmap_client_SOURCES =3D \ + test-dmap-client.c +=20 + test_dmap_client_LDADD =3D \ +- $(top_builddir)/libdmapsharing/libdmapsharing.la \ ++ $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \ + $(GLIB_LIBS) \ + $(GTHREAD_LIBS) \ + $(GOBJECT_LIBS) \ +@@ -29,7 +29,7 @@ test_dmap_server_SOURCES =3D \ + test-dpap-record-factory.c +=20 + test_dmap_server_LDADD =3D \ +- $(top_builddir)/libdmapsharing/libdmapsharing.la \ ++ $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \ + $(GLIB_LIBS) \ + $(GTHREAD_LIBS) \ + $(GOBJECT_LIBS) \ +--=20 +1.7.4.1 + diff --git a/net-libs/libdmapsharing/libdmapsharing-2.0.4.ebuild b/net-li= bs/libdmapsharing/libdmapsharing-2.0.4.ebuild deleted file mode 100644 index d0b8d08..0000000 --- a/net-libs/libdmapsharing/libdmapsharing-2.0.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" - -inherit base - -DESCRIPTION=3D"A library that implements the DMAP family of protocols" -HOMEPAGE=3D"http://www.flyn.org/projects/libdmapsharing" -SRC_URI=3D"http://www.flyn.org/projects/${PN}/${P}.tar.gz" - -LICENSE=3D"" -SLOT=3D"2.0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"doc" - -RDEPEND=3D" - dev-libs/glib:2 - >=3Dnet-dns/avahi-0.6 - >=3Dnet-libs/libsoup-2.26:2.4 - >=3Dmedia-libs/gstreamer-0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.24 - sys-libs/zlib -" -DEPEND=3D"${RDEPEND} - dev-util/pkgconfig - doc? ( >=3Ddev-util/gtk-doc-1 ) -" - -src_prepare() { - base_src_prepare - - # Fix documentation sloting - sed "s/^\(DOC_MODULE\).*/\1 =3D ${PN}-${SLOT}/" \ - -i docs/Makefile.am docs/Makefile.in || die "sed failed" -} - -src_configure() { - econf --with-mdns=3Davahi $(use_enable doc gtk-doc) -} - -src_install() { - base_src_install - find "${ED}" -name "*.la" -delete || die "la file removal failed" -} diff --git a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild b/net-l= ibs/libdmapsharing/libdmapsharing-2.1.13.ebuild index 34bc648..2bee80b 100644 --- a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild +++ b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild @@ -4,13 +4,13 @@ =20 EAPI=3D"3" =20 -inherit base +inherit autotools base eutils =20 DESCRIPTION=3D"A library that implements the DMAP family of protocols" HOMEPAGE=3D"http://www.flyn.org/projects/libdmapsharing" SRC_URI=3D"http://www.flyn.org/projects/${PN}/${P}.tar.gz" =20 -LICENSE=3D"" +LICENSE=3D"LGPL-2.1" SLOT=3D"2.2" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"doc" @@ -19,11 +19,11 @@ RDEPEND=3D" dev-libs/glib:2 >=3Dnet-dns/avahi-0.6 >=3Dnet-libs/libsoup-2.32:2.4 - >=3Dmedia-libs/gstreamer-0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.24 + >=3Dmedia-libs/gstreamer-0.10:0.10 + >=3Dmedia-libs/gst-plugins-base-0.10.24:0.10 sys-libs/zlib || ( - x11-libs/gdk-pixbuf + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) " DEPEND=3D"${RDEPEND} @@ -34,9 +34,10 @@ DEPEND=3D"${RDEPEND} src_prepare() { base_src_prepare =20 - # Fix documentation sloting - sed "s/^\(DOC_MODULE\).*/\1 =3D ${PN}-${SLOT}/" \ - -i docs/Makefile.am docs/Makefile.in || die "sed failed" + # Fix slot support + epatch "${FILESDIR}/${P}-slotability-fix.patch" + + AT_M4DIR=3D"m4" eautoreconf } =20 src_configure() { @@ -46,4 +47,5 @@ src_configure() { src_install() { base_src_install find "${ED}" -name "*.la" -delete || die "la file removal failed" + dodoc AUTHORS ChangeLog NEWS TODO || die "dodoc failed" }