Version bump: add support for tiff and webp. Drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 113 insertions, 19 deletions

diff --git a/media-gfx/nomacs/ChangeLog b/media-gfx/nomacs/ChangeLog
index d204d37259d5..1aebc64af005 100644
--- a/media-gfx/nomacs/ChangeLog
+++ b/media-gfx/nomacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/nomacs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.5 2013/06/12 14:39:56 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.6 2014/01/14 10:46:06 pinkbyte Exp $
+
+*nomacs-1.6.2 (14 Jan 2014)
+
+  14 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> -nomacs-1.0.0.ebuild,
+  +nomacs-1.6.2.ebuild, +files/nomacs-1.6.2-use-system-webp.patch,
+  metadata.xml:
+  Version bump: add support for tiff and webp. Drop old
 
 *nomacs-1.0.2 (12 Jun 2013)
 
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 9b4cea9545db..33a5be1a268c 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST nomacs-1.0.0.tar.bz2 803404 SHA256 bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2 SHA512 b32d199a0b11a3c5fb5acdf263ecbf88d0a1c95cff698b1afc65769bf167578bcb103f01aa2d899c84718da110d8a2f5085e2c780b2645e11d535ea17b179c63 WHIRLPOOL 500a08b26a7d1eecf26707d5811ae777bb05587638001572389df221780e4d084e8b2d0ea758dbdaf8a7fae74b0ba15d3737a7988f71a17d1ee1ee2aa2cae032
+AUX nomacs-1.6.2-use-system-webp.patch 3180 SHA256 e6acae6e4235db962ca85508af105273351e5b31ef6a37b2f34f386985bd6ec3 SHA512 82ef414c9992cd98140a88c1b238f8b11c883bbb7b06fdcd404e4cfcc663012d4e253088762b525a95c1be4d328e806cc5efd285d2ac827a9c2f944f350da6b5 WHIRLPOOL a8f32d87ae3b82a0a143040aa09da0600cc8d0352b6274adfc920687ad847c762e1357dae2ba331570721d8a2ea525896e4d093a87322f29fe8a5715850915b7
 DIST nomacs-1.0.2.tar.bz2 803288 SHA256 6ffe3ca7e5ece7bcde5ba309447eff5df59fc0805d695d4d5639f9083a033218 SHA512 3d9285526d7b76ebf881f4ea014ff449dda75c05ef3b338650dbd2d5422cc604f4e80da81f6e6ef8cd4ae45c97e141f6e1af7eba7e98fb9b252219826d3f6718 WHIRLPOOL 77dd5c9e308ffdc224edfa2f28dc90ca1a364609c8af409f391000009f7213c631a9534cf1c022f66348754357d34892cf813f391803256f25a84e9610462830
-EBUILD nomacs-1.0.0.ebuild 734 SHA256 41ebee394ec9eeb41e3657380ae00e52981509df87d6115f1e1ae5f1844b5c0f SHA512 47e57dbd1b5b47bc91f919aa48f97c525233bbad5174c5ebafeb7e161e0589ec4f1613996c3e0db20a04547c2cc501d6e7524c80c688d70a3f267764fc109a0f WHIRLPOOL 31247ec2805922a28ffd2fb47258f0439323c9bf17ef13f9e5af52de6443fce30a7ef52b86af67ccec8ba358a190f0ceafaae8645da8141cea59d1c6ff27cae1
+DIST nomacs-1.6.2-source.tar.bz2 1168631 SHA256 c9a7bea91db1f12513b43d5d194009f9281f6084ffc30ceeadb5ec4a598a6c71 SHA512 89e4ce93ee92bcbc0b7f5e9829bdadc694b1bf4ec9cedfc67b058721af2d2900faf41a22f6c23a4a0e6a4b6a85de5256253ce5c08bea97c984c63b934269bb9d WHIRLPOOL 161bc16699eb913272db3601e6e8bf476b58d183f1234f52534c9a636e426c72572b0dacf0eb246792b7ce3ae0e281cea4847879dfd837999db7898089adc500
 EBUILD nomacs-1.0.2.ebuild 734 SHA256 71e89fedf8bce5211586d74411aa447a86262b2566c2cb1764985c32288076a4 SHA512 cd9450b54c05690c3f360f32f24b7f35fba32ef697707a3fe59471c8cc3d89de12e46d203dacb10d06029db5ef629d0bea13626715053c8e0810e18aab22ed71 WHIRLPOOL 6568515bca54a6626edc9853982733e6a8a135db856a74d5162edfbd228262dd34b7e820c17a88485eb257b7085b3ecca3ea61b60da07908628c0a3c5ccaa86a
