| 1 |
ssuominen 13/11/23 13:40:55 |
| 2 |
|
| 3 |
Modified: libmtp-9999.ebuild libmtp-1.1.6.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Remove garbage from top of the udev rule wrt #481666 by Maxim Kammerer |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 media-libs/libmtp/libmtp-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: libmtp-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- libmtp-9999.ebuild 27 Aug 2013 21:40:02 -0000 1.8 |
| 23 |
+++ libmtp-9999.ebuild 23 Nov 2013 13:40:55 -0000 1.9 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.8 2013/08/27 21:40:02 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.9 2013/11/23 13:40:55 ssuominen Exp $ |
| 29 |
|
| 30 |
-EAPI=4 |
| 31 |
+EAPI=5 |
| 32 |
|
| 33 |
inherit autotools eutils udev user toolchain-funcs |
| 34 |
|
| 35 |
@@ -11,7 +11,7 @@ |
| 36 |
EGIT_PROJECT="libmtp" |
| 37 |
inherit git-2 |
| 38 |
else |
| 39 |
- KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" |
| 40 |
+ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd" |
| 41 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 42 |
fi |
| 43 |
|
| 44 |
@@ -46,7 +46,7 @@ |
| 45 |
$(use_enable static-libs static) \ |
| 46 |
$(use_enable doc doxygen) \ |
| 47 |
$(use_enable crypt mtpz) \ |
| 48 |
- --with-udev="$(udev_get_udevdir)" \ |
| 49 |
+ --with-udev="$(get_udevdir)" \ |
| 50 |
--with-udev-group=plugdev \ |
| 51 |
--with-udev-mode=0660 |
| 52 |
} |
| 53 |
@@ -59,4 +59,6 @@ |
| 54 |
docinto examples |
| 55 |
dodoc examples/*.{c,h,sh} |
| 56 |
fi |
| 57 |
+ |
| 58 |
+ sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666 |
| 59 |
} |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.10 media-libs/libmtp/libmtp-1.1.6.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild?rev=1.10&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild?rev=1.10&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild?r1=1.9&r2=1.10 |
| 68 |
|
| 69 |
Index: libmtp-1.1.6.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v |
| 72 |
retrieving revision 1.9 |
| 73 |
retrieving revision 1.10 |
| 74 |
diff -u -r1.9 -r1.10 |
| 75 |
--- libmtp-1.1.6.ebuild 29 Aug 2013 19:53:31 -0000 1.9 |
| 76 |
+++ libmtp-1.1.6.ebuild 23 Nov 2013 13:40:55 -0000 1.10 |
| 77 |
@@ -1,13 +1,14 @@ |
| 78 |
# Copyright 1999-2013 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.9 2013/08/29 19:53:31 ago Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.10 2013/11/23 13:40:55 ssuominen Exp $ |
| 82 |
|
| 83 |
-EAPI=4 |
| 84 |
+EAPI=5 |
| 85 |
|
| 86 |
inherit autotools eutils udev user toolchain-funcs |
| 87 |
|
| 88 |
if [[ ${PV} == *9999* ]]; then |
| 89 |
- EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" |
| 90 |
+ EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code" |
| 91 |
+ EGIT_PROJECT="libmtp" |
| 92 |
inherit git-2 |
| 93 |
else |
| 94 |
KEYWORDS="amd64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd" |
| 95 |
@@ -34,7 +35,7 @@ |
| 96 |
} |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
- epatch "${FILESDIR}/${P}-fbsdlibusb.patch" |
| 100 |
+ epatch "${FILESDIR}"/${P}-fbsdlibusb.patch |
| 101 |
if [[ ${PV} == *9999* ]]; then |
| 102 |
touch config.rpath # This is from upstream autogen.sh |
| 103 |
eautoreconf |
| 104 |
@@ -46,7 +47,7 @@ |
| 105 |
$(use_enable static-libs static) \ |
| 106 |
$(use_enable doc doxygen) \ |
| 107 |
$(use_enable crypt mtpz) \ |
| 108 |
- --with-udev="$(udev_get_udevdir)" \ |
| 109 |
+ --with-udev="$(get_udevdir)" \ |
| 110 |
--with-udev-group=plugdev \ |
| 111 |
--with-udev-mode=0660 |
| 112 |
} |
| 113 |
@@ -59,4 +60,6 @@ |
| 114 |
docinto examples |
| 115 |
dodoc examples/*.{c,h,sh} |
| 116 |
fi |
| 117 |
+ |
| 118 |
+ sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666 |
| 119 |
} |
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
1.137 media-libs/libmtp/ChangeLog |
| 124 |
|
| 125 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?rev=1.137&view=markup |
| 126 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?rev=1.137&content-type=text/plain |
| 127 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmtp/ChangeLog?r1=1.136&r2=1.137 |
| 128 |
|
| 129 |
Index: ChangeLog |
| 130 |
=================================================================== |
| 131 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v |
| 132 |
retrieving revision 1.136 |
| 133 |
retrieving revision 1.137 |
| 134 |
diff -u -r1.136 -r1.137 |
| 135 |
--- ChangeLog 29 Aug 2013 19:53:31 -0000 1.136 |
| 136 |
+++ ChangeLog 23 Nov 2013 13:40:55 -0000 1.137 |
| 137 |
@@ -1,6 +1,10 @@ |
| 138 |
# ChangeLog for media-libs/libmtp |
| 139 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 140 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.136 2013/08/29 19:53:31 ago Exp $ |
| 141 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.137 2013/11/23 13:40:55 ssuominen Exp $ |
| 142 |
+ |
| 143 |
+ 23 Nov 2013; Samuli Suominen <ssuominen@g.o> libmtp-1.1.6.ebuild, |
| 144 |
+ libmtp-9999.ebuild: |
| 145 |
+ Remove garbage from top of the udev rule wrt #481666 by Maxim Kammerer |
| 146 |
|
| 147 |
29 Aug 2013; Agostino Sarubbo <ago@g.o> libmtp-1.1.6.ebuild: |
| 148 |
Stable for ia64, wrt bug #470512 |
Archives