Remove old.

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

4 files changed, 6 insertions, 154 deletions

diff --git a/media-gfx/nomacs/ChangeLog b/media-gfx/nomacs/ChangeLog
index 33d61c9b2241..a856e517799b 100644
--- a/media-gfx/nomacs/ChangeLog
+++ b/media-gfx/nomacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/nomacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.9 2015/05/21 13:27:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.10 2015/05/21 15:07:55 kensington Exp $
+
+  21 May 2015; Michael Palimaka <kensington@gentoo.org>
+  -files/nomacs-1.6.2-use-system-webp.patch, -nomacs-1.0.2.ebuild,
+  -nomacs-1.6.2.ebuild:
+  Remove old.
 
   21 May 2015; Agostino Sarubbo <ago@gentoo.org> nomacs-2.4.2.ebuild:
   Stable for amd64, wrt bug #542082
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
deleted file mode 100644
index e4151bf7e3e5..000000000000
--- a/media-gfx/nomacs/files/nomacs-1.6.2-use-system-webp.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- 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/nomacs-1.0.2.ebuild b/media-gfx/nomacs/nomacs-1.0.2.ebuild
deleted file mode 100644
index 1b3ff68c89c6..000000000000
--- a/media-gfx/nomacs/nomacs-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/nomacs-1.0.2.ebuild,v 1.1 2013/06/12 14:39:56 kensington Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="raw"
-
-RDEPEND="
-	>=media-gfx/exiv2-0.20[zlib]
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	raw? (
-		>=media-libs/libraw-0.14
-		>=media-libs/opencv-2.4.0[qt4]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable raw)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/nomacs/nomacs-1.6.2.ebuild b/media-gfx/nomacs/nomacs-1.6.2.ebuild
deleted file mode 100644
index 8cfd8e53c352..000000000000
--- a/media-gfx/nomacs/nomacs-1.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.6.2.ebuild,v 1.2 2014/01/16 07:47:30 pinkbyte Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="raw tiff webp"
-
-PATCHES=( "${FILESDIR}/${P}-use-system-webp.patch" )
-
-RDEPEND="
-	>=media-gfx/exiv2-0.20[zlib]
-	>=dev-qt/qtcore-4.7.0:4
-	>=dev-qt/qtgui-4.7.0:4
-	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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable raw)
-		$(cmake-utils_use_enable tiff)
-		$(cmake-utils_use_enable webp)
-	)
-	cmake-utils_src_configure
-}