From 43c2a85d4e20318dd3d35872e348707900870067 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 6 May 2024 00:00:52 +0100
Subject: gentoo auto-resync : 06:05:2024 - 00:00:51

---
 media-gfx/jhead/Manifest                           |  4 +--
 .../jhead/files/jhead-3.08-fix-makefile.patch      |  4 +--
 media-gfx/jhead/jhead-3.08-r1.ebuild               | 42 ++++++++++++++++++++++
 media-gfx/jhead/jhead-3.08.ebuild                  | 36 -------------------
 4 files changed, 46 insertions(+), 40 deletions(-)
 create mode 100644 media-gfx/jhead/jhead-3.08-r1.ebuild
 delete mode 100644 media-gfx/jhead/jhead-3.08.ebuild

(limited to 'media-gfx/jhead')

diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index f1e186fb9347..dd9966b1bf65 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,4 +1,4 @@
-AUX jhead-3.08-fix-makefile.patch 1240 BLAKE2B 7c1d01268cafda6b02322d715dcc45bb2c1c258fd14375d3729e40d0d345d0c1febeef647ad39925989793d64504dfc34ca6906da7ef93594690bf82b3e51a14 SHA512 a45615f414b1cf5e8fbd13929f2821fb298d82a817f6665d86076b1173bfd24268a99f8f011f6c8d4cd8007f23f289edda9144d241a78f21084f4aa658dfccf5
+AUX jhead-3.08-fix-makefile.patch 1249 BLAKE2B ef1cab0d7141d71e374b7d1481431f8bd29fa115a45eae31556cf096b26739c1929e694532f61f0f7f739ec53744781c25af24d453eb8bc9b41c79c4bc71f1c7 SHA512 c4a04aaf34d14e758f96283dea2d347cd61d443fd99b2702e3ae80150e512ee944198e3432d2dc8c2674aee16f32cd71f7c2781f8de66442793640e256b2f8f6
 DIST jhead-3.08.tgz 1146535 BLAKE2B 8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740 SHA512 eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5
-EBUILD jhead-3.08.ebuild 780 BLAKE2B 9a7cccc666587cab49d18824c8723c254d750f135dfd567a3f392692b0ab3d9cf8135ccc65741540bc12687f9155bee17c531d0fd4303f399319ea33a72a4d04 SHA512 ca596e1f2fdc3d3b0c4cece087bcff4c35b048dfac421366ba355474e196628c8d1d9da7dbc1428616c230afa70533027624a37ba2c7c1fe4df35fd97c283a63
+EBUILD jhead-3.08-r1.ebuild 930 BLAKE2B 72ad80fd632f6d043be3a8a581769192b884ca26fae58112689d3343e0c8f4b43ac8d3e2a575f0b849c4103cfe8686dd79cb38269b5600cdd826868202431e24 SHA512 a4c6c4742909c094e94dee38efd330551caa212615c5949da8668f78227736f5c3157e3e76eaeec43ea18733dec489e15a4f756be78da60b5b066f79ec894a07
 MISC metadata.xml 351 BLAKE2B 2fa507a18a19bd866b01af6618c21a3f3b37bd250fb9cbf3a253ae9e94cb6dae961a5f337c083511d7e939380175c613864e087cb22c75b6e5662900168ebabe SHA512 9e77e681d0453ec4ee2ffb3888b3867f0445fb4617a68e36902e1ee37ac56e0d04576c3a20447ee1a8fece62896c119b24ab5073f37c8e62f1c2ec00cf82a8da
diff --git a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
index 7f4e80be57ea..edf19da410dc 100644
--- a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
+++ b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
@@ -10,7 +10,7 @@
 -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 -endif
 +CFLAGS ?= -O2
-+LDFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
++LFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
 +
 +TARGET = libjhead.so.1.0.0
 +TARGET0        = libjhead.so
@@ -36,7 +36,7 @@
  	install -m 0644 jhead.1 $(MANDIR)
 +
 +$(TARGET): $(objs) jhead
-+	${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
++	${CC} $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
 +	ln -s ${TARGET} ${TARGET0}
 +	ln -s ${TARGET} ${TARGET1}
 +	ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild
new file mode 100644
index 000000000000..3522816be291
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="EXIF JPEG camera setting parser and thumbnail remover"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
+SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
+)
+
+src_compile() {
+	# Older codebase with aliasing violations (bug #890252)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	# TODO: Add an example file we change & compare checksum?
+	# Trivial smoketest (which would've found bug #931225)
+	./jhead -V || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc *.txt
+	docinto html
+	dodoc *.html
+	doman ${PN}.1
+	doheader ${PN}.h
+	dolib.so lib${PN}.so*
+}
diff --git a/media-gfx/jhead/jhead-3.08.ebuild b/media-gfx/jhead/jhead-3.08.ebuild
deleted file mode 100644
index 236107212ff2..000000000000
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="EXIF JPEG camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
-)
-
-src_compile() {
-	# Older codebase with aliasing violations (bug #890252)
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc *.txt
-	docinto html
-	dodoc *.html
-	doman ${PN}.1
-	doheader ${PN}.h
-	dolib.so lib${PN}.so*
-}
-- 
cgit v1.2.3