* [gentoo-commits] dev/eva:master commit in: net-libs/libdmapsharing/, net-libs/libdmapsharing/files/
@ 2011-03-23 22:46 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2011-03-23 22:46 UTC (permalink / raw
To: gentoo-commits
commit: cabdb628e64415556310f638b2d939e079122e3a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 22:46:00 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 22:46:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=cabdb628
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/Manifest
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 bf09404fc00675fdc1d64b3873ab057ae4a20c28 SHA1 1a4057578d8ae3126eb186f73cb23c2d20994ea4 SHA256 7520163f0a616e2efc15820c5e7f983a22ce41084ba9fc5f415fe384e43eed06
+AUX libdmapsharing-2.1.13-slotability-fix.patch 3445 RMD160 85f24f799c2b249528392b72bcb94292f2a9affd SHA1 e3e856a66af2d68bd9c3601f90d6665dc08788f8 SHA256 7659b94122cfccd96fe06a46e2eff851982e5b87d205c530506de04d23d884ac
DIST libdmapsharing-2.1.13.tar.gz 645475 RMD160 144ff83e87096ea77031eef8dac3fece266084e9 SHA1 f5873a7cfe61228aabe763d1692bede1e9050b20 SHA256 bc4bcedf5da41c1f85fc36931877044f6eaf6043277a0fcfe7d1dc24a401ee1a
-EBUILD libdmapsharing-2.0.4.ebuild 969 RMD160 53ec8b5d553cb94c341b1dbcdaebf4d0f3561ff3 SHA1 2497b435720639898e46abe8ac4d1cc87f17c273 SHA256 c827cd3a2c0013a0f31c8ac37b87f29ee2f6a38ca6e2df3dfe7eb99896e7d517
-EBUILD libdmapsharing-2.1.13.ebuild 1017 RMD160 b2b036f299f6af609eda844bc60fc1970635f952 SHA1 2e4a794e374c160132f30418a4745b5885546385 SHA256 da37f9a44115794114bf36de1cd7b749418edcfa7532895b8769e51300d627bd
+EBUILD libdmapsharing-2.1.13.ebuild 1071 RMD160 b8c81c98d89721fb73a8d9037ac5bda1982b3333 SHA1 c26cda016eb3f53a0d31a2ded19b09bf51292822 SHA256 1666b967b72390a8b766ceb40ed423c55828f33e4d8ba508d30259d1ffcded86
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-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 <eva@gentoo.org>
+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 = 1.6
+ # of using the various options.
+
+ # The name of the module, e.g. 'glib'.
+-DOC_MODULE=libdmapsharing
++DOC_MODULE=libdmapsharing-@API_VERSION@
+
+ # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+ #DOC_MODULE_VERSION=2
+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 = libdmapsharing.la
++lib_LTLIBRARIES = libdmapsharing-2.2.la
+
+ BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h
+
+-libdmapsharing_la_SOURCES = \
++libdmapsharing_2_2_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ daap-record.c \
+ daap-share.c \
+@@ -21,15 +21,15 @@ libdmapsharing_la_SOURCES = \
+ dpap-share.c
+
+ if USE_HOWL
+-libdmapsharing_la_SOURCES += \
++libdmapsharing_2_2_la_SOURCES += \
+ dmap-mdns-browser-howl.c
+ else
+ if USE_DNS_SD
+-libdmapsharing_la_SOURCES += \
++libdmapsharing_2_2_la_SOURCES += \
+ dmap-mdns-browser-dnssd.c \
+ dmap-mdns-publisher-dnssd.c
+ else
+-libdmapsharing_la_SOURCES += \
++libdmapsharing_2_2_la_SOURCES += \
+ dmap-mdns-avahi.c \
+ dmap-mdns-browser-avahi.c \
+ dmap-mdns-publisher-avahi.c
+@@ -37,14 +37,14 @@ endif
+ endif
+
+ if USE_GSTREAMERAPP
+-libdmapsharing_la_SOURCES += \
++libdmapsharing_2_2_la_SOURCES += \
+ g-gst-input-stream.c \
+ g-gst-mp3-input-stream.c \
+ g-gst-wav-input-stream.c \
+ gst-util.c
+ endif
+
+-libdmapsharing_la_CFLAGS = \
++libdmapsharing_2_2_la_CFLAGS = \
+ -DG_LOG_DOMAIN=\"libdmapsharing\" \
+ -I$(top_srcdir) \
+ $(GDKPIXBUF_CFLAGS) \
+@@ -52,7 +52,7 @@ libdmapsharing_la_CFLAGS = \
+ $(GSTREAMERAPP_CFLAGS) \
+ $(MDNS_CFLAGS)
+
+-libdmapsharing_la_LDFLAGS = \
++libdmapsharing_2_2_la_LDFLAGS = \
+ -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 = \
+ test-dmap-client.c
+
+ test_dmap_client_LDADD = \
+- $(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 = \
+ test-dpap-record-factory.c
+
+ test_dmap_server_LDADD = \
+- $(top_builddir)/libdmapsharing/libdmapsharing.la \
++ $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \
+ $(GLIB_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GOBJECT_LIBS) \
+--
+1.7.4.1
+
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.0.4.ebuild b/net-libs/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="3"
-
-inherit base
-
-DESCRIPTION="A library that implements the DMAP family of protocols"
-HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
-SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE=""
-SLOT="2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
- dev-libs/glib:2
- >=net-dns/avahi-0.6
- >=net-libs/libsoup-2.26:2.4
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10.24
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( >=dev-util/gtk-doc-1 )
-"
-
-src_prepare() {
- base_src_prepare
-
- # Fix documentation sloting
- sed "s/^\(DOC_MODULE\).*/\1 = ${PN}-${SLOT}/" \
- -i docs/Makefile.am docs/Makefile.in || die "sed failed"
-}
-
-src_configure() {
- econf --with-mdns=avahi $(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-libs/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 @@
EAPI="3"
-inherit base
+inherit autotools base eutils
DESCRIPTION="A library that implements the DMAP family of protocols"
HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
-LICENSE=""
+LICENSE="LGPL-2.1"
SLOT="2.2"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
@@ -19,11 +19,11 @@ RDEPEND="
dev-libs/glib:2
>=net-dns/avahi-0.6
>=net-libs/libsoup-2.32:2.4
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10.24
+ >=media-libs/gstreamer-0.10:0.10
+ >=media-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="${RDEPEND}
@@ -34,9 +34,10 @@ DEPEND="${RDEPEND}
src_prepare() {
base_src_prepare
- # Fix documentation sloting
- sed "s/^\(DOC_MODULE\).*/\1 = ${PN}-${SLOT}/" \
- -i docs/Makefile.am docs/Makefile.in || die "sed failed"
+ # Fix slot support
+ epatch "${FILESDIR}/${P}-slotability-fix.patch"
+
+ AT_M4DIR="m4" eautoreconf
}
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"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/eva:master commit in: net-libs/libdmapsharing/, net-libs/libdmapsharing/files/
@ 2011-03-24 9:28 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2011-03-24 9:28 UTC (permalink / raw
To: gentoo-commits
commit: a1e17d99bde294c579c0ad9830c1f7b92d7736ad
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 09:26:55 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 09:26:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=a1e17d99
net-libs/libdmapsharing: moved to gentoo-x86
---
net-libs/libdmapsharing/Manifest | 3 -
.../libdmapsharing-2.1.13-slotability-fix.patch | 121 --------------------
.../libdmapsharing/libdmapsharing-2.1.13.ebuild | 51 --------
3 files changed, 0 insertions(+), 175 deletions(-)
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
deleted file mode 100644
index 4571d9e..0000000
--- a/net-libs/libdmapsharing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX libdmapsharing-2.1.13-slotability-fix.patch 3445 RMD160 85f24f799c2b249528392b72bcb94292f2a9affd SHA1 e3e856a66af2d68bd9c3601f90d6665dc08788f8 SHA256 7659b94122cfccd96fe06a46e2eff851982e5b87d205c530506de04d23d884ac
-DIST libdmapsharing-2.1.13.tar.gz 645475 RMD160 144ff83e87096ea77031eef8dac3fece266084e9 SHA1 f5873a7cfe61228aabe763d1692bede1e9050b20 SHA256 bc4bcedf5da41c1f85fc36931877044f6eaf6043277a0fcfe7d1dc24a401ee1a
-EBUILD libdmapsharing-2.1.13.ebuild 1071 RMD160 b8c81c98d89721fb73a8d9037ac5bda1982b3333 SHA1 c26cda016eb3f53a0d31a2ded19b09bf51292822 SHA256 1666b967b72390a8b766ceb40ed423c55828f33e4d8ba508d30259d1ffcded86
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
deleted file mode 100644
index f4f68ef..0000000
--- a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 6b9b056cdf128c7d40b26ee6615b56510d71c341 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-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 = 1.6
- # of using the various options.
-
- # The name of the module, e.g. 'glib'.
--DOC_MODULE=libdmapsharing
-+DOC_MODULE=libdmapsharing-@API_VERSION@
-
- # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
- #DOC_MODULE_VERSION=2
-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 = libdmapsharing.la
-+lib_LTLIBRARIES = libdmapsharing-2.2.la
-
- BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h
-
--libdmapsharing_la_SOURCES = \
-+libdmapsharing_2_2_la_SOURCES = \
- $(BUILT_SOURCES) \
- daap-record.c \
- daap-share.c \
-@@ -21,15 +21,15 @@ libdmapsharing_la_SOURCES = \
- dpap-share.c
-
- if USE_HOWL
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
- dmap-mdns-browser-howl.c
- else
- if USE_DNS_SD
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
- dmap-mdns-browser-dnssd.c \
- dmap-mdns-publisher-dnssd.c
- else
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
- dmap-mdns-avahi.c \
- dmap-mdns-browser-avahi.c \
- dmap-mdns-publisher-avahi.c
-@@ -37,14 +37,14 @@ endif
- endif
-
- if USE_GSTREAMERAPP
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
- g-gst-input-stream.c \
- g-gst-mp3-input-stream.c \
- g-gst-wav-input-stream.c \
- gst-util.c
- endif
-
--libdmapsharing_la_CFLAGS = \
-+libdmapsharing_2_2_la_CFLAGS = \
- -DG_LOG_DOMAIN=\"libdmapsharing\" \
- -I$(top_srcdir) \
- $(GDKPIXBUF_CFLAGS) \
-@@ -52,7 +52,7 @@ libdmapsharing_la_CFLAGS = \
- $(GSTREAMERAPP_CFLAGS) \
- $(MDNS_CFLAGS)
-
--libdmapsharing_la_LDFLAGS = \
-+libdmapsharing_2_2_la_LDFLAGS = \
- -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 = \
- test-dmap-client.c
-
- test_dmap_client_LDADD = \
-- $(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 = \
- test-dpap-record-factory.c
-
- test_dmap_server_LDADD = \
-- $(top_builddir)/libdmapsharing/libdmapsharing.la \
-+ $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \
- $(GLIB_LIBS) \
- $(GTHREAD_LIBS) \
- $(GOBJECT_LIBS) \
---
-1.7.4.1
-
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild
deleted file mode 100644
index 2bee80b..0000000
--- a/net-libs/libdmapsharing/libdmapsharing-2.1.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools base eutils
-
-DESCRIPTION="A library that implements the DMAP family of protocols"
-HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
-SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
- dev-libs/glib:2
- >=net-dns/avahi-0.6
- >=net-libs/libsoup-2.32:2.4
- >=media-libs/gstreamer-0.10:0.10
- >=media-libs/gst-plugins-base-0.10.24:0.10
- sys-libs/zlib
- || (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2 )
-"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( >=dev-util/gtk-doc-1 )
-"
-
-src_prepare() {
- base_src_prepare
-
- # Fix slot support
- epatch "${FILESDIR}/${P}-slotability-fix.patch"
-
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- econf --with-mdns=avahi $(use_enable doc gtk-doc)
-}
-
-src_install() {
- base_src_install
- find "${ED}" -name "*.la" -delete || die "la file removal failed"
- dodoc AUTHORS ChangeLog NEWS TODO || die "dodoc failed"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-24 9:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-24 9:28 [gentoo-commits] dev/eva:master commit in: net-libs/libdmapsharing/, net-libs/libdmapsharing/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2011-03-23 22:46 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox