| 1 |
commit: 17ce1a7e7c0047e473db7b635a7988aa924e8f2d |
| 2 |
Author: Ingolf Wagner <contact <AT> ingolf-wagner <DOT> de> |
| 3 |
AuthorDate: Sat Jun 3 20:46:09 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 3 21:01:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ce1a7e |
| 7 |
|
| 8 |
media-gfx/maim: remove gengetopt dependency |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
.../maim/files/maim-3.4.47-no-gengetopt.patch | 24 ++++++++++++++++++++++ |
| 14 |
media-gfx/maim/maim-3.4.47.ebuild | 5 +++-- |
| 15 |
2 files changed, 27 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..7a1035d3daf |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch |
| 22 |
@@ -0,0 +1,24 @@ |
| 23 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 |
+index fe4cd5f..f0eb718 100644 |
| 25 |
+--- a/CMakeLists.txt |
| 26 |
++++ b/CMakeLists.txt |
| 27 |
+@@ -65,19 +65,6 @@ if ( RONN_EXECUTABLE AND GZIP_EXECUTABLE ) |
| 28 |
+ WORKING_DIRECTORY man-src VERBATIM ) |
| 29 |
+ endif() |
| 30 |
+ |
| 31 |
+-# Here we generate some of our code if we can. I package it pre-generated |
| 32 |
+-# so nobody has to go find and install gengetopt if they don't want to. |
| 33 |
+-find_program( GENGETOPT_EXECUTABLE gengetopt |
| 34 |
+- DOC "A tool to generate code to grab command line options." ) |
| 35 |
+-if ( GENGETOPT_EXECUTABLE ) |
| 36 |
+- message( "-- Regenerating cmdline.in" ) |
| 37 |
+- execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo" |
| 38 |
+- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" ) |
| 39 |
+- file( RENAME "${CMAKE_SOURCE_DIR}/src/cmdline.h" "${CMAKE_SOURCE_DIR}/src/cmdline.in" ) |
| 40 |
+-else() |
| 41 |
+- message( "Warning: Command gengetopt not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" ) |
| 42 |
+-endif() |
| 43 |
+- |
| 44 |
+ # By default our src/options.ggo has our cmake versions variables for |
| 45 |
+ # the 'version ""' line. We replace them here. |
| 46 |
+ # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic. |
| 47 |
|
| 48 |
diff --git a/media-gfx/maim/maim-3.4.47.ebuild b/media-gfx/maim/maim-3.4.47.ebuild |
| 49 |
index f6069b30a18..374899e4f47 100644 |
| 50 |
--- a/media-gfx/maim/maim-3.4.47.ebuild |
| 51 |
+++ b/media-gfx/maim/maim-3.4.47.ebuild |
| 52 |
@@ -14,12 +14,13 @@ SLOT="0" |
| 53 |
KEYWORDS="~amd64 ~x86" |
| 54 |
IUSE="" |
| 55 |
|
| 56 |
+PATCHES=( "${FILESDIR}/maim-3.4.47-no-gengetopt.patch" ) |
| 57 |
+ |
| 58 |
DEPEND=" |
| 59 |
media-libs/imlib2[X] |
| 60 |
x11-libs/libX11 |
| 61 |
x11-libs/libXrandr |
| 62 |
- x11-libs/libXfixes |
| 63 |
- dev-util/gengetopt" |
| 64 |
+ x11-libs/libXfixes" |
| 65 |
RDEPEND=" |
| 66 |
${DEPEND} |
| 67 |
x11-misc/slop" |
Archives