Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/
Date: Sat, 04 Dec 2021 21:52:59
Message-Id: 1638654763.c07fd1c795c3ae818606497bcdc0177f30e0cec7.sam@gentoo
1 commit: c07fd1c795c3ae818606497bcdc0177f30e0cec7
2 Author: Alex Xu (Hello71) <alex_y_xu <AT> yahoo <DOT> ca>
3 AuthorDate: Sat Dec 4 19:25:35 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 4 21:52:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c07fd1c7
7
8 media-libs/libjpeg-turbo: use ebuild helpers instead of cmake
9
10 Closes: https://bugs.gentoo.org/728012
11 Signed-off-by: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca>
12 Closes: https://github.com/gentoo/gentoo/pull/23183
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 ...eg-turbo-2.1.2.ebuild => libjpeg-turbo-2.1.2-r1.ebuild} | 14 ++------------
16 1 file changed, 2 insertions(+), 12 deletions(-)
17
18 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
19 similarity index 88%
20 rename from media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2.ebuild
21 rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
22 index 9fa044960821..2b46c483b248 100644
23 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2.ebuild
24 +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
25 @@ -53,18 +53,6 @@ install(TARGETS ${FILE%.c})
26 EOF
27 done
28
29 - for FILE in ../debian/extra/exifautotran; do
30 - cat >> CMakeLists.txt <<EOF || die
31 -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
32 -EOF
33 - done
34 -
35 - for FILE in ../debian/extra/*.[0-9]*; do
36 - cat >> CMakeLists.txt <<EOF || die
37 -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
38 -EOF
39 - done
40 -
41 cmake_src_prepare
42 java-pkg-opt-2_src_prepare
43 }
44 @@ -116,6 +104,8 @@ multilib_src_install_all() {
45 einstalldocs
46
47 newdoc "${WORKDIR}"/debian/changelog changelog.debian
48 + dobin "${WORKDIR}"/debian/extra/exifautotran
49 + doman "${WORKDIR}"/debian/extra/*.[0-9]*
50
51 docinto html
52 dodoc -r "${S}"/doc/html/.