commit:     a850e9bccfa4e9b9221c299524afab180e42ecc6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 07:51:08 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 08:27:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a850e9bc

media-gfx/jpegoptim: misc ebuild updates

* GPL-2+ -> GPL-3+ (this changed in >=jpegoptim-1.4.7)
* add missing := to libjpeg-turbo (+revbump), subslot has changed
  twice before and it could potentially happen again
* switch to cmake, fixes bug #905365 -- cmake doesn't feel like much
  of an improvement given it lacks an install target, but autoconf
  is even still using a configure.in (not .ac) -- cmake tests seem
  to pass same as gcc if using clang-16

Closes: https://bugs.gentoo.org/905365
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild | 32 +++++++++++++++++++++++++++
 media-gfx/jpegoptim/jpegoptim-1.5.3.ebuild    | 15 -------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild 
b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..5db3691699a0
--- /dev/null
+++ b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Utility to optimize JPEG files"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html";
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz";
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="media-libs/libjpeg-turbo:="
+DEPEND="${DEPEND}"
+
+src_configure() {
+       local mycmakeargs=(
+               -DUSE_MOZJPEG=no
+       )
+
+       cmake_src_configure
+}
+
+src_install() {
+       # lacks an install target with cmake
+       dobin "${BUILD_DIR}"/${PN}
+       doman ${PN}.1
+       einstalldocs
+}

diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.3.ebuild 
b/media-gfx/jpegoptim/jpegoptim-1.5.3.ebuild
deleted file mode 100644
index 19490ee21640..000000000000
--- a/media-gfx/jpegoptim/jpegoptim-1.5.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html 
https://github.com/tjko/jpegoptim";
-SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz";
-
-LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to 
be 'any later version'
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="media-libs/libjpeg-turbo:0"
-RDEPEND="${DEPEND}"

Reply via email to