Diff netpbm-11.2.4 with a netpbm-11.4.2

/usr/portage/media-libs/netpbm/netpbm-11.4.2.ebuild 2023-10-09 14:52:31.704368406 +0300
8 8
# Upstream has 3 flavors of netpbm: super stable, stable and advanced.
9 9
# They only provide a tarball for super stable, but super stable is a bit lagging.
10 10
# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]"
11
# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]".
11
# and the advanced branch of their svn (currently versions 11.4.yy) on SLOT "0/advanced[.rev]".
12 12
# The stable branch is stabilized according to usual Gentoo rules, while the
13 13
# advanced branch will not be stabilized.
14 14
# A detailed explanation is here https://netpbm.sourceforge.net/release.html
......
18 18
SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
19 19

  
20 20
LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
21
SLOT="0/stable.102"
21
SLOT="0/advanced.104"
22 22
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
23 23
IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
24 24

  
......
93 93
	default
94 94

  
95 95
	# make sure we use system libs
96
	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
96
	sed '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die
97 97
	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
98 98

  
99
	# fix typo in a test
100
	sed -i \
101
		-e 's:^o#! /bin/sh:#! /bin/sh:' \
102
		test/stdin-ppm3.test || die
103

  
104 99
	# take care of the importinc stuff ourselves by only doing it once
105 100
	# at the top level and having all subdirs use that one set #149843
106
	sed -i \
101
	sed \
107 102
		-e '/^importinc:/s|^|importinc:\nmanual_|' \
108 103
		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
109
		common.mk || die
110
	sed -i \
104
		-i common.mk || die
105
	sed \
111 106
		-e '/%.c/s: importinc$::' \
112
		common.mk lib/Makefile lib/util/Makefile || die
113
	sed -i \
107
		-i common.mk lib/Makefile lib/util/Makefile || die
108
	sed \
114 109
		-e 's:pkg-config:$(PKG_CONFIG):' \
115
		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
110
		-i GNUmakefile converter/other/Makefile other/pamx/Makefile || die
116 111

  
117 112
	# The postscript knob is currently bound up with a fork test.
118 113
	if ! use postscript ; then
119
		sed -i \
114
		sed \
120 115
			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
121
			converter/other/Makefile generator/Makefile || die
122
		sed -i -r \
116
			-i converter/other/Makefile generator/Makefile || die
117
		sed -r \
123 118
			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
124
			test/all-in-place.{ok,test} || die
125
		sed -i \
119
			-i test/all-in-place.{ok,test} || die
120
		sed \
126 121
			-e 's:lps-roundtrip.*::' \
127 122
			-e 's:pbmtextps-dump.*::' \
128 123
			-e 's:pbmtextps.*::' \
129
			test/Test-Order || die
130
		sed -i \
124
			-i test/Test-Order || die
125
		sed \
131 126
			-e '/^$/d' \
132
			test/all-in-place.ok || die
133
		sed -i \
127
			-i test/all-in-place.ok || die
128
		sed \
134 129
			'2iexit 80' \
135
			test/ps-{alt-,flate-,}roundtrip.test || die
130
			-i test/ps-{alt-,flate-,}roundtrip.test || die
136 131
	fi
137 132

  
138 133
	# the new postscript test needs +x
......
140 135

  
141 136
	# Do not test png if not built
142 137
	if ! use png ; then
143
		sed -i -E \
138
		sed -E \
144 139
			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
145
			test/all-in-place.{ok,test} || die
146
		sed -i \
140
			-i test/all-in-place.{ok,test} || die
141
		sed \
147 142
			-e '/^$/d' \
148
			test/all-in-place.ok || die
143
			-i test/all-in-place.ok || die
149 144

  
150
		sed -i -E \
145
		sed -E \
151 146
			-e 's:(pamrgbatopng|pngtopnm).*::' \
152
			test/legacy-names.{ok,test} || die
153
		sed -i \
147
			-i test/legacy-names.{ok,test} || die
148
		sed \
154 149
			-e '/^$/d' \
155
			test/legacy-names.ok || die
156
		sed -i \
150
			-i test/legacy-names.ok || die
151
		sed \
157 152
			-e 's:png-roundtrip.*::' \
158 153
			-e 's:winicon-roundtrip.*::' \
159
			test/Test-Order || die
154
			-i test/Test-Order || die
160 155
	fi
161 156

  
162 157
	# this test requires LC_ALL=en_US.iso88591, not available on musl
163 158
	if use elibc_musl; then
164
		sed -i \
159
		sed \
165 160
			-e 's:pbmtext-iso88591.*::' \
166
			test/Test-Order || die
161
			-i test/Test-Order || die
167 162
	fi
168 163
}
169 164

  
......
252 247
	dodoc README
253 248

  
254 249
	cd doc || die
255
	dodoc HISTORY Netpbm.programming USERDOC
250
	dodoc HISTORY USERDOC
256 251
	docinto html
257 252
	dodoc -r ../userguide/*.html
258 253
}
Thank you!