diff options
author | 2014-08-03 18:47:36 +0000 | |
---|---|---|
committer | 2014-08-03 18:47:36 +0000 | |
commit | bc013be9e8ddd1a216452c1f57d2e5f3df0d623b (patch) | |
tree | e2b80bed23bb5027bbe7255e7f1570a961aa01b2 | |
parent | Bump LeechCraft to 0.6.70, thanks to 0xd34df00d. (diff) | |
download | gentoo-2-bc013be9e8ddd1a216452c1f57d2e5f3df0d623b.tar.gz gentoo-2-bc013be9e8ddd1a216452c1f57d2e5f3df0d623b.tar.bz2 gentoo-2-bc013be9e8ddd1a216452c1f57d2e5f3df0d623b.zip |
remove old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 072AD062)
-rw-r--r-- | media-libs/lensfun/ChangeLog | 7 | ||||
-rw-r--r-- | media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch | 11 | ||||
-rw-r--r-- | media-libs/lensfun/files/lensfun-0.2.7-build.patch | 60 | ||||
-rw-r--r-- | media-libs/lensfun/files/lensfun-0.2.7-memset.patch | 13 | ||||
-rw-r--r-- | media-libs/lensfun/lensfun-0.2.7.ebuild | 49 |
5 files changed, 6 insertions, 134 deletions
diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog index fd9cb4bbd091..cc6cc15f2e6f 100644 --- a/media-libs/lensfun/ChangeLog +++ b/media-libs/lensfun/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/lensfun # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.73 2014/08/03 18:38:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.74 2014/08/03 18:47:36 maekke Exp $ + + 03 Aug 2014; Markus Meier <maekke@gentoo.org> -lensfun-0.2.7.ebuild, + -files/lensfun-0.2.6-auxfun.patch, -files/lensfun-0.2.7-build.patch, + -files/lensfun-0.2.7-memset.patch: + remove old 03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> lensfun-0.2.8.ebuild: Stable for ppc, wrt bug #513336 diff --git a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch deleted file mode 100644 index c8d989f745ab..000000000000 --- a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/auxfun/CMakeLists.txt -+++ libs/auxfun/CMakeLists.txt -@@ -6,7 +6,7 @@ - ADD_LIBRARY(auxfun SHARED ${AUXFUN_SRC}) - ENDIF() - --SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}).${VERSION_MICRO}.${VERSION_BUGFIX}") -+SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}") - TARGET_LINK_LIBRARIES(auxfun ${PNG_LIBRARY} ${ZLIB_LIBRARY}) - INSTALL(TARGETS auxfun - RUNTIME DESTINATION ${BINDIR} diff --git a/media-libs/lensfun/files/lensfun-0.2.7-build.patch b/media-libs/lensfun/files/lensfun-0.2.7-build.patch deleted file mode 100644 index ebf557c5fe79..000000000000 --- a/media-libs/lensfun/files/lensfun-0.2.7-build.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru lensfun-0.2.7.orig/CMakeLists.txt lensfun-0.2.7/CMakeLists.txt ---- lensfun-0.2.7.orig/CMakeLists.txt 2013-03-23 17:54:00.000000000 +0100 -+++ lensfun-0.2.7/CMakeLists.txt 2013-03-23 17:54:03.000000000 +0100 -@@ -30,7 +30,7 @@ - - # options controlling the build process - OPTION(BUILD_STATIC "Build static library" OFF) --OPTION(BUILD_TESTS "Build test programs" ON) -+OPTION(BUILD_TESTS "Build test programs" OFF) - OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF) - OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF) - OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF) -@@ -74,10 +74,10 @@ - - # define destination dirs (relative to prefix) - SET(BINDIR bin) --SET(LIBDIR lib${LIB_SUFFIX}) -+# SET(LIBDIR lib${LIB_SUFFIX}) - SET(INCLUDEDIR include) - SET(DATADIR share/lensfun) --SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}) -+# SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}) - - IF(WIN32) - # install into place in build-dir -@@ -131,12 +131,12 @@ - ENDIF() - - # install include files --INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun) -+INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}) - IF(NOT HAVE_REGEX_H) - INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex) - ENDIF() - IF(BUILD_AUXFUN) -- INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun) -+ INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}) - ENDIF() - - # install db files -Only in lensfun-0.2.7: CMakeLists.txt.orig -diff -ru lensfun-0.2.7.orig/docs/CMakeLists.txt lensfun-0.2.7/docs/CMakeLists.txt ---- lensfun-0.2.7.orig/docs/CMakeLists.txt 2013-03-23 17:54:00.000000000 +0100 -+++ lensfun-0.2.7/docs/CMakeLists.txt 2013-03-23 17:54:03.000000000 +0100 -@@ -11,7 +11,7 @@ - CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY) - - # now build documentation --ADD_CUSTOM_TARGET(doc -+ADD_CUSTOM_TARGET(doc ALL - COMMAND "${DOXYGEN_EXECUTABLE}" - DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" -@@ -19,5 +19,4 @@ - ) - - # install documentation --FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*") --INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR}) -+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR}) diff --git a/media-libs/lensfun/files/lensfun-0.2.7-memset.patch b/media-libs/lensfun/files/lensfun-0.2.7-memset.patch deleted file mode 100644 index 2b79e48f5be1..000000000000 --- a/media-libs/lensfun/files/lensfun-0.2.7-memset.patch +++ /dev/null @@ -1,13 +0,0 @@ -libs/auxfun/image.cpp: In member function ‘bool Image::SavePNG(const char*)’: -libs/auxfun/image.cpp:258:42: error: ‘memset’ was not declared in this scope - ---- libs/auxfun/image.cpp -+++ libs/auxfun/image.cpp -@@ -6,6 +6,7 @@ - #include "image.h" - #include <zlib.h> - #include <png.h> -+#include <string.h> - #include <stdlib.h> - #ifdef _MSC_VER - #define _USE_MATH_DEFINES 1 diff --git a/media-libs/lensfun/lensfun-0.2.7.ebuild b/media-libs/lensfun/lensfun-0.2.7.ebuild deleted file mode 100644 index 7f251e74f872..000000000000 --- a/media-libs/lensfun/lensfun-0.2.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.7.ebuild,v 1.14 2014/06/15 11:50:15 maekke Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_{6,7} ) - -inherit multilib python-single-r1 cmake-utils - -DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions" -HOMEPAGE="http://lensfun.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning. -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" -IUSE="doc sse sse2" - -RDEPEND=">=dev-libs/glib-2.28 - media-libs/libpng:0= - sys-libs/zlib:=" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${PN}-0.2.6-auxfun.patch - "${FILESDIR}"/${P}-memset.patch - ) - -DOCS=( README docs/mounts.txt ) - -src_configure() { - local mycmakeargs=( - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - -DLIBDIR=$(get_libdir) - -DBUILD_AUXFUN=ON - $(cmake-utils_use_build doc) - $(cmake-utils_use_build sse FOR_SSE) - $(cmake-utils_use_build sse2 FOR_SSE2) - -DBUILD_STATIC=OFF - -DBUILD_TESTS=OFF - ) - - cmake-utils_src_configure -} |