summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-06-06 13:54:04 +0000
committerMichael Weber <xmw@gentoo.org>2013-06-06 13:54:04 +0000
commit69fe256f1cdafb70de7bc2b29c77908e1675ed0f (patch)
tree4463e88bb4b8694d1fa8e37eaff0a4eb0fecc04b /media-libs/openjpeg
parentVersion bump. (diff)
downloadgentoo-2-69fe256f1cdafb70de7bc2b29c77908e1675ed0f.tar.gz
gentoo-2-69fe256f1cdafb70de7bc2b29c77908e1675ed0f.tar.bz2
gentoo-2-69fe256f1cdafb70de7bc2b29c77908e1675ed0f.zip
Fix patch file and whitespace
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'media-libs/openjpeg')
-rw-r--r--media-libs/openjpeg/ChangeLog6
-rw-r--r--media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch2
-rw-r--r--media-libs/openjpeg/openjpeg-2.0.0.ebuild4
3 files changed, 8 insertions, 4 deletions
diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 9714fe5c70d8..78c13daf26df 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/openjpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.71 2013/06/06 13:15:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.72 2013/06/06 13:54:04 xmw Exp $
+
+ 06 Jun 2013; Michael Weber <xmw@gentoo.org>
+ files/openjpeg-2.0.0-pkgconfig.patch, openjpeg-2.0.0.ebuild:
+ Fix patch file and whitespace
*openjpeg-2.0.0 (06 Jun 2013)
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
index b10893d3d73f..656f4c20acd3 100644
--- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
@@ -21,7 +21,7 @@ Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250
# For all builds, make sure openjpeg is std99 compliant:
--- /dev/null
+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -0,0 +0,13 @@
+@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
diff --git a/media-libs/openjpeg/openjpeg-2.0.0.ebuild b/media-libs/openjpeg/openjpeg-2.0.0.ebuild
index ccb42c405d36..21b442e49049 100644
--- a/media-libs/openjpeg/openjpeg-2.0.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.0.0.ebuild
@@ -1,6 +1,6 @@
# 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-2.0.0.ebuild,v 1.1 2013/06/06 13:15:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-2.0.0.ebuild,v 1.2 2013/06/06 13:54:04 xmw Exp $
EAPI=5
inherit cmake-utils multilib
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS CHANGES NEWS README THANKS )
-PATCHES=( "${FILESDIR}"/${P}-build.patch
+PATCHES=( "${FILESDIR}"/${P}-build.patch
"${FILESDIR}"/${P}-pkgconfig.patch )
RESTRICT="test" #409263