Gentoo Archives: gentoo-commits

From: "Christoph Junghans (ottxor)" <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: libgphoto2-2.5.0.ebuild ChangeLog
Date: Wed, 22 Aug 2012 02:51:28
Message-Id: 20120822025116.5C69C202CA@flycatcher.gentoo.org
1 ottxor 12/08/22 02:51:16
2
3 Modified: libgphoto2-2.5.0.ebuild ChangeLog
4 Log:
5 added prefix keywords
6
7 (Portage version: 2.2.0_alpha121/cvs/Linux i686)
8
9 Revision Changes Path
10 1.2 media-libs/libgphoto2/libgphoto2-2.5.0.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild?r1=1.1&r2=1.2
15
16 Index: libgphoto2-2.5.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- libgphoto2-2.5.0.ebuild 21 Jul 2012 11:27:08 -0000 1.1
23 +++ libgphoto2-2.5.0.ebuild 22 Aug 2012 02:51:16 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.1 2012/07/21 11:27:08 pacho Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.2 2012/08/22 02:51:16 ottxor Exp $
29
30 # TODO
31 # 1. Track upstream bug --disable-docs does not work.
32 @@ -16,7 +16,7 @@
33
34 LICENSE="GPL-2"
35 SLOT="0"
36 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
37 +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
38 IUSE="doc examples exif gd jpeg nls kernel_linux zeroconf"
39
40 # By default, drivers for all supported cameras will be compiled.
41 @@ -131,11 +131,11 @@
42 $(use_with gd) \
43 $(use_with jpeg) \
44 --with-drivers=${cameras} \
45 - --with-doc-dir=/usr/share/doc/${PF} \
46 - --with-html-dir=/usr/share/doc/${PF}/html \
47 - --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
48 + --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
49 + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
50 + --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
51 --with-rpmbuild=$(type -P true) \
52 - udevscriptdir=/lib/udev \
53 + udevscriptdir="${EPREFIX}"/lib/udev \
54 ${myconf}
55
56 # FIXME: gtk-doc is currently broken
57 @@ -157,7 +157,7 @@
58 find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
59
60 # Clean up unwanted files
61 - rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
62 + rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
63 dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
64
65 if use examples; then
66 @@ -166,25 +166,25 @@
67 fi
68
69 # FIXME: fixup autoconf bug
70 - if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
71 - rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
72 + if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
73 + rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
74 fi
75 # end fixup
76
77 UDEV_RULES="/lib/udev/rules.d/70-libgphoto2.rules"
78 CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
79
80 - if [ -x "${D}"${CAM_LIST} ]; then
81 + if [ -x "${ED}"${CAM_LIST} ]; then
82 # Let print-camera-list find libgphoto2.so
83 - export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
84 + export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
85 # Let libgphoto2 find its camera-modules
86 - export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
87 + export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
88
89 einfo "Generating UDEV-rules ..."
90 - mkdir -p "${D}"/${UDEV_RULES%/*}
91 + mkdir -p "${ED}"/${UDEV_RULES%/*}
92 echo -e "# do not edit this file, it will be overwritten on update\n#" \
93 - > "${D}"/${UDEV_RULES}
94 - "${D}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${UDEV_RULES} \
95 + > "${ED}"/${UDEV_RULES}
96 + "${ED}"${CAM_LIST} udev-rules version 136 group plugdev >> "${ED}"/${UDEV_RULES} \
97 || die "failed to create udev-rules"
98 else
99 eerror "Unable to find print-camera-list"
100 @@ -198,7 +198,7 @@
101 pkg_postinst() {
102 elog "Don't forget to add yourself to the plugdev group "
103 elog "if you want to be able to access your camera."
104 - local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
105 + local OLD_UDEV_RULES="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
106 if [[ -f ${OLD_UDEV_RULES} ]]; then
107 rm -f "${OLD_UDEV_RULES}"
108 fi
109
110
111
112 1.213 media-libs/libgphoto2/ChangeLog
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.213&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.213&content-type=text/plain
116 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.212&r2=1.213
117
118 Index: ChangeLog
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
121 retrieving revision 1.212
122 retrieving revision 1.213
123 diff -u -r1.212 -r1.213
124 --- ChangeLog 21 Jul 2012 11:27:08 -0000 1.212
125 +++ ChangeLog 22 Aug 2012 02:51:16 -0000 1.213
126 @@ -1,6 +1,9 @@
127 # ChangeLog for media-libs/libgphoto2
128 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
129 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.212 2012/07/21 11:27:08 pacho Exp $
130 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.213 2012/08/22 02:51:16 ottxor Exp $
131 +
132 + 22 Aug 2012; Christoph Junghans <ottxor@g.o> libgphoto2-2.5.0.ebuild:
133 + added prefix keywords
134
135 *libgphoto2-2.5.0 (21 Jul 2012)