| 1 |
vapier 15/04/29 04:42:39 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: netpbm-10.70.00.ebuild |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.292 media-libs/netpbm/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.292&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?rev=1.292&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/ChangeLog?r1=1.291&r2=1.292 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v |
| 20 |
retrieving revision 1.291 |
| 21 |
retrieving revision 1.292 |
| 22 |
diff -u -r1.291 -r1.292 |
| 23 |
--- ChangeLog 29 Apr 2015 04:00:38 -0000 1.291 |
| 24 |
+++ ChangeLog 29 Apr 2015 04:42:39 -0000 1.292 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for media-libs/netpbm |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.291 2015/04/29 04:00:38 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.292 2015/04/29 04:42:39 vapier Exp $ |
| 30 |
+ |
| 31 |
+*netpbm-10.70.00 (29 Apr 2015) |
| 32 |
+ |
| 33 |
+ 29 Apr 2015; Mike Frysinger <vapier@g.o> |
| 34 |
+ +files/netpbm-10.70-system-libs.patch, +netpbm-10.70.00.ebuild: |
| 35 |
+ Version bump. |
| 36 |
|
| 37 |
29 Apr 2015; Mike Frysinger <vapier@g.o> netpbm-10.66.00.ebuild: |
| 38 |
Handle test failures when USE=-tiff and USE=-jpeg2k #545418 by Jonathan |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 media-libs/netpbm/netpbm-10.70.00.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/netpbm-10.70.00.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/netpbm/netpbm-10.70.00.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: netpbm-10.70.00.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2015 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.70.00.ebuild,v 1.1 2015/04/29 04:42:39 vapier Exp $ |
| 52 |
|
| 53 |
EAPI="4" |
| 54 |
|
| 55 |
inherit toolchain-funcs eutils multilib |
| 56 |
|
| 57 |
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
| 58 |
HOMEPAGE="http://netpbm.sourceforge.net/" |
| 59 |
SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 60 |
|
| 61 |
LICENSE="GPL-2" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 64 |
IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" |
| 65 |
|
| 66 |
RDEPEND="jbig? ( media-libs/jbigkit ) |
| 67 |
jpeg? ( virtual/jpeg:0 ) |
| 68 |
jpeg2k? ( media-libs/jasper ) |
| 69 |
png? ( >=media-libs/libpng-1.4:0 ) |
| 70 |
rle? ( media-libs/urt ) |
| 71 |
svga? ( media-libs/svgalib ) |
| 72 |
tiff? ( >=media-libs/tiff-3.5.5:0 ) |
| 73 |
xml? ( dev-libs/libxml2 ) |
| 74 |
zlib? ( sys-libs/zlib ) |
| 75 |
X? ( x11-libs/libX11 )" |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
app-arch/xz-utils |
| 78 |
sys-devel/flex" |
| 79 |
|
| 80 |
netpbm_libtype() { |
| 81 |
case ${CHOST} in |
| 82 |
*-darwin*) echo dylib;; |
| 83 |
*) echo unixshared;; |
| 84 |
esac |
| 85 |
} |
| 86 |
netpbm_libsuffix() { |
| 87 |
local suffix=$(get_libname) |
| 88 |
echo ${suffix//\.} |
| 89 |
} |
| 90 |
netpbm_ldshlib() { |
| 91 |
case ${CHOST} in |
| 92 |
*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; |
| 93 |
*) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
| 94 |
esac |
| 95 |
} |
| 96 |
netpbm_config() { |
| 97 |
if use $1 ; then |
| 98 |
[[ $2 != "!" ]] && echo -l${2:-$1} |
| 99 |
else |
| 100 |
echo NONE |
| 101 |
fi |
| 102 |
} |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
epatch "${FILESDIR}"/netpbm-10.31-build.patch |
| 106 |
epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530 |
| 107 |
epatch "${FILESDIR}"/netpbm-10.70-system-libs.patch |
| 108 |
|
| 109 |
# make sure we use system libs |
| 110 |
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
| 111 |
rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die |
| 112 |
|
| 113 |
# disable certain tests based on active USE flags |
| 114 |
local del=( |
| 115 |
$(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') |
| 116 |
$(usex rle '' 'utahrle-roundtrip') |
| 117 |
$(usex tiff '' 'tiff-roundtrip') |
| 118 |
) |
| 119 |
if [[ ${#del[@]} -gt 0 ]] ; then |
| 120 |
sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die |
| 121 |
fi |
| 122 |
del=( |
| 123 |
pnmtofiasco fiascotopnm # We always disable fiasco |
| 124 |
$(usex jbig '' 'jbigtopnm pnmtojbig') |
| 125 |
$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k') |
| 126 |
$(usex rle '' 'pnmtorle rletopnm') |
| 127 |
$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') |
| 128 |
) |
| 129 |
if [[ ${#del[@]} -gt 0 ]] ; then |
| 130 |
sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die |
| 131 |
sed -i '/^$/d' test/all-in-place.ok || die |
| 132 |
fi |
| 133 |
|
| 134 |
# take care of the importinc stuff ourselves by only doing it once |
| 135 |
# at the top level and having all subdirs use that one set #149843 |
| 136 |
sed -i \ |
| 137 |
-e '/^importinc:/s|^|importinc:\nmanual_|' \ |
| 138 |
-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
| 139 |
common.mk || die |
| 140 |
sed -i \ |
| 141 |
-e '/%.c/s: importinc$::' \ |
| 142 |
common.mk lib/Makefile lib/util/Makefile || die |
| 143 |
|
| 144 |
# avoid ugly depend.mk warnings |
| 145 |
touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
| 146 |
} |
| 147 |
|
| 148 |
src_configure() { |
| 149 |
cat config.mk.in - >> config.mk <<-EOF |
| 150 |
# Misc crap |
| 151 |
BUILD_FIASCO = N |
| 152 |
SYMLINK = ln -sf |
| 153 |
|
| 154 |
# These vars let src_test work by default |
| 155 |
PKGDIR_DEFAULT = ${T}/netpbm |
| 156 |
RESULTDIR_DEFAULT = ${T}/netpbm-test |
| 157 |
|
| 158 |
# Toolchain options |
| 159 |
CC = $(tc-getCC) -Wall |
| 160 |
LD = \$(CC) |
| 161 |
CC_FOR_BUILD = $(tc-getBUILD_CC) |
| 162 |
LD_FOR_BUILD = \$(CC_FOR_BUILD) |
| 163 |
AR = $(tc-getAR) |
| 164 |
RANLIB = $(tc-getRANLIB) |
| 165 |
|
| 166 |
STRIPFLAG = |
| 167 |
CFLAGS_SHLIB = -fPIC |
| 168 |
|
| 169 |
LDRELOC = \$(LD) -r |
| 170 |
LDSHLIB = $(netpbm_ldshlib) |
| 171 |
LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
| 172 |
LINKERISCOMPILER = Y |
| 173 |
NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
| 174 |
NETPBMLIBTYPE = $(netpbm_libtype) |
| 175 |
STATICLIB_TOO = $(usex static-libs Y N) |
| 176 |
|
| 177 |
# The var is called SSE, but the code is actually SSE2. |
| 178 |
WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) |
| 179 |
|
| 180 |
# Gentoo build options |
| 181 |
TIFFLIB = $(netpbm_config tiff) |
| 182 |
# Let tiff worry about its own dependencies #395753 |
| 183 |
TIFFLIB_NEEDS_JPEG = N |
| 184 |
TIFFLIB_NEEDS_Z = N |
| 185 |
JPEGLIB = $(netpbm_config jpeg) |
| 186 |
PNGLIB = $(netpbm_config png) |
| 187 |
ZLIB = $(netpbm_config zlib z) |
| 188 |
LINUXSVGALIB = $(netpbm_config svga vga) |
| 189 |
XML2_LIBS = $(netpbm_config xml xml2) |
| 190 |
JBIGLIB = $(netpbm_config jbig) |
| 191 |
JBIGHDR_DIR = |
| 192 |
JASPERLIB = $(netpbm_config jpeg2k jasper) |
| 193 |
JASPERHDR_DIR = |
| 194 |
URTLIB = $(netpbm_config rle) |
| 195 |
URTHDR_DIR = |
| 196 |
X11LIB = $(netpbm_config X X11) |
| 197 |
X11HDR_DIR = |
| 198 |
EOF |
| 199 |
# cannot chain the die with the heredoc above as bash-3 |
| 200 |
# has a parser bug in that setup #282902 |
| 201 |
[ $? -eq 0 ] || die "writing config.mk failed" |
| 202 |
} |
| 203 |
|
| 204 |
src_compile() { |
| 205 |
emake -j1 pm_config.h version.h manual_importinc #149843 |
| 206 |
emake |
| 207 |
} |
| 208 |
|
| 209 |
src_test() { |
| 210 |
# The code wants to install everything first and then test the result. |
| 211 |
emake install.{bin,lib} |
| 212 |
emake check |
| 213 |
} |
| 214 |
|
| 215 |
src_install() { |
| 216 |
# Subdir make targets like to use `mkdir` all over the place |
| 217 |
# without any actual dependencies, thus the -j1. |
| 218 |
emake -j1 package pkgdir="${ED}"/usr |
| 219 |
|
| 220 |
[[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) |
| 221 |
|
| 222 |
# Remove cruft that we don't need, and move around stuff we want |
| 223 |
rm "${ED}"/usr/bin/{doc.url,manweb} || die |
| 224 |
rm -r "${ED}"/usr/man/web || die |
| 225 |
rm -r "${ED}"/usr/link || die |
| 226 |
rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die |
| 227 |
dodir /usr/share |
| 228 |
mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
| 229 |
mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
| 230 |
|
| 231 |
doman userguide/*.[0-9] |
| 232 |
use doc && dohtml -r userguide |
| 233 |
dodoc README |
| 234 |
cd doc |
| 235 |
dodoc HISTORY Netpbm.programming USERDOC |
| 236 |
dohtml -r . |
| 237 |
} |
Archives