| [proaudio] [2535] media-sound/NetworkEditor: update 1.4.0-r1 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2535
Author: gavlee
Date: 2013-03-15 14:54:17 +0100 (Fri, 15 Mar 2013)
Log Message:
-----------
media-sound/NetworkEditor: update 1.4.0-r1
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog
trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0-r1.ebuild
trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/
trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch
trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch
trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild
Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog 2013-03-15 13:54:13 UTC (rev 2534)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog 2013-03-15 13:54:17 UTC (rev 2535)
@@ -2,6 +2,16 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*NetworkEditor-1.4.0-r1 (15 Mar 2013)
+
+ 15 Mar 2013; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+ -NetworkEditor-1.4.0.ebuild, +NetworkEditor-1.4.0-r1.ebuild,
+ +files/NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch,
+ +files/NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch,
+ +files/NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch:
+ add patches pulled in from debian through SRC_URI fixinng build with recent
+ compilers. update for new libclam-1.4.0-r1 with multilib-strict fixes.
+
09 Mart 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
NetworkEditor-9999.ebuild; NetworkEditor-1.4.0.ebuild: Moved QT depends to dev-qt/*
-NetworkEditor-1.0.0
Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest 2013-03-15 13:54:13 UTC (rev 2534)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest 2013-03-15 13:54:17 UTC (rev 2535)
@@ -1,5 +1,9 @@
+AUX NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch 1085 SHA256 a0d1227affe8dae78c03decf5c7a96a1b21d61140f96cc6d4dfb161e0f0c5810 SHA512 74ced78415ceb6dce4724168fe01ad65768b58c6c73a03331e19132f476dfaf1dd52bc399e03689c137d887f6be891643c2f4ccfb16458934223abafc22b31d6 WHIRLPOOL 78f55bc5b51f44814ca313316c2f7c7ce4d23012efcb77f520df0fba743d84fcd4c402eea4726b489814ac506b34549c8385ec356d39b5fd08ad5434512f544f
+AUX NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch 1172 SHA256 f3d561a0e47783ca146b88c13a5872b698df4fc9d59e8992e862eb56318380ef SHA512 5973c7c7c0252c35fbb3f4febbd803483145b6a2a910d0804ca7454b5f73e3fc754bc64fe35b9b65a75795d1fa65cca6c75abd19d5d672e2980dce533120b2fe WHIRLPOOL b0111c8924522a4ebf41d91472a49b3fba1e784fc1b1eb61e869c4cebc72bdbe078893b3e42472c2b955e07fbe8520e57cd97d11849cb9a6dada6b85d477c5c2
+AUX NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch 1526 SHA256 acffe43f89a28c26a9b9694660798faf4b1ffd990d7d2e8682732553b9bab179 SHA512 6f86c087ffcd4c83fb19233e34f7bb1110ec6515ca58084933f5f185cc364bcaabe301cab39d103a782bdaa8d05d53f190ff8a456a67b2fd0baf7b66a404a208 WHIRLPOOL a266a7b459a243e28ce36d6311392bfad6b66bfdbb2846f4626ce390b8590ae69decdbcbf565b9aa3e1b0ad9ff405380ead68bc9029d9a153eb1bdcf55bfcf7d
DIST NetworkEditor-1.4.0.tar.gz 3355350 SHA256 4ecbb03ee6b663a0a77e158a27106b954039847c22cd4721053f0d812c8f1272 SHA512 ecc1f85775f78dbd9ff513ae34c9a3f5f67af2f694deb14557e5c7a8211895367fa8af32bc40bcbd5280570e13a1d49ed47025a589ce51fcefb61e5bd9db693d WHIRLPOOL 65a7d50e245bb39cc5ed4fafa00d3f8e46c4acef5f439c3983cea46cb2d019a5001d51969e013507faa1277080f24f423f3200d0ae6c7a5997d1e68d7c1cce6e
-EBUILD NetworkEditor-1.4.0.ebuild 1637 SHA256 44fd723d8e135dd5aec4e43a392d16128789ca3ab972091252d6f2d6aa655dde SHA512 fbbdef4a3834bfab002fdb72f12a1cd0edbae243d64c8c4c25d7f21fdfe6741be5c9b5be00ee05faaf8a40eac8bfddfe9b7e731ae79996ad8670db8ddf012705 WHIRLPOOL 72b4cc379f1e2652548df570f7f8e6f885be38913f17f2fbf400b6f1659fa53a0ab205a3300c6321c1f809b840bdeaab0f88e8bbf5ced5a79ea14346bfa2d1c3
+DIST clam-networkeditor_1.4.0-3.1.debian.tar.gz 4310 SHA256 123b760487261c6c5b364bff80535e48ef8942f14aab3355bd1bfbe6638c1e88 SHA512 9dd888f852c7c28c915fc897408e9f6eee24c4302c8fb2fe79017fa9b0d4ebeb5ccdf14c807c5ca28dca5e14209c34c0340671c415346a0eae3a49f13d880a08 WHIRLPOOL 5c1f09c7eeb66eb13f0c759a20c1f204e2914273e742988594118c6f16b3be03eca968ac27207f577cadb2036a65570e5ed4bfe7f6ec75612639c629f7301b8f
+EBUILD NetworkEditor-1.4.0-r1.ebuild 1657 SHA256 3dd681f051a670c2ab4f01ae30ec6c6ded97ef9a7d135ebb687ff09b18d3fe2b SHA512 790e1ca8ed2e5eb158dda6c9daf47764d654e71fdfa176c1b8b89cf96464e0f89125bf6ad15cc0850ec657b4acae9833f2f16d3ecf8e2e3a64229dcd6480ea08 WHIRLPOOL 02d6b7b3406d4962942d63e3fe3d5e610231e5f4802e615111a1393cc7f6385c56dd53c9143fede97879fc973a2251269ca9477d486f1aea82950a84c4597dd4
EBUILD NetworkEditor-9999.ebuild 1736 SHA256 ffa7af70cf8ade63481f2ecd51aacfe9ca2fb975edcb7b3bf093d99db3aeea0d SHA512 b75f24c667d42ff5de5336a8fcfb2daf8ff9d479da9397e3591b2a5e84f4cb70fdf3696565b3e3b3708db2b7240f320d02ecb7debf47fad30d2bae4e09d4be12 WHIRLPOOL d4fa4fe32e59961409c22916695614e83e6db4f62f2bffb3b8efe33b49e91d49493418eecf5c24a1b1120db4104356683226405c44fe1da29024081cc5575b45
-MISC ChangeLog 1728 SHA256 33f89cfe35e3a6994e9898741111012e4bbffec5877c7338d451d74940825879 SHA512 250d48ef05bd084f1992186502b16c22bdada615bf804f08e71e98653e74372dc22a46c99a783613b40ceb502898fa58b5a4fb06360158a2f2c7f6be3f5c4705 WHIRLPOOL bcb8c0d105c566d94e3aee5444a9a5c235145ba6c20dc06c81762ff3a028d2ffd621c0fcac34579a6f70ee883d13a49d6ee5ec33fe4e363cb8b9bfd31e17798e
+MISC ChangeLog 2264 SHA256 c62a1f2e81715e234a5fc055bae02d64af2c5637ab9440b14b05e41a39082aec SHA512 d921aa15b22390f53765884fa210438a5c60ee1011a2f08acd193ba6299ae93eb4f6fdedc3e61284df6349e34122a9fd00ce06dee97002934a7c77969fe11cd1 WHIRLPOOL d1aa7b4870036750673db016e47c4c0c131b381f8326168fc078e07529e20065d48c02eae6ab62244ff43e49fa431dbd5c9e1fe83153e4e4ca5cea646b80723d
MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added: trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0-r1.ebuild 2013-03-15 13:54:17 UTC (rev 2535)
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils scons-utils toolchain-funcs multilib python-any-r1
+
+DESCRIPTION="CLAM's visual builder"
+HOMEPAGE="http://clam-project.org/";
+SRC_URI="http://clam-project.org/download/src/${P}.tar.gz
+http://ftp.debian.org/debian/pool/main/c/clam-networkeditor/clam-networkeditor_1.4.0-3.1.debian.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libclam-1.4.0-r1
+ <media-libs/libclam-9999
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtxmlpatterns
+ dev-qt/qtopengl
+ dev-qt/qtsvg
+ virtual/glu"
+
+RDEPEND="${DEPEND}
+ media-gfx/imagemagick"
+
+RESTRICT="mirror"
+
+pkg_setup() {
+ tc-export CC CXX
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # patches from debian for recent compilers
+ EPATCH_SOURCE="${WORKDIR}"/debian/patches epatch \
+ $(<"${WORKDIR}"/debian/patches/series)
+
+ # patches created for gentoo
+ epatch "${FILESDIR}"/${P}/*.patch
+}
+
+src_compile() {
+ QTDIR="${EPREFIX}"/usr escons \
+ clam_prefix="${EPREFIX}/usr" \
+ prefix="${ED}/usr" \
+ libdir=$(get_libdir) \
+ qt_plugins_install_path="/$(get_libdir)/qt4/plugins/designer" \
+ verbose=1
+
+ # icons for desktop files, media-gfx/imagemagick is required for convert
+ convert -resize 48x48 -colors 24 src/images/NetworkEditor-icon.png \
+ clam-networkeditor.xpm || die
+ convert -resize 48x48 -colors 24 src/images/Prototyper-icon.png \
+ clam-prototyper.xpm || die
+}
+
+src_install() {
+ QTDIR="${EPREFIX}"/usr escons libdir=$(get_libdir) install
+
+ dodoc CHANGES README
+ insinto /usr/share/pixmaps
+ doins *.xpm
+}
Deleted: trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild 2013-03-15 13:54:13 UTC (rev 2534)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild 2013-03-15 13:54:17 UTC (rev 2535)
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils python qt4-r2
-
-DESCRIPTION="CLAM's visual builder"
-HOMEPAGE="http://clam-project.org/";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-PYTHON_DEPEND="2:7"
-
-DEPEND=">=media-libs/libclam-1.4.0
- <media-libs/libclam-9999
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qtxmlpatterns
- dev-qt/qtopengl
- dev-qt/qtsvg"
-
-RDEPEND="${DEPEND}
- media-gfx/imagemagick"
-
-QTDIR=""
-
-pkg_setup() {
-# if ! has_version dev-qt/qtopengl && ! built_with_use =dev-qt/qt-4* opengl; then
-# eerror "You need to build qt4 with opengl support to have it in ${PN}"
-# die "Enabling opengl for $PN requires qt4 to be built with opengl support"
-# fi
-
- set_python_active_version 2
-}
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}/usr"
- addpredict /usr/share/clam/sconstools
-
- scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" \
- qt_plugins_install_path="/lib/qt4/plugins/designer" || die "Build failed"
- scons --help
- convert -resize 48x48 -colors 24 src/images/NetworkEditor-icon.png clam-networkeditor.xpm || die "convert NE icon failed"
- convert -resize 48x48 -colors 24 src/images/Prototyper-icon.png clam-prototyper.xpm || die "convert P icon failed"
-}
-
-src_install() {
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- scons install || die "scons install failed"
-
- dodoc CHANGES README || die "dodoc failed"
- insinto /usr/share/pixmaps
- doins *.xpm || die "install icons failed"
-}
Added: trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0001-fix-creation-of-prefix-dir.patch 2013-03-15 13:54:17 UTC (rev 2535)
@@ -0,0 +1,25 @@
+From 07b109d0655589e84359e43db9b0c160de898d9b Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Wed, 13 Mar 2013 20:06:41 +0000
+Subject: [PATCH 1/3] fix creation of prefix dir
+
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 6c6535b..bc394f4 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,7 +4,7 @@ import glob
+ import sys
+
+ options = Variables('options.cache', ARGUMENTS)
+-options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '/usr/local'))
++options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '/usr/local', PathVariable.PathIsDirCreate))
+ options.Add(PathVariable('clam_prefix', 'The prefix where CLAM was installed', '/usr/local'))
+ options.Add(BoolVariable('release', 'Enabling compiler optimizations', 'no') )
+ options.Add(('qt_plugins_install_path', 'Path component (without the install prefix) where to install designer plugins (tipically /lib/qt4/plugins/designer)','/bin/designer'))
+--
+1.7.12.4
+
Added: trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0002-add-libdir-option-for-multilib-strict.patch 2013-03-15 13:54:17 UTC (rev 2535)
@@ -0,0 +1,24 @@
+From ecde9ffa969056981f6b1ee7fe35efd640bf4c75 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 14 Mar 2013 14:21:38 +0000
+Subject: [PATCH 2/3] add libdir option for multilib-strict
+
+---
+ SConstruct | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/SConstruct b/SConstruct
+index bc394f4..0e957e3 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -6,6 +6,7 @@ import sys
+ options = Variables('options.cache', ARGUMENTS)
+ options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '/usr/local', PathVariable.PathIsDirCreate))
+ options.Add(PathVariable('clam_prefix', 'The prefix where CLAM was installed', '/usr/local'))
++options.Add(PathVariable('libdir', 'library install directory', 'lib', PathVariable.PathAccept))
+ options.Add(BoolVariable('release', 'Enabling compiler optimizations', 'no') )
+ options.Add(('qt_plugins_install_path', 'Path component (without the install prefix) where to install designer plugins (tipically /lib/qt4/plugins/designer)','/bin/designer'))
+ options.Add(BoolVariable('verbose', 'Display the full command line instead a short command description', 'no') )
+--
+1.7.12.4
+
Added: trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/files/NetworkEditor-1.4.0/0003-honour-toolchain-environment.patch 2013-03-15 13:54:17 UTC (rev 2535)
@@ -0,0 +1,46 @@
+From dc885d83c78329231e7eb90e368d36d65ce3c296 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 14 Mar 2013 14:29:18 +0000
+Subject: [PATCH 3/3] honour toolchain environment
+
+---
+ SConstruct | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 0e957e3..343ab64 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -2,6 +2,7 @@
+ import os
+ import glob
+ import sys
++import SCons.Util
+
+ options = Variables('options.cache', ARGUMENTS)
+ options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '/usr/local', PathVariable.PathIsDirCreate))
+@@ -34,6 +35,21 @@ Help(options.GenerateHelpText(env))
+
+ env.SConsignFile() # Single signature file
+
++# from http://dev.gentoo.org/~vapier/scons-blows.txt
++if os.environ.has_key('CC'):
++ env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
++
+ crosscompiling = env.has_key("crossmingw") and env["crossmingw"]
+ isWindowsPlatform = sys.platform=='win32' or crosscompiling
+ isLinuxPlatform = sys.platform=='linux2' and not crosscompiling
+--
+1.7.12.4
+