-MISC ChangeLog 954 SHA256 82e1f4b037cbe7023cf7f9f154457aa1c7adba6a5aba4dff022ed0182835b3d3 SHA512 cc158b3363323dd3145560f987d5def0ccb13fcbba8cf970970b6f3ae423c2be7eb0c4952cd4743a4f57b754be447c2e469b53f6493b2ca42def1d0efae79619 WHIRLPOOL 7162a9d4a612474c4ecff66b8762e7817be1d59c572f39ca543d91e46b0bbc169e68d7f9a5b08b16d86dff6634aac2be14696503f4a77219d4f0a0f3391248dc
-MISC metadata.xml 299 SHA256 ca9cf7f54aa2dd41b1dc0d7792ab5ae6e28fe76c138bf1c9588d13ecde34df16 SHA512 4abddff3caebdfab0e395a9c846cb6012d04d6218ca242b49d9714c7896223fbb2c703c9e1570a878a5ad491d11224cabf0ace843a87c3bbc45b6dbb4a64b6e3 WHIRLPOOL 8404a8ec411b9dc57527321781a47b76f1fab6b19da6960eb92fee205bba199f9d6784d4d24a0ee3106babd82a081b61b6a715ac6aed1b12af52143f0be3b9b5
+EBUILD nomacs-1.6.2.ebuild 932 SHA256 06719e9a8f578ed0610fefbddd2278dd1209cbc3ed4d745e9db7c3b4bd74451b SHA512 19d30d7df5d57e92ba638c0e274a4ee77d2678256688b3106c1a4405a614c644afedd7f783a54975e2eaf959b222d7f4f7dd459d7895febf65393d4a48f6455c WHIRLPOOL b0db70db3d88a45b0a58da7ae180084c2f611a8f44833a3bd60aaf9147568f6f1c77854318bbabd0f8831c659e9512f3622c18d78a5a4efa9bbc42d234dd3ab9
+MISC ChangeLog 1193 SHA256 29eecc2598c4f3a48ce883e24b8406ee37a4a837af438a255056f78c349485ad SHA512 eb598d0ce24b556680afee4cd42ad77a810ce0060d6a77140a00c9034963a52c60163970e09974c2fcd66ec08a387ecb3ad73cc8e3a5b502dd269b179762e7d2 WHIRLPOOL d0215d73d33f587835681b205c7b698330e7b8045c9f3279eff962745fc6cd37e2597696ad0f86f8202416f59191cd64acb830e2f810cf2c5420b459a28040d4
+MISC metadata.xml 377 SHA256 633cf751d978a277361ba0addfc3ac1def3372f19885dbac3e1ae82b67576037 SHA512 e8da77a394211c9134668c84a42881d0443cf71bb44b791969eb76898ca3375716a52e96e3c7847be90a44446a5cb06d6bf89581085464bfb43bb396f5a69027 WHIRLPOOL a84c1d6c4aa484a3e0669fe41fd77edb9a47822e9087dcb5b3383348a84627fcd84ac21c658112b855a4e9a959ae7911764243ccf4c204200d5ade296981c7cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRuIfyAAoJEMbwO6tnXQ0sRJAH/0JCupOouuE4XgpsWEm4rnRu
-ekS9+j411GQFGAGM32laeEtZfkpNoLib3wyt12uYgacG0HIwx5RAJTxd/fqlJbnH
-AITyX0DvXdbkKiAKuZfPat194ya8EeDZmcd+M4AGEJVhW8kO8zDxOFmEav/KOZRo
-KM54xx/gDvLWyqQ8okWP2gVFxgvdqLH4JFfb9r/zQBzslPefaliYsgjiE/c23fMH
-NlGi31byQa+ExcW62/+QZgn4dk8TNWDh67DblIlmyQbki1YUX+wp4a2aT16nD+2a
-kImLbDVY42hv/a1MyzsAGweydO5AfLnJ6dLoG13qXZ+Cdm2dHpyCykuq7FS6tC8=
-=ZdV0
+iQEcBAEBCAAGBQJS1RUgAAoJECo/aRed9267pdAH/17VBWwmytB2fstPqMnLVcuM
+lbi5L0nW6V7I3ZYZzj3VImA1VO42zdEqTJ+iZxsHMIcPOmL8oF8eMLPaBhQrYf7n
+QF2g33d1U07h7rOeNUr+8Xi+Ett5t2vHFIc6D9UnHMi9xfa92ZaVoEQVUz2Vb9lu
+HFHWpg4rTtAPFj+AyIThezM65EA2q8SXKMaGff7Dr/8k+niYrMBJ+dhfq7dVNnm/
+fy+pmnxJUwDdCiRtqxEXHn05qMuQNc1ZfvoVH75KD/VR0BSmEm3a88efsSul8L8e
+Wn+PXOEeGdpYwI3nJLsi4QwNOfLgbO9PoFLJhOvvyCD+wi3IV7Sn79aM+JTzvLk=
+=ev9S
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/nomacs/files/nomacs-1.6.2-use-system-webp.patch b/media-gfx/nomacs/files/nomacs-1.6.2-use-system-webp.patch
new file mode 100644
index 000000000000..e4151bf7e3e5
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-1.6.2-use-system-webp.patch
@@ -0,0 +1,76 @@
+--- CMakeLists.txt.orig	2014-01-14 12:39:39.038297528 +0400
++++ CMakeLists.txt	2014-01-14 12:41:03.052304850 +0400
+@@ -134,43 +134,13 @@
+ endif (HAVE_EXIV2_HPP)

