version bump

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 103 insertions, 6 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/Manifest b/media-libs/libprojectm/Manifest
index 054d34f1d479..d84bd1e1ba1e 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,16 +3,20 @@ Hash: SHA1
 
 AUX libprojectm-1.2.0-gcc44.patch 350 RMD160 34b808191656c6e6040cc2ee7fe9e446ee3f03c3 SHA1 c7a5816ea56bea92f795e65ae91402a0c812bdb7 SHA256 ccbc180723c15ea06e5faf33d6304099f5efdf3d81a413cc4db98b00c338d2f0
 AUX libprojectm-2.0.1-pcfix.patch 505 RMD160 2441faca3bb46b81181da69d73495d566b89e0ff SHA1 6ab014c6ef0ae8717d6fc8e11c9b6490fa4cc74b SHA256 242cfdb513f48a24b7c0ed8b326160424723433d56cd32aa3ac0514616aa2f20
+AUX libprojectm-2.1.0-libsuffix.patch 1105 RMD160 c6f1a53005df4fca68f43fed07dc24869744d6c6 SHA1 e059e9428f401b44636f1f31bb5a8c49f113b952 SHA256 d4e8d9a17762a4b9659d560b638432041eed2f4bc3d86551d7a356856c245183
+AUX libprojectm-2.1.0-path.patch 668 RMD160 2783f7aa2a2ac80c2c6d89d2a8fc02507c834dc2 SHA1 c7847320df3153c5781292b78a3be6157134465c SHA256 13e71427f25229e8729153fa31cf72c0d0e8de3d8c5767cb5dffee94adeacdc0
 DIST libprojectM-1.2.0.tar.bz2 1348533 RMD160 bd6bfc6dcda7f8a48cbc5c7208bd30a039bedfe2 SHA1 e8264009e7c6c588e6f4f2e51a10498e0b1d07b7 SHA256 a80545611e6ab19bc671bc20ed87c90e79e2403bfe3d1f48abb2e01eaf2c84fd
 DIST projectM-2.0.1-Source.tar.gz 865784 RMD160 27510fd5cfab6feb8560edbee2fa8396aa17e1f6 SHA1 b35d3c8112531cae2abf8f298e762bd728575b6d SHA256 c305182dfc8b7f87b82a146af6cf50a982e7c9c647877a0559dfef4b11dacb93
+DIST projectM-complete-2.1.0-Source.tar.gz 31130351 RMD160 af031c4e8544594c77d501358cc509ddb719696d SHA1 a1a966a410360926fee88ff253f929f0290a2405 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee
 EBUILD libprojectm-1.2.0.ebuild 900 RMD160 7f065c369001ec9230d928022314ce9bb8d40bd3 SHA1 9656fb439256cc98084b1d420ffcddd631ba93eb SHA256 e74ad882a672c4ea416c6a35b9ba26df6d2013962fb26c2c4351be3509845afd
 EBUILD libprojectm-2.0.1-r1.ebuild 1320 RMD160 ddf9106c107f45255a4c5bf0e2931bc4a1bf1fff SHA1 5655ca21518dbca0a2bc0fdd3882d49abef97d71 SHA256 9ddc0e2504860d0f86f6002187103156bfb5f078984165628fdd82b5a4b8c920
-MISC ChangeLog 6054 RMD160 d703fbb115a0e6ebf0ac33d374e1f66a54f50497 SHA1 9b2afdd4539dac4bf5d1c899705dc6161800db9f SHA256 a09a6710b35018b7f9999808cdbfdf026c542e4f45b72b6516575546c74f3433
+EBUILD libprojectm-2.1.0.ebuild 1371 RMD160 e204d4433d5ede38c7c07176e7589a0efb8e5a66 SHA1 e41fb826666ccc3190a63d6b05fa4b25ed88b721 SHA256 b9d48c61ec249b9f866a73a97b52fce0c22e0251526157cbab07ee93dc480077
+MISC ChangeLog 6271 RMD160 aebee78492b88e097ccdda77213c84e08e7d28a3 SHA1 28bb7d78904b50faf5287cbb2f9b009aa71bbb7b SHA256 35e01f9ac805b28bc3fb13c3655d0519886a012b1cc559b94d08b10fa38bc63e
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/HirEACgkQVWmRsqeSphPddQCcDVJV/YWkch4aUKLdgwwvGAlu
-Ot4An0bM3Qhnag0tbIfACOU49C+7Zwvn
-=PZuX
+iEYEARECAAYFAk/VGtIACgkQvFcC4BYPU0pr5gCfcWmcUZGJ1pyn1AEM3WgDw9Ay
+A/AAn3plyuWdJqj1sWP5eHEnsJX8FvtA
+=9zpv
 -----END PGP SIGNATURE-----
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
+}