diff options
| author |   Ingolf Wagner <contact@ingolf-wagner.de> | 2017-06-03 15:46:09 -0500 |
|---|---|---|
| committer |   Matthias Maier <tamiko@gentoo.org> | 2017-06-03 16:01:43 -0500 |
| commit | 17ce1a7e7c0047e473db7b635a7988aa924e8f2d (patch) | |
| tree | 6781599a90e5837ceee207f4f077d2c1dbc250e7 /media-gfx | |
| parent | media-gfx/maim: update proxy maintainer (diff) | |
| download | gentoo-17ce1a7e7c0047e473db7b635a7988aa924e8f2d.tar.gz gentoo-17ce1a7e7c0047e473db7b635a7988aa924e8f2d.tar.bz2 gentoo-17ce1a7e7c0047e473db7b635a7988aa924e8f2d.zip | |
media-gfx/maim: remove gengetopt dependency
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch | 24 | ||||
| -rw-r--r-- | media-gfx/maim/maim-3.4.47.ebuild | 5 |
2 files changed, 27 insertions, 2 deletions
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 new file mode 100644 index 000000000000..7a1035d3daf2 --- /dev/null +++ b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe4cd5f..f0eb718 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,19 +65,6 @@ if ( RONN_EXECUTABLE AND GZIP_EXECUTABLE ) + WORKING_DIRECTORY man-src VERBATIM ) + endif() + +-# Here we generate some of our code if we can. I package it pre-generated +-# so nobody has to go find and install gengetopt if they don't want to. +-find_program( GENGETOPT_EXECUTABLE gengetopt +- DOC "A tool to generate code to grab command line options." ) +-if ( GENGETOPT_EXECUTABLE ) +- message( "-- Regenerating cmdline.in" ) +- execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo" +- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" ) +- file( RENAME "${CMAKE_SOURCE_DIR}/src/cmdline.h" "${CMAKE_SOURCE_DIR}/src/cmdline.in" ) +-else() +- message( "Warning: Command gengetopt not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" ) +-endif() +- + # By default our src/options.ggo has our cmake versions variables for + # the 'version ""' line. We replace them here. + # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic. diff --git a/media-gfx/maim/maim-3.4.47.ebuild b/media-gfx/maim/maim-3.4.47.ebuild index f6069b30a188..374899e4f477 100644 --- a/media-gfx/maim/maim-3.4.47.ebuild +++ b/media-gfx/maim/maim-3.4.47.ebuild @@ -14,12 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +PATCHES=( "${FILESDIR}/maim-3.4.47-no-gengetopt.patch" ) + DEPEND=" media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXrandr - x11-libs/libXfixes - dev-util/gengetopt" + x11-libs/libXfixes" RDEPEND=" ${DEPEND} x11-misc/slop" |