* [gentoo-commits] proj/kde:master commit in: sys-auth/pam-face-authentication/files/, sys-auth/pam-face-authentication/
@ 2012-09-20 12:41 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2012-09-20 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 88e400f0f192a13fcf44547cf65143ad617ba314
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 12:39:14 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 20 12:39:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=88e400f0
[sys-auth/pam-face-authentication] Add hacks to build with newer versions of OpenCV wrt bug #435302.
(Portage version: 2.1.11.16/git/Linux x86_64, unsigned Manifest commit)
---
.../files/pam-face-authentication-0.3-opencv.patch | 23 ++++++++++++++++++++
.../pam-face-authentication-0.3.ebuild | 15 ++++++++----
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch b/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch
new file mode 100644
index 0000000..5597b1c
--- /dev/null
+++ b/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch
@@ -0,0 +1,23 @@
+Fixes build with newer versions of OpenCV.
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -88,7 +88,7 @@
+
+ INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/include" )
+ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
+-INCLUDE_DIRECTORIES(${OPENCV_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES(${PAM_INCLUDE_DIR})
+ ADD_LIBRARY(pam_face_authentication SHARED ${PAM_FACE_AUTHENTICATE_SRCS})
+ SET_TARGET_PROPERTIES( pam_face_authentication PROPERTIES PREFIX "")
+@@ -96,8 +96,8 @@
+ TARGET_LINK_LIBRARIES( xwindowFaceAuth ${X11_LIBRARIES})
+
+ ADD_EXECUTABLE( qt-facetrainer ${QT_FACETRAINER_SRCS} ${QT_FACETRAINER_MOC_SRCS} ${QT_FACETRAINER_RC_SRCS} ${QT_FACETRAINER_UI_HDRS} )
+-TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OPENCV_LIBRARIES})
+-TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OPENCV_LIBRARIES})
++TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OpenCV_LIBS})
++TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OpenCV_LIBS})
+
+ if( UNIX AND NOT APPLE )
+ if( NOT DESKTOP_ENTRY )
diff --git a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild b/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
index c8b212f..b50a627 100644
--- a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
+++ b/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit cmake-utils
+inherit cmake-utils eutils
DESCRIPTION="This is Pluggable Authentication Module for Face based Authentication"
HOMEPAGE="http://code.google.com/p/pam-face-authentication/"
@@ -22,8 +22,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/${PN}-0.3-cmake.patch"
-)
+DOCS=( AUTHORS ChangeLog README )
-DOCS=(AUTHORS ChangeLog README)
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.3-cmake.patch
+ epatch "${FILESDIR}"/${PN}-0.3-opencv.patch
+
+ cp /usr/share/OpenCV/OpenCVConfig.cmake cmake/modules/FindOpenCV.cmake || die
+ sed -i cmake/modules/FindOpenCV.cmake \
+ -e 's:${OpenCV_INSTALL_PATH}:/usr:' || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/kde:master commit in: sys-auth/pam-face-authentication/files/, sys-auth/pam-face-authentication/
@ 2013-11-23 23:51 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2013-11-23 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 5038be0ae196c754a09e318135b99e7ea9b2ff44
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 22:50:55 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:50:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5038be0a
[sys-auth/pam-face-authentication] Removal, ebuilds in bug #261902 available
* dead upstream
* does not work
* nobody from kde herd wants to maintain this
Package-Manager: portage-2.2.7
---
.../files/pam-face-authentication-0.3-cmake.patch | 20 -------------
.../files/pam-face-authentication-0.3-opencv.patch | 23 ---------------
sys-auth/pam-face-authentication/metadata.xml | 5 ----
.../pam-face-authentication-0.3.ebuild | 34 ----------------------
4 files changed, 82 deletions(-)
diff --git a/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-cmake.patch b/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-cmake.patch
deleted file mode 100644
index 927bc7a..0000000
--- a/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -76,7 +76,7 @@
- SET( VERSION "0.3" )
- SET( PKGDATADIR "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}" )
- SET( BINDIR "${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}" )
--SET( XWINDOW_BINDIR "${CMAKE_INSTALL_PREFIX}/kde/4/${BIN_INSTALL_DIR}" )
-+SET( XWINDOW_BINDIR "${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}" )
- ADD_DEFINITIONS (-DVERSION='"${VERSION}"' -DPKGDATADIR=\"${PKGDATADIR}\" -DBINDIR=\"${BINDIR}\")
- FIND_PACKAGE( PAM REQUIRED )
-
-@@ -123,7 +123,7 @@
- TARGETS
- pam_face_authentication
- DESTINATION
-- /lib/security/
-+ /lib${LIB_SUFFIX}/security/
- )
-
- INSTALL(
diff --git a/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch b/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch
deleted file mode 100644
index 5597b1c..0000000
--- a/sys-auth/pam-face-authentication/files/pam-face-authentication-0.3-opencv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fixes build with newer versions of OpenCV.
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -88,7 +88,7 @@
-
- INCLUDE_DIRECTORIES( "${CMAKE_SOURCE_DIR}/include" )
- INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
--INCLUDE_DIRECTORIES(${OPENCV_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES(${PAM_INCLUDE_DIR})
- ADD_LIBRARY(pam_face_authentication SHARED ${PAM_FACE_AUTHENTICATE_SRCS})
- SET_TARGET_PROPERTIES( pam_face_authentication PROPERTIES PREFIX "")
-@@ -96,8 +96,8 @@
- TARGET_LINK_LIBRARIES( xwindowFaceAuth ${X11_LIBRARIES})
-
- ADD_EXECUTABLE( qt-facetrainer ${QT_FACETRAINER_SRCS} ${QT_FACETRAINER_MOC_SRCS} ${QT_FACETRAINER_RC_SRCS} ${QT_FACETRAINER_UI_HDRS} )
--TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OPENCV_LIBRARIES})
--TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OPENCV_LIBRARIES})
-+TARGET_LINK_LIBRARIES( pam_face_authentication ${PAM_LIBRARIES} ${OpenCV_LIBS})
-+TARGET_LINK_LIBRARIES( qt-facetrainer ${QT_LIBRARIES} ${OpenCV_LIBS})
-
- if( UNIX AND NOT APPLE )
- if( NOT DESKTOP_ENTRY )
diff --git a/sys-auth/pam-face-authentication/metadata.xml b/sys-auth/pam-face-authentication/metadata.xml
deleted file mode 100644
index 8d1e86a..0000000
--- a/sys-auth/pam-face-authentication/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
diff --git a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild b/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
deleted file mode 100644
index c9bf52c..0000000
--- a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-DESCRIPTION="This is Pluggable Authentication Module for Face based Authentication"
-HOMEPAGE="http://code.google.com/p/pam-face-authentication/"
-SRC_URI="http://pam-face-authentication.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- >=media-libs/opencv-1.0.0
- >=sci-libs/gsl-1.9
- virtual/pam
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.3-cmake.patch
- epatch "${FILESDIR}"/${PN}-0.3-opencv.patch
-
- cp /usr/share/OpenCV/OpenCVConfig.cmake cmake/modules/FindOpenCV.cmake || die
- sed -i cmake/modules/FindOpenCV.cmake \
- -e 's:${OpenCV_INSTALL_PATH}:/usr:' || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-23 23:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-20 12:41 [gentoo-commits] proj/kde:master commit in: sys-auth/pam-face-authentication/files/, sys-auth/pam-face-authentication/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2013-11-23 23:51 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox