Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/xsane: xsane-0.999-r1.ebuild ChangeLog xsane-0.998-r1.ebuild
Date: Sat, 02 Aug 2014 08:45:53
Message-Id: 20140802084547.156F020035@flycatcher.gentoo.org
1 pacho 14/08/02 08:45:45
2
3 Modified: ChangeLog
4 Added: xsane-0.999-r1.ebuild
5 Removed: xsane-0.998-r1.ebuild
6 Log:
7 Support lcms2 (#517642 by Nikoli)
8
9 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
10
11 Revision Changes Path
12 1.113 media-gfx/xsane/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xsane/ChangeLog?rev=1.113&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xsane/ChangeLog?rev=1.113&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xsane/ChangeLog?r1=1.112&r2=1.113
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v
21 retrieving revision 1.112
22 retrieving revision 1.113
23 diff -u -r1.112 -r1.113
24 --- ChangeLog 18 Jan 2014 19:55:52 -0000 1.112
25 +++ ChangeLog 2 Aug 2014 08:45:45 -0000 1.113
26 @@ -1,6 +1,12 @@
27 # ChangeLog for media-gfx/xsane
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.112 2014/01/18 19:55:52 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.113 2014/08/02 08:45:45 pacho Exp $
31 +
32 +*xsane-0.999-r1 (02 Aug 2014)
33 +
34 + 02 Aug 2014; Pacho Ramos <pacho@g.o> +files/xsane-0.999-lcms2.patch,
35 + +xsane-0.999-r1.ebuild, -xsane-0.998-r1.ebuild:
36 + Support lcms2 (#517642 by Nikoli)
37
38 18 Jan 2014; Agostino Sarubbo <ago@g.o> xsane-0.999.ebuild:
39 Stable for alpha, wrt bug #491476
40
41
42
43 1.1 media-gfx/xsane/xsane-0.999-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xsane/xsane-0.999-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xsane/xsane-0.999-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xsane-0.999-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.999-r1.ebuild,v 1.1 2014/08/02 08:45:44 pacho Exp $
53
54 EAPI=5
55 inherit autotools eutils toolchain-funcs
56
57 DESCRIPTION="graphical scanning frontend"
58 HOMEPAGE="http://www.xsane.org/"
59 SRC_URI="
60 http://www.xsane.org/download/${P}.tar.gz
61 http://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz
62 "
63
64 LICENSE="GPL-2"
65 SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
67 IUSE="nls jpeg png tiff gimp lcms ocr"
68
69 RDEPEND="
70 media-gfx/sane-backends
71 x11-libs/gtk+:2
72 x11-misc/xdg-utils
73 jpeg? ( virtual/jpeg )
74 png? ( media-libs/libpng )
75 tiff? ( media-libs/tiff )
76 gimp? ( media-gfx/gimp )
77 lcms? ( media-libs/lcms:2 )
78 "
79
80 PDEPEND="ocr? ( app-text/gocr )"
81
82 DEPEND="${RDEPEND}
83 app-arch/xz-utils
84 virtual/pkgconfig
85 "
86
87 src_prepare() {
88 # Apply multiple fixes from different distributions
89 # Drop included patch and reuse patchset from prior version
90 rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die
91 epatch "${WORKDIR}/${PN}-0.998-patches-2"/*.patch
92
93 # Fix compability with libpng15 wrt #377363
94 sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
95
96 # Fix AR calling directly (bug #442606)
97 sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
98 tc-export AR
99
100 # Add support for lcms-2 (from Fedora)
101 epatch "${FILESDIR}/${PN}-0.999-lcms2.patch"
102 AT_M4DIR="m4" eautoreconf
103 }
104
105 src_configure() {
106 econf \
107 --enable-gtk2 \
108 $(use_enable nls) \
109 $(use_enable jpeg) \
110 $(use_enable png) \
111 $(use_enable tiff) \
112 $(use_enable gimp) \
113 $(use_enable lcms)
114 }
115
116 src_install() {
117 default
118
119 dodoc xsane.*
120
121 # link xsane so it is seen as a plugin in gimp
122 if use gimp; then
123 local plugindir
124 if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
125 plugindir="$(gimptool --gimpplugindir)/plug-ins"
126 elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
127 plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
128 else
129 die "Can't find GIMP plugin directory."
130 fi
131 dodir "${plugindir#${EPREFIX}}"
132 dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
133 fi
134
135 newicon src/xsane-48x48.png ${PN}.png
136 }