old

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 5 insertions, 95 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 6a939eeb3e92..9142e0345b2d 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.107 2014/09/19 10:30:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.108 2014/09/19 10:53:14 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/openjpeg-1.5.1-build.patch, -openjpeg-1.5.1.ebuild:
+  old
 
   19 Sep 2014; Agostino Sarubbo <ago@gentoo.org> openjpeg-1.5.2.ebuild:
   Stable for sparc, wrt bug #484802
diff --git a/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch b/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
deleted file mode 100644
index 9c16a3c05f92..000000000000
--- a/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg.git;a=tree
-
---- openjpeg-1.5.1/CMakeLists.txt
-+++ openjpeg-1.5.1/CMakeLists.txt
-@@ -287,11 +287,4 @@
-   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
- )
- 
--#-----------------------------------------------------------------------------
--# install CHANGES and LICENSE
--IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
--  INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
--INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--
- INCLUDE (CMake/OpenJPEGCPack.cmake)
---- openjpeg-1.5.1/libopenjpeg1.pc.cmake
-+++ openjpeg-1.5.1/libopenjpeg1.pc.cmake
-@@ -2,7 +2,7 @@
- bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
- datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
- libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpeg
- Description: JPEG2000 files library
diff --git a/media-libs/openjpeg/openjpeg-1.5.1.ebuild b/media-libs/openjpeg/openjpeg-1.5.1.ebuild
deleted file mode 100644
index c1407ab9951f..000000000000
--- a/media-libs/openjpeg/openjpeg-1.5.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.1.ebuild,v 1.13 2013/08/06 13:12:13 ago Exp $
-
-EAPI=5
-inherit cmake-utils multilib
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://code.google.com/p/openjpeg/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	media-libs/tiff:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS CHANGES NEWS README THANKS )
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-RESTRICT="test" #409263
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build test TESTING)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs ; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			$(cmake-utils_use_build test TESTING)
-			-DBUILD_SHARED_LIBS=OFF
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs ; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	if use static-libs ; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-		#static bins overwritten by shared install
-	fi
-
-	cmake-utils_src_install
-
-	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
-	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
-}