| 1 |
commit: f1c236fa0be5b0f37a749b03edba06a23d73690f |
| 2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Dec 1 16:47:49 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 3 00:01:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c236fa |
| 7 |
|
| 8 |
media-libs/netpbm: drop v10.70.00 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/netpbm/Manifest | 1 - |
| 15 |
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 ----- |
| 16 |
media-libs/netpbm/files/netpbm-10.66-test.patch | 17 -- |
| 17 |
.../netpbm/files/netpbm-10.70-system-libs.patch | 40 ---- |
| 18 |
media-libs/netpbm/netpbm-10.70.00.ebuild | 205 --------------------- |
| 19 |
5 files changed, 313 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest |
| 22 |
index acb659885fd9..c1b2c7ff12b3 100644 |
| 23 |
--- a/media-libs/netpbm/Manifest |
| 24 |
+++ b/media-libs/netpbm/Manifest |
| 25 |
@@ -1,3 +1,2 @@ |
| 26 |
-DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 |
| 27 |
DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3 |
| 28 |
DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c |
| 29 |
|
| 30 |
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index 281f8ee928f7..000000000000 |
| 33 |
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,50 +0,0 @@ |
| 36 |
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir |
| 37 |
-- Try to fix parallel building |
| 38 |
-- Make the libopt tool less 'helpful' |
| 39 |
- |
| 40 |
---- a/lib/Makefile |
| 41 |
-+++ b/lib/Makefile |
| 42 |
-@@ -249,7 +249,7 @@ |
| 43 |
- .PHONY: install.staticlib |
| 44 |
- install.staticlib: $(PKGDIR)/link |
| 45 |
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ |
| 46 |
-- $(PKGDIR)/link |
| 47 |
-+ $(PKGDIR)/lib |
| 48 |
- |
| 49 |
- # Install a shared library stub -- the ".so" file used at link time to |
| 50 |
- # prepare a program for dynamically linking a library at run time |
| 51 |
-@@ -257,9 +257,9 @@ |
| 52 |
- install.sharedlibstub: $(PKGDIR)/link |
| 53 |
- ifeq ($(NETPBMLIBTYPE),unixshared) |
| 54 |
- # install the link-time (.so) links to the runtime libraries |
| 55 |
-- cd $(PKGDIR)/link ; \ |
| 56 |
-+ cd $(PKGDIR)/lib ; \ |
| 57 |
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ |
| 58 |
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
| 59 |
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ |
| 60 |
- libnetpbm.$(NETPBMLIBSUFFIX) |
| 61 |
- endif |
| 62 |
- ifeq ($(NETPBMLIBTYPE),dll) |
| 63 |
---- a/GNUmakefile |
| 64 |
-+++ b/GNUmakefile |
| 65 |
-@@ -87,6 +87,9 @@ |
| 66 |
- |
| 67 |
- .PHONY: nonmerge |
| 68 |
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all) |
| 69 |
-+ |
| 70 |
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all |
| 71 |
-+converter/all analyzer/all editor/all generator/all other/all: lib/all |
| 72 |
- |
| 73 |
- OMIT_CONFIG_RULE = 1 |
| 74 |
- include $(SRCDIR)/Makefile.common |
| 75 |
---- a/buildtools/libopt.c |
| 76 |
-+++ b/buildtools/libopt.c |
| 77 |
-@@ -502,7 +502,7 @@ |
| 78 |
- |
| 79 |
- strcpy(outputLine, ""); /* initial value */ |
| 80 |
- runtime = FALSE; /* initial value */ |
| 81 |
-- quiet = FALSE; /* initial value */ |
| 82 |
-+ quiet = TRUE; /* initial value */ |
| 83 |
- error = FALSE; /* no error yet */ |
| 84 |
- for (arg = 1; arg < argc && !error; arg++) { |
| 85 |
- if (strcmp(argv[arg], "-runtime") == 0) |
| 86 |
|
| 87 |
diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch |
| 88 |
deleted file mode 100644 |
| 89 |
index 7c80648bafab..000000000000 |
| 90 |
--- a/media-libs/netpbm/files/netpbm-10.66-test.patch |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,17 +0,0 @@ |
| 93 |
-https://bugs.gentoo.org/450530 |
| 94 |
- |
| 95 |
-we disable fiascotopnm all the time, so delete the test too |
| 96 |
- |
| 97 |
---- a/test/all-in-place.test |
| 98 |
-+++ b/test/all-in-place.test |
| 99 |
-@@ -387,10 +387,6 @@ for i in $ordinary_testprogs |
| 100 |
- |
| 101 |
- |
| 102 |
- |
| 103 |
--# Test fiascotopnm, which has a unique -v flag. |
| 104 |
-- |
| 105 |
--${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null |
| 106 |
-- testExitStatus fiascotopnm 2 $? |
| 107 |
- |
| 108 |
- |
| 109 |
- |
| 110 |
|
| 111 |
diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch |
| 112 |
deleted file mode 100644 |
| 113 |
index efe9fd8dd3c4..000000000000 |
| 114 |
--- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,40 +0,0 @@ |
| 117 |
-when we disable the bundled libs, make sure we don't try to run install in them |
| 118 |
- |
| 119 |
---- a/converter/other/jbig/Makefile |
| 120 |
-+++ b/converter/other/jbig/Makefile |
| 121 |
-@@ -5,7 +5,7 @@ endif |
| 122 |
- SUBDIR = converter/other/jbig |
| 123 |
- VPATH=.:$(SRCDIR)/$(SUBDIR) |
| 124 |
- |
| 125 |
--SUBDIRS = libjbig |
| 126 |
-+SUBDIRS = |
| 127 |
- |
| 128 |
- include $(BUILDDIR)/config.mk |
| 129 |
- |
| 130 |
-@@ -35,6 +35,7 @@ SCRIPTS = |
| 131 |
- |
| 132 |
- ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB)) |
| 133 |
- JBIGLIB_DEP = $(JBIGLIB) |
| 134 |
-+ SUBDIRS += libjbig |
| 135 |
- else |
| 136 |
- # It's not our internal version; user's on his own to make sure it's built |
| 137 |
- endif |
| 138 |
---- a/converter/other/jpeg2000/Makefile |
| 139 |
-+++ b/converter/other/jpeg2000/Makefile |
| 140 |
-@@ -5,7 +5,7 @@ endif |
| 141 |
- SUBDIR = converter/other/jpeg2000 |
| 142 |
- VPATH=.:$(SRCDIR)/$(SUBDIR) |
| 143 |
- |
| 144 |
--SUBDIRS = libjasper |
| 145 |
-+SUBDIRS = |
| 146 |
- |
| 147 |
- include $(BUILDDIR)/config.mk |
| 148 |
- |
| 149 |
-@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB) |
| 150 |
- # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better |
| 151 |
- # be relative to the current directory. |
| 152 |
- MERGE_OBJECTS += $(JASPERLIB) |
| 153 |
-+ SUBDIRS += libjasper |
| 154 |
- endif |
| 155 |
- MERGEBINARIES = $(BINARIES) |
| 156 |
- |
| 157 |
|
| 158 |
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild |
| 159 |
deleted file mode 100644 |
| 160 |
index 595ad00ef034..000000000000 |
| 161 |
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild |
| 162 |
+++ /dev/null |
| 163 |
@@ -1,205 +0,0 @@ |
| 164 |
-# Copyright 1999-2021 Gentoo Authors |
| 165 |
-# Distributed under the terms of the GNU General Public License v2 |
| 166 |
- |
| 167 |
-EAPI=7 |
| 168 |
- |
| 169 |
-inherit multilib toolchain-funcs |
| 170 |
- |
| 171 |
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" |
| 172 |
-HOMEPAGE="http://netpbm.sourceforge.net/" |
| 173 |
-SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 174 |
- |
| 175 |
-LICENSE="GPL-2" |
| 176 |
-SLOT="0" |
| 177 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 178 |
-IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" |
| 179 |
- |
| 180 |
-BDEPEND="app-arch/xz-utils |
| 181 |
- sys-devel/flex" |
| 182 |
-RDEPEND="jbig? ( media-libs/jbigkit ) |
| 183 |
- jpeg? ( virtual/jpeg:0 ) |
| 184 |
- png? ( >=media-libs/libpng-1.4:0 ) |
| 185 |
- rle? ( media-libs/urt ) |
| 186 |
- svga? ( media-libs/svgalib ) |
| 187 |
- tiff? ( >=media-libs/tiff-3.5.5:0 ) |
| 188 |
- xml? ( dev-libs/libxml2 ) |
| 189 |
- zlib? ( sys-libs/zlib ) |
| 190 |
- X? ( x11-libs/libX11 )" |
| 191 |
-DEPEND="${RDEPEND}" |
| 192 |
- |
| 193 |
-PATCHES=( |
| 194 |
- "${FILESDIR}"/netpbm-10.31-build.patch |
| 195 |
- "${FILESDIR}"/netpbm-10.66-test.patch #450530 |
| 196 |
- "${FILESDIR}"/netpbm-10.70-system-libs.patch |
| 197 |
-) |
| 198 |
- |
| 199 |
-netpbm_libtype() { |
| 200 |
- case ${CHOST} in |
| 201 |
- *-darwin*) echo dylib;; |
| 202 |
- *) echo unixshared;; |
| 203 |
- esac |
| 204 |
-} |
| 205 |
- |
| 206 |
-netpbm_libsuffix() { |
| 207 |
- local suffix=$(get_libname) |
| 208 |
- echo "${suffix//\.}" || die |
| 209 |
-} |
| 210 |
- |
| 211 |
-netpbm_ldshlib() { |
| 212 |
- case ${CHOST} in |
| 213 |
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; |
| 214 |
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; |
| 215 |
- esac |
| 216 |
-} |
| 217 |
- |
| 218 |
-netpbm_config() { |
| 219 |
- if use $1 ; then |
| 220 |
- [[ $2 != "!" ]] && echo -l${2:-$1} |
| 221 |
- else |
| 222 |
- echo NONE || die |
| 223 |
- fi |
| 224 |
-} |
| 225 |
- |
| 226 |
-src_prepare() { |
| 227 |
- default |
| 228 |
- |
| 229 |
- # make sure we use system libs |
| 230 |
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
| 231 |
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die |
| 232 |
- |
| 233 |
- # disable certain tests based on active USE flags |
| 234 |
- local del=( |
| 235 |
- $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') |
| 236 |
- $(usex rle '' 'utahrle-roundtrip') |
| 237 |
- $(usex tiff '' 'tiff-roundtrip') |
| 238 |
- ) |
| 239 |
- |
| 240 |
- if [[ "${#del[@]}" -gt 0 ]] ; then |
| 241 |
- sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die |
| 242 |
- fi |
| 243 |
- |
| 244 |
- del=( |
| 245 |
- pnmtofiasco fiascotopnm # We always disable fiasco |
| 246 |
- $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') |
| 247 |
- $(usex jbig '' 'jbigtopnm pnmtojbig') |
| 248 |
- jpeg2ktopam pamtojpeg2k # jasper has been removed |
| 249 |
- $(usex rle '' 'pnmtorle rletopnm') |
| 250 |
- $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') |
| 251 |
- ) |
| 252 |
- |
| 253 |
- if [[ "${#del[@]}" -gt 0 ]] ; then |
| 254 |
- sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die |
| 255 |
- sed -i '/^$/d' test/all-in-place.ok || die |
| 256 |
- fi |
| 257 |
- |
| 258 |
- # take care of the importinc stuff ourselves by only doing it once |
| 259 |
- # at the top level and having all subdirs use that one set #149843 |
| 260 |
- sed -i \ |
| 261 |
- -e '/^importinc:/s|^|importinc:\nmanual_|' \ |
| 262 |
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ |
| 263 |
- common.mk || die |
| 264 |
- |
| 265 |
- sed -i \ |
| 266 |
- -e '/%.c/s: importinc$::' \ |
| 267 |
- common.mk lib/Makefile lib/util/Makefile || die |
| 268 |
- |
| 269 |
- # avoid ugly depend.mk warnings |
| 270 |
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) |
| 271 |
-} |
| 272 |
- |
| 273 |
-src_configure() { |
| 274 |
- cat config.mk.in - >> config.mk <<-EOF |
| 275 |
- # Misc crap |
| 276 |
- BUILD_FIASCO = N |
| 277 |
- SYMLINK = ln -sf |
| 278 |
- |
| 279 |
- # These vars let src_test work by default |
| 280 |
- PKGDIR_DEFAULT = ${T}/netpbm |
| 281 |
- RESULTDIR_DEFAULT = ${T}/netpbm-test |
| 282 |
- |
| 283 |
- # Toolchain options |
| 284 |
- CC = $(tc-getCC) -Wall |
| 285 |
- LD = \$(CC) |
| 286 |
- CC_FOR_BUILD = $(tc-getBUILD_CC) |
| 287 |
- LD_FOR_BUILD = \$(CC_FOR_BUILD) |
| 288 |
- AR = $(tc-getAR) |
| 289 |
- RANLIB = $(tc-getRANLIB) |
| 290 |
- |
| 291 |
- STRIPFLAG = |
| 292 |
- CFLAGS_SHLIB = -fPIC |
| 293 |
- |
| 294 |
- LDRELOC = \$(LD) -r |
| 295 |
- LDSHLIB = $(netpbm_ldshlib) |
| 296 |
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to |
| 297 |
- LINKERISCOMPILER = Y |
| 298 |
- NETPBMLIBSUFFIX = $(netpbm_libsuffix) |
| 299 |
- NETPBMLIBTYPE = $(netpbm_libtype) |
| 300 |
- STATICLIB_TOO = $(usex static-libs Y N) |
| 301 |
- |
| 302 |
- # The var is called SSE, but the code is actually SSE2. |
| 303 |
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) |
| 304 |
- |
| 305 |
- # Gentoo build options |
| 306 |
- TIFFLIB = $(netpbm_config tiff) |
| 307 |
- # Let tiff worry about its own dependencies #395753 |
| 308 |
- TIFFLIB_NEEDS_JPEG = N |
| 309 |
- TIFFLIB_NEEDS_Z = N |
| 310 |
- JPEGLIB = $(netpbm_config jpeg) |
| 311 |
- PNGLIB = $(netpbm_config png) |
| 312 |
- ZLIB = $(netpbm_config zlib z) |
| 313 |
- LINUXSVGALIB = $(netpbm_config svga vga) |
| 314 |
- XML2_LIBS = $(netpbm_config xml xml2) |
| 315 |
- JBIGLIB = $(netpbm_config jbig) |
| 316 |
- JBIGHDR_DIR = |
| 317 |
- JASPERLIB = NONE |
| 318 |
- JASPERHDR_DIR = |
| 319 |
- URTLIB = $(netpbm_config rle) |
| 320 |
- URTHDR_DIR = |
| 321 |
- X11LIB = $(netpbm_config X X11) |
| 322 |
- X11HDR_DIR = |
| 323 |
- EOF |
| 324 |
- # cannot chain the die with the heredoc above as bash-3 |
| 325 |
- # has a parser bug in that setup #282902 |
| 326 |
- [[ $? -eq 0 ]] || die "writing config.mk failed" |
| 327 |
-} |
| 328 |
- |
| 329 |
-src_compile() { |
| 330 |
- emake -j1 pm_config.h version.h manual_importinc #149843 |
| 331 |
- emake |
| 332 |
-} |
| 333 |
- |
| 334 |
-src_test() { |
| 335 |
- # The code wants to install everything first and then test the result. |
| 336 |
- emake install.{bin,lib} |
| 337 |
- emake check |
| 338 |
-} |
| 339 |
- |
| 340 |
-src_install() { |
| 341 |
- # Subdir make targets like to use `mkdir` all over the place |
| 342 |
- # without any actual dependencies, thus the -j1. |
| 343 |
- emake -j1 package pkgdir="${ED}"/usr |
| 344 |
- |
| 345 |
- if [[ $(get_libdir) != "lib" ]] ; then |
| 346 |
- mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die |
| 347 |
- fi |
| 348 |
- |
| 349 |
- # Remove cruft that we don't need, and move around stuff we want |
| 350 |
- rm "${ED}"/usr/bin/{doc.url,manweb} || die |
| 351 |
- rm -r "${ED}"/usr/man/web || die |
| 352 |
- rm -r "${ED}"/usr/link || die |
| 353 |
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die |
| 354 |
- |
| 355 |
- dodir /usr/share |
| 356 |
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die |
| 357 |
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die |
| 358 |
- |
| 359 |
- doman userguide/*.[0-9] |
| 360 |
- dodoc README |
| 361 |
- |
| 362 |
- cd doc || die |
| 363 |
- dodoc HISTORY Netpbm.programming USERDOC |
| 364 |
- |
| 365 |
- docinto html |
| 366 |
- dodoc -r *.html |
| 367 |
- use doc && dodoc -r ../userguide/*.html |
| 368 |
-} |
Archives