Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libmtp: libmtp-9999.ebuild libmtp-1.1.8.ebuild ChangeLog
Date: Sat, 27 Sep 2014 21:51:03
Message-Id: 20140927215058.E2233671D@oystercatcher.gentoo.org
1 ssuominen 14/09/27 21:50:58
2
3 Modified: libmtp-9999.ebuild ChangeLog
4 Added: libmtp-1.1.8.ebuild
5 Log:
6 Version bump wrt #521888 by Dimitri Semitsoglou-Tsiapos and Maik Nijhuis
7
8 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.15 media-libs/libmtp/libmtp-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?rev=1.15&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?rev=1.15&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?r1=1.14&r2=1.15
16
17 Index: libmtp-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v
20 retrieving revision 1.14
21 retrieving revision 1.15
22 diff -u -r1.14 -r1.15
23 --- libmtp-9999.ebuild 10 Sep 2014 22:17:02 -0000 1.14
24 +++ libmtp-9999.ebuild 27 Sep 2014 21:50:58 -0000 1.15
25 @@ -1,43 +1,54 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.14 2014/09/10 22:17:02 zerochaos Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.15 2014/09/27 21:50:58 ssuominen Exp $
30
31 EAPI=5
32
33 -inherit autotools eutils udev user toolchain-funcs
34 -
35 -if [[ ${PV} == *9999* ]]; then
36 - EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code"
37 - EGIT_PROJECT="libmtp"
38 - inherit git-2
39 +if [[ ${PV} == 9999* ]]; then
40 + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
41 + inherit autotools git-r3
42 else
43 - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
44 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
45 + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
46 fi
47
48 +inherit eutils udev user
49 +
50 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
51 HOMEPAGE="http://libmtp.sourceforge.net/"
52
53 -LICENSE="LGPL-2.1"
54 -SLOT="0"
55 +LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
56 +SLOT="0/9" # Based on SONAME of libmtp shared library
57 IUSE="+crypt doc examples static-libs"
58
59 RDEPEND="virtual/libusb:1
60 - crypt? ( dev-libs/libgcrypt:0=
61 - dev-libs/libgpg-error )"
62 + crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
63 DEPEND="${RDEPEND}
64 virtual/pkgconfig
65 doc? ( app-doc/doxygen )"
66
67 -DOCS="AUTHORS ChangeLog README TODO"
68 -
69 pkg_setup() {
70 + DOCS="AUTHORS README TODO"
71 enewgroup plugdev
72 }
73
74 +src_unpack() {
75 + [[ ${PV} == 9999* ]] && git-r3_src_unpack
76 + default_src_unpack
77 +}
78 +
79 src_prepare() {
80 - if [[ ${PV} == *9999* ]]; then
81 - touch config.rpath # This is from upstream autogen.sh
82 + # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
83 + rm -f ChangeLog
84 +
85 + if [[ ${PV} == 9999* ]]; then
86 + local crpthf=config.rpath
87 + local crpthd=/usr/share/gettext/${crpthf}
88 + if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
89 + cp "${crpthd}" .
90 + else
91 + touch ${crpthf} # This is from upstream autogen.sh
92 + fi
93 eautoreconf
94 fi
95 }
96 @@ -54,12 +65,10 @@
97
98 src_install() {
99 default
100 - prune_libtool_files
101 + prune_libtool_files --all
102
103 if use examples; then
104 docinto examples
105 dodoc examples/*.{c,h,sh}
106 fi
107 -
108 - sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
109 }
110
111
112
113 1.151 media-libs/libmtp/ChangeLog
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?rev=1.151&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?rev=1.151&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?r1=1.150&r2=1.151
118
119 Index: ChangeLog
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v
122 retrieving revision 1.150
123 retrieving revision 1.151
124 diff -u -r1.150 -r1.151
125 --- ChangeLog 10 Sep 2014 22:17:02 -0000 1.150
126 +++ ChangeLog 27 Sep 2014 21:50:58 -0000 1.151
127 @@ -1,6 +1,12 @@
128 # ChangeLog for media-libs/libmtp
129 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
130 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.150 2014/09/10 22:17:02 zerochaos Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.151 2014/09/27 21:50:58 ssuominen Exp $
132 +
133 +*libmtp-1.1.8 (27 Sep 2014)
134 +
135 + 27 Sep 2014; Samuli Suominen <ssuominen@g.o> +libmtp-1.1.8.ebuild,
136 + libmtp-9999.ebuild:
137 + Version bump wrt #521888 by Dimitri Semitsoglou-Tsiapos and Maik Nijhuis
138
139 10 Sep 2014; Rick Farina <zerochaos@g.o> libmtp-1.1.6-r1.ebuild,
140 libmtp-9999.ebuild:
141
142
143
144 1.1 media-libs/libmtp/libmtp-1.1.8.ebuild
145
146 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-1.1.8.ebuild?rev=1.1&view=markup
147 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-1.1.8.ebuild?rev=1.1&content-type=text/plain
148
149 Index: libmtp-1.1.8.ebuild
150 ===================================================================
151 # Copyright 1999-2014 Gentoo Foundation
152 # Distributed under the terms of the GNU General Public License v2
153 # $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.8.ebuild,v 1.1 2014/09/27 21:50:58 ssuominen Exp $
154
155 EAPI=5
156
157 if [[ ${PV} == 9999* ]]; then
158 EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
159 inherit autotools git-r3
160 else
161 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
162 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
163 fi
164
165 inherit eutils udev user
166
167 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
168 HOMEPAGE="http://libmtp.sourceforge.net/"
169
170 LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
171 SLOT="0/9" # Based on SONAME of libmtp shared library
172 IUSE="+crypt doc examples static-libs"
173
174 RDEPEND="virtual/libusb:1
175 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
176 DEPEND="${RDEPEND}
177 virtual/pkgconfig
178 doc? ( app-doc/doxygen )"
179
180 pkg_setup() {
181 DOCS="AUTHORS README TODO"
182 enewgroup plugdev
183 }
184
185 src_unpack() {
186 [[ ${PV} == 9999* ]] && git-r3_src_unpack
187 default_src_unpack
188 }
189
190 src_prepare() {
191 # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
192 rm -f ChangeLog
193
194 if [[ ${PV} == 9999* ]]; then
195 local crpthf=config.rpath
196 local crpthd=/usr/share/gettext/${crpthf}
197 if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
198 cp "${crpthd}" .
199 else
200 touch ${crpthf} # This is from upstream autogen.sh
201 fi
202 eautoreconf
203 fi
204 }
205
206 src_configure() {
207 econf \
208 $(use_enable static-libs static) \
209 $(use_enable doc doxygen) \
210 $(use_enable crypt mtpz) \
211 --with-udev="$(get_udevdir)" \
212 --with-udev-group=plugdev \
213 --with-udev-mode=0660
214 }
215
216 src_install() {
217 default
218 prune_libtool_files --all
219
220 if use examples; then
221 docinto examples
222 dodoc examples/*.{c,h,sh}
223 fi
224 }