From: Luca Barbato Date: Tue, 30 Jan 2007 13:18:31 +0000 (+0000) Subject: Cleanup and minor fix to prevent upgrade/downgrade X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1dbcf0422229cb57fc62591249fb2cbaf1a06f76;p=gentoo.git Cleanup and minor fix to prevent upgrade/downgrade Package-Manager: portage-2.1.2-r5 --- diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index afa3c265376a..7c574b8beaaa 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/blender # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.105 2007/01/04 18:52:13 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.106 2007/01/30 13:18:31 lu_zero Exp $ + + 30 Jan 2007; Luca Barbato -blender-2.42a.ebuild, + blender-2.42a-r1.ebuild: + Cleanup and minor fix to prevent upgrade/downgrade 04 Jan 2007; Christian Faulhammer blender-2.42a-r1.ebuild: diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 282bfe430c82..79bc1b596a08 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e SHA1 905181caae8193d212a783e4c4c938e87e136752 SHA256 18ed351fd88c1bf952c86425dc769143cda6c5cd25e948ec1e1c0a1b911d44f7 MD5 bcc3b86202d4c6bb85ef9cef08bfcf9e files/blender-2.37-dirs.patch 725 RMD160 3496386616f3066e1a237921f8ecc695a21b142e files/blender-2.37-dirs.patch 725 @@ -25,18 +22,14 @@ EBUILD blender-2.42.ebuild 3129 RMD160 565347deff040e68c002704b0756898445ec99ba MD5 f9563a65f8328bd5ad42c9c89f57416f blender-2.42.ebuild 3129 RMD160 565347deff040e68c002704b0756898445ec99ba blender-2.42.ebuild 3129 SHA256 4bd0885d618c1f166575f334412ffc4e5a2625c95cd0e3db63d7ec97b97a6833 blender-2.42.ebuild 3129 -EBUILD blender-2.42a-r1.ebuild 3447 RMD160 a436319dc6cdb8101dc811acf4c32933f719bfd0 SHA1 8d9918a1fd12f4b4e2546b58d1c4190763f6d13c SHA256 77223b2800c2fd90587feff1968d9a485d4d84739092097604a0b5c5f5169503 -MD5 23d662aace6c4e04a1a6783581d30ea7 blender-2.42a-r1.ebuild 3447 -RMD160 a436319dc6cdb8101dc811acf4c32933f719bfd0 blender-2.42a-r1.ebuild 3447 -SHA256 77223b2800c2fd90587feff1968d9a485d4d84739092097604a0b5c5f5169503 blender-2.42a-r1.ebuild 3447 -EBUILD blender-2.42a.ebuild 3253 RMD160 0d5dcad47b0f1c8f9ba961bfe708edfd2706bbf2 SHA1 6b6dec48eb7944d2e05a0ee5d12337f9964458d0 SHA256 511768846188aa35bf8fcb4de3cfa48161f4ed16e15344fcebfe136323c42a17 -MD5 2ca409818d85c485fc0f98473eaae4d2 blender-2.42a.ebuild 3253 -RMD160 0d5dcad47b0f1c8f9ba961bfe708edfd2706bbf2 blender-2.42a.ebuild 3253 -SHA256 511768846188aa35bf8fcb4de3cfa48161f4ed16e15344fcebfe136323c42a17 blender-2.42a.ebuild 3253 -MISC ChangeLog 14953 RMD160 a5a089dfe6bafc2aad3e3398fdfe7b5fa75b20e3 SHA1 a6dfa107c10106e785b57ce0853dc6f9a2474173 SHA256 5107fc6538bfc2b4b22a5e3ddf7eb85813d7eebe15a003ddee71019bd14dc963 -MD5 fd8e0c83264a75de162d3c6606d13357 ChangeLog 14953 -RMD160 a5a089dfe6bafc2aad3e3398fdfe7b5fa75b20e3 ChangeLog 14953 -SHA256 5107fc6538bfc2b4b22a5e3ddf7eb85813d7eebe15a003ddee71019bd14dc963 ChangeLog 14953 +EBUILD blender-2.42a-r1.ebuild 3450 RMD160 f20166a2549fb932f6bc3b58344b0da581baa2b6 SHA1 180d03fbac6fb341a5b3cd79e040b6e3291872d5 SHA256 5dc7ba71b326afb4be559ee3adf7aa1d769f0a63f29b13a2003a1e24323f3e0c +MD5 e6cf6a6cb7d01ed8339e0332f7e1a05f blender-2.42a-r1.ebuild 3450 +RMD160 f20166a2549fb932f6bc3b58344b0da581baa2b6 blender-2.42a-r1.ebuild 3450 +SHA256 5dc7ba71b326afb4be559ee3adf7aa1d769f0a63f29b13a2003a1e24323f3e0c blender-2.42a-r1.ebuild 3450 +MISC ChangeLog 15108 RMD160 022621341bb8bb17a65d335292bb631dac27d46d SHA1 65724db9f9b8799f9bca50d0e0159f05e88783a3 SHA256 a094d9e531c37213823567cb4dacff352badb739567ba0dc4a35ef22f0559c59 +MD5 61b3c51b026a736133b5ed53bf1ab563 ChangeLog 15108 +RMD160 022621341bb8bb17a65d335292bb631dac27d46d ChangeLog 15108 +SHA256 a094d9e531c37213823567cb4dacff352badb739567ba0dc4a35ef22f0559c59 ChangeLog 15108 MISC metadata.xml 587 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 SHA1 9060e32f277a506f2bbdfb7b0a9ed89ae13612b7 SHA256 4a2974916837cada500d7a764a285fa29a0471b242dff4717d60c4a7113dd45e MD5 493f38fb63d60a1ce275fdd2ea43d6e9 metadata.xml 587 RMD160 925b5c3bcf2d4f21fc82f760aad723541088bca4 metadata.xml 587 @@ -47,16 +40,6 @@ SHA256 64d11d6125385ca32c8f8ae4de0c196a9567729a26d971f49199329a14ca4bee files/di MD5 1335594f618806e1251f1409f4bb1ba5 files/digest-blender-2.42 244 RMD160 670d79e008baa0eb3564fb70d07082a8360bb6f3 files/digest-blender-2.42 244 SHA256 81385a4f674d43c047eeadd3b65956475dffab2e10c1f820db2076c32a712374 files/digest-blender-2.42 244 -MD5 f54a3a7abac166235de1a9d8a0c4674d files/digest-blender-2.42a 247 -RMD160 23d052a2086d9f6f17a9c1224b6c68782da66cc2 files/digest-blender-2.42a 247 -SHA256 cac4e18c76afbd32b8de6a3d17e23f5d834f87cf8ab122e7a93c90b71ea4406b files/digest-blender-2.42a 247 MD5 ca68c22db3c4fd246ce043b3de0112ee files/digest-blender-2.42a-r1 521 RMD160 b6cfe1ec330ec0e62551df0afa84435ac4b70abf files/digest-blender-2.42a-r1 521 SHA256 46499abfc93e30703937df62bbef32ae82b32b403e97858e875c00e1c2a06961 files/digest-blender-2.42a-r1 521 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFnUzvNQqtfCuFneMRAvO0AKCEgrbHr7TfRtI0uVK3uXJFwZ6CmACeJyyT -iozwgpPXgJziyMD2MlIUFrw= -=aKjc ------END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.42a-r1.ebuild b/media-gfx/blender/blender-2.42a-r1.ebuild index cf3a1ec26dbc..7dd9fec74376 100644 --- a/media-gfx/blender/blender-2.42a-r1.ebuild +++ b/media-gfx/blender/blender-2.42a-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a-r1.ebuild,v 1.7 2007/01/04 18:52:13 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a-r1.ebuild,v 1.8 2007/01/30 13:18:31 lu_zero Exp $ inherit multilib flag-o-matic eutils python @@ -28,7 +28,7 @@ RDEPEND=" openal? ( media-libs/openal media-libs/freealut ) >=media-libs/libsdl-1.2 - ffmpeg? ( ~media-video/ffmpeg-${FFMPEG_SNAP/-/_} + ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_SNAP/-/_} ~media-libs/x264-svn-20061014 ) >=dev-libs/openssl-0.9.6 >=media-gfx/yafray-0.0.7 diff --git a/media-gfx/blender/blender-2.42a.ebuild b/media-gfx/blender/blender-2.42a.ebuild deleted file mode 100644 index 9847ab8d3d71..000000000000 --- a/media-gfx/blender/blender-2.42a.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.42a.ebuild,v 1.8 2006/12/21 23:08:30 gustavoz Exp $ - -inherit multilib flag-o-matic eutils python - -#IUSE="sdl jpeg png mozilla truetype static fmod" -IUSE="openal sdl openexr jpeg png nls iconv blender-game ffmpeg" - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org/" -SRC_URI="http://download.blender.org/source/${P}.tar.gz" - - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86" - - -RDEPEND=" - jpeg? ( media-libs/jpeg ) - png? ( media-libs/libpng ) - media-libs/tiff - nls? ( >=media-libs/freetype-2.0 - virtual/libintl ) - iconv? ( virtual/libiconv ) - openal? ( media-libs/openal - media-libs/freealut ) - sdl? ( >=media-libs/libsdl-1.2 ) - ffmpeg? ( ~media-video/ffmpeg-0.4.9_p20060530 ) - ~media-libs/x264-svn-20060612 - >=dev-libs/openssl-0.9.6 - >=media-gfx/yafray-0.0.7 - nls? ( >=media-libs/ftgl-2.1 ) - openexr? ( media-libs/openexr ) - virtual/opengl" - -DEPEND="dev-util/scons - || ( x11-libs/libXt virtual/x11 ) - ${RDEPEND}" - -blend_with() { -local UWORD="$2" - if [ -z "${UWORD}" ]; then - UWORD="$1" - fi - - if useq $1; then - echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' - else - echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' - fi - -return 0 -} - -src_unpack() { - unpack ${A} - mkdir -p ${WORKDIR}/install/linux2/plugins/ -# chmod 755 bmake -# rm -fR include - cd ${WORKDIR}/install/linux2/plugins/ - cp -pPR ${S}/source/blender/blenpluginapi include - cd ${S} - epatch ${FILESDIR}/blender-2.37-dirs.patch -# mkdir -p ${WORKDIR}/build/linux2/{extern,intern,source} -} - - -src_compile() { - local myconf="" - - myconf="${myconf} $(blend_with openal)" - myconf="${myconf} $(blend_with sdl)" - myconf="${myconf} $(blend_with openexr)" - myconf="${myconf} $(blend_with jpeg)" - myconf="${myconf} $(blend_with ffmpeg)" - myconf="${myconf} $(blend_with png)" - myconf="${myconf} $(blend_with nls international)" - myconf="${myconf} $(blend_with iconv)" - myconf="${myconf} $(blend_with blender-game gameengine)" - - scons ${MAKEOPTS} ${myconf} \ - WITH_BF_PLAYER=0 || die - -# sed -i -e "s/-O2/${CFLAGS// /\' ,\'}/g" ${S}/SConstruct -# scons ${MAKEOPTS} || die - cd ${WORKDIR}/install/linux2/plugins/ - chmod 755 bmake - emake || die - -} - -src_install() { - exeinto /usr/bin/ - doexe ${WORKDIR}/install/linux2/blender - - dodir /usr/share/${PN} - - exeinto /usr/$(get_libdir)/${PN}/textures - doexe ${WORKDIR}/install/linux2/plugins/texture/*.so - exeinto /usr/$(get_libdir)/${PN}/sequences - doexe ${WORKDIR}/install/linux2/plugins/sequence/*.so - insinto /usr/include/blender/ - doins ${WORKDIR}/install/linux2/plugins/include/*.h - use nls && \ - cp -pPR ${WORKDIR}/install/linux2/.blender/{.Blanguages,.bfont.ttf,locale}\ - ${D}/usr/share/${PN} - cp -pPR ${WORKDIR}/install/linux2/.blender/scripts ${D}/usr/share/${PN} - - mv ${D}/usr/share/${PN}/locale ${D}/usr/share - - insinto /usr/share/pixmaps - doins ${FILESDIR}/${PN}.png - insinto /usr/share/applications - doins ${FILESDIR}/${PN}.desktop - - dodoc COPYING INSTALL README - -} - -pkg_preinst(){ - if [ -h "/usr/$(get_libdir)/blender/plugins/include" ]; - then - rm -f /usr/$(get_libdir)/blender/plugins/include - fi -} diff --git a/media-gfx/blender/files/digest-blender-2.42a b/media-gfx/blender/files/digest-blender-2.42a deleted file mode 100644 index 91e8fe1cdeee..000000000000 --- a/media-gfx/blender/files/digest-blender-2.42a +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3d60b7ebe0dea47da12744fe2462d96c blender-2.42a.tar.gz 12295244 -RMD160 3178191ec9565c92f0b381fef2ad69c88873aadb blender-2.42a.tar.gz 12295244 -SHA256 f046a66abe2e9a93a17ef1538f43642d2b6a6e48b55b804899fea59279dacd52 blender-2.42a.tar.gz 12295244