version bump

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 94 insertions, 1 deletions

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index 6620d1be4dfb..2353c6f93041 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.41 2012/05/31 15:13:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.42 2012/06/10 22:08:12 aballier Exp $
+
+*libprojectm-2.1.0 (10 Jun 2012)
+
+  10 Jun 2012; Alexis Ballier <aballier@gentoo.org> +libprojectm-2.1.0.ebuild,
+  +files/libprojectm-2.1.0-libsuffix.patch,
+  +files/libprojectm-2.1.0-path.patch:
+  version bump
 
   31 May 2012; Jeroen Roovers <jer@gentoo.org> libprojectm-2.0.1-r1.ebuild:
   Stable for HPPA (bug #408487).
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch
new file mode 100644
index 000000000000..99e6d4dac574
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch
@@ -0,0 +1,19 @@
+Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+===================================================================
+--- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2)
+ 
+ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+ 
+-SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
++SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
+   FORCE)
+ 
+@@ -237,4 +237,4 @@ INSTALL(FILES ${Renderer_SOURCE_DIR}/pro
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+ INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
+-INSTALL(TARGETS projectM DESTINATION lib)
++INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
new file mode 100644
index 000000000000..39fa7e35da38
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
@@ -0,0 +1,13 @@
+Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+===================================================================
+--- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0)
+ set(PROJECTM_ABI_LEVEL 2)
+ #
+ 
+-ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
++ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
+ 
+ SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
diff --git a/media-libs/libprojectm/libprojectm-2.1.0.ebuild b/media-libs/libprojectm/libprojectm-2.1.0.ebuild
new file mode 100644
index 000000000000..907716fe86a6
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-2.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.1.0.ebuild,v 1.1 2012/06/10 22:08:12 aballier Exp $
+
+EAPI=4
+
+inherit cmake-utils flag-o-matic eutils toolchain-funcs multilib
+
+MY_P=${PN/m/M}-complete-${PV}-Source ; MY_P=${MY_P/lib}
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug openmp video_cards_nvidia"
+
+RDEPEND=">=media-libs/ftgl-2.1.3_rc5
+	media-libs/freetype:2
+	media-libs/mesa
+	media-libs/glew
+	sys-libs/zlib
+	video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}/src/libprojectM
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libsuffix.patch
+	"${FILESDIR}"/${P}-path.patch
+)
+
+src_configure() {
+	if use video_cards_nvidia; then
+		append-ldflags -L/opt/nvidia-cg-toolkit/lib
+		append-cppflags -I/opt/nvidia-cg-toolkit/include
+	fi
+
+	local mycmakeargs=(
+		$(cmake-utils_use_use video_cards_nvidia CG)
+		"-DUSE_OPENMP=OFF"
+	)
+
+	if use openmp && tc-has-openmp; then
+		mycmakeargs+=(
+			$(cmake-utils_use_use openmp)
+		)
+	fi
+
+	cmake-utils_src_configure
+}