+ 

+ #webp

+-SET(WEBP_INCLUDE_DIR "")

+-SET(WEBP_SOURCE "")

+ IF(ENABLE_WEBP)

+-	ADD_DEFINITIONS(-DNDEBUG -DWEBP_USE_THREAD)

+-

+-	FILE(GLOB WEBP_DEC_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/dec/*c

+-	)

+-	

+-	FILE(GLOB WEBP_DEMUX_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/demux/*c

+-	)

+-

+-	FILE(GLOB WEBP_DSP_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/dsp/*c

+-	)

+-

+-	FILE(GLOB WEBP_ENC_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/enc/*c

+-	)

+-

+-	FILE(GLOB WEBP_UTILS_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/utils/*c

+-	)

+-

+-	FILE(GLOB WEBP_MUX_SRCS

+-		RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

+-		${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src/mux/*c

+-	)

+-	SET(WEBP_SOURCE ${WEBP_DEC_SRCS} ${WEBP_DEMUX_SRCS} ${WEBP_DSP_SRCS} ${WEBP_ENC_SRCS} ${WEBP_UTILS_SRCS} ${WEBP_MUX_SRC})

+-	SET(WEBP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libwebp/src)

+-	add_definitions(-DWITH_WEBP)

++	pkg_check_modules(WEBP libwebp)

++	IF(WEBP_FOUND)

++		add_definitions(-DWITH_WEBP)

++	ELSE(WEBP_FOUND)

++		message(FATAL_ERROR "libwebp was not found. It's mandatory when used with ENABLE_WEBP enabled.")

++	ENDIF(WEBP_FOUND)

+ ENDIF(ENABLE_WEBP)

+ 

+ 

+@@ -439,9 +409,9 @@
+ 				

+ 	ELSE()

+ 		set(EXE_NAME ${CMAKE_PROJECT_NAME})

+-		link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})

+-		add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE})

+-		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES})

++		link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${WEBP_LIBRARY_DIRS})

++		add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC})

++		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${WEBP_LIBRARIES})

+ 

+ 		IF (CMAKE_SYSTEM_NAME MATCHES "Linux")

+ 			SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)

+--- CMakeLists.txt.orig	2014-01-14 12:57:49.174392532 +0400
++++ CMakeLists.txt	2014-01-14 12:58:02.554393698 +0400
+@@ -276,7 +276,7 @@
+ 	${OpenCV_INCLUDE_DIRS}

+ 	${CMAKE_CURRENT_BINARY_DIR}

+ 	${CMAKE_SOURCE_DIR}/src

+-	${WEBP_INCLUDE_DIR}

++	${WEBP_INCLUDE_DIRS}

+ 	${TIFF_INCLUDE_DIR}

+ 	${TIFF_CONFIG_DIR}

+ )

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index b34dd48f5726..1e2a6d883a56 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -6,4 +6,7 @@
 		<remote-id type="sourceforge">nomacs</remote-id>
 		<bugs-to>http://www.nomacs.org/redmine/projects/nomacs</bugs-to>
 	</upstream>
+	<use>
+		<flag name="webp">Build support for WEBP image format</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-1.0.0.ebuild b/media-gfx/nomacs/nomacs-1.6.2.ebuild
index dc29031a6d98..bc6366133b6f 100644
--- a/media-gfx/nomacs/nomacs-1.0.0.ebuild
+++ b/media-gfx/nomacs/nomacs-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/nomacs-1.0.0.ebuild,v 1.1 2013/03/14 17:16:28 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/nomacs-1.6.2.ebuild,v 1.1 2014/01/14 10:46:06 pinkbyte Exp $
 
 EAPI=5
 
@@ -8,12 +8,14 @@ inherit cmake-utils
 
 DESCRIPTION="Qt4-based image viewer"
 HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="raw"
+IUSE="raw tiff webp"
+
+PATCHES=( "${FILESDIR}/${P}-use-system-webp.patch" )
 
 RDEPEND="
 	>=media-gfx/exiv2-0.20[zlib]
@@ -22,7 +24,10 @@ RDEPEND="
 	raw? (
 		>=media-libs/libraw-0.14
 		>=media-libs/opencv-2.4.0[qt4]
-	)"
+	)
+	tiff? ( media-libs/tiff:0= )
+	webp? ( media-libs/libwebp:= )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
@@ -30,6 +35,8 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable raw)
+		$(cmake-utils_use_enable tiff)
+		$(cmake-utils_use_enable webp)
 	)
 	cmake-utils_src_configure
 }