| [proaudio] [2623] media-sound/guitarix2: removed force enabled use flag for live ebuild, added einfos, added patch for dektop entry |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2623
Author: lilrc
Date: 2013-03-31 17:01:24 +0200 (Sun, 31 Mar 2013)
Log Message:
-----------
media-sound/guitarix2: removed force enabled use flag for live ebuild, added einfos, added patch for dektop entry
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
trunk/overlays/proaudio/media-sound/guitarix2/Manifest
trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild
trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-desktop-entry.patch
Modified: trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog 2013-03-31 14:33:33 UTC (rev 2622)
+++ trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog 2013-03-31 15:01:24 UTC (rev 2623)
@@ -4,6 +4,13 @@
31 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
guitarix2-0.25.2.ebuild, guitarix2-9999.ebuild,
+ +files/guitarix2-9999-desktop-entry.patch:
+ Added einfos and replaced echo with einfo.
+ Removed force enabled nls USE flag from live ebuild.
+ Added patch for live ebuild to install desktop entry correctly.
+
+ 31 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ guitarix2-0.25.2.ebuild, guitarix2-9999.ebuild,
-files/guitarix2-9999-wscript.patch:
Force enable nls USE flag until intltool is not called from a source where
nls has been disabled. It will be reported upstream. Thanks to shiznix for
Modified: trunk/overlays/proaudio/media-sound/guitarix2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/Manifest 2013-03-31 14:33:33 UTC (rev 2622)
+++ trunk/overlays/proaudio/media-sound/guitarix2/Manifest 2013-03-31 15:01:24 UTC (rev 2623)
@@ -1,8 +1,9 @@
AUX guitarix2-0.25.2-no-ldconfig.patch 752 SHA256 17c407e85b1da822457a3fa30ac5f3dd084b6e4a27b485368640588e854d8fc1 SHA512 74009d6fe4571f816fa2bf8de4840eb6533d4c2d319507467335164a84cb9d319844e4388920951952a4e960270a03e5496a620a06cdeeff640ff5c0434d3ea7 WHIRLPOOL 5e173f6cef9992ee643e6e342e334b8fb9b38e8941ea454bdbb5aa29c777376897385a939eada38d7a18971dae8296e490edae05528fb66a771cbd9d8a97c86e
AUX guitarix2-0.25.2-no-update-desktop-database.patch 575 SHA256 7215ce5cf0cd9ad4beb116af71a14adc1297a824ea93b17ab2be32c314fb8584 SHA512 6b1fcf6c1442d389a4c669c61a59c2a32d60d846fefa89424d304f59004d6dee317dd8c6b0308fb72811ce5c20f45335b812f9b2bccd796c13075abddf033b45 WHIRLPOOL 6c548ac7956a269b4cc6c42264eb98af085482a2365307a75d2be8b0d6ef883831e70747834003e75f7f31b56bcc3b4c1a94b18fbc418be47ee36688f8335cd4
AUX guitarix2-0.25.2-respect-libdir.patch 816 SHA256 84ffa6e18cda68678373d92abeebf032fc7b227ce7a719121a92031135b01ecc SHA512 092d9faab073fe2e1cb6be4ebdec937599984c6c9323b5497b34937a917287bd173e11a24a38dd9a6b252ffd3d40dfe3f4d4a9f5d36aa3be8c486a2f06faba37 WHIRLPOOL fe5e8f0e9698072941dc3f969ed531bebaafaa88489d823a293000d25b53c26f3426baa02357586f55f513e44054ca28f61017dca237bab93b370f8fa8d72630
+AUX guitarix2-9999-desktop-entry.patch 509 SHA256 3e9dfe5c0b3a85ab732539dfc96cd17ada98cccb62fd4ba995580fa5916b397a SHA512 24dae05082c45bad079fab03a209a6fdb4a971820825e15d44e7388d546bdcba86c851d719443a88da2987a91aef66762348d4fa84cf7b3c15b6e7b24d921952 WHIRLPOOL 24849b6be26f5998a42cf5f8354cd67e64a7a8dbeceeb239b76046d52b5a8d6535c087b10d117641b25720aea122d371f416997340873099209d57db0c9fc798
DIST guitarix2-0.25.2.tar.bz2 7091468 SHA256 ea655b81cce4968207cb1d590879047e01e0461a08d1f48d84e2f828981f8ff1 SHA512 448bf745aa75cf621f6e4bce4f6920e44d941c17a099a8ce05987a3167cc92cbdf75850f43a8feaeadef35e69b2c7f366dbc77a2363dbf6c67b7e4e4a4d06520 WHIRLPOOL 2469f23680b03023b68431d9f511966af488b6e200dff98afa6a6f351781d41c61cdc3b92ff7915893ed969a8f8a6cb8c6524017d435f25b7d9c8f45a5fd6db6
-EBUILD guitarix2-0.25.2.ebuild 2806 SHA256 390e17d62a0c436ec5df9972a9257329ea259ad47e80527a4343b7cb15edb0eb SHA512 5df39318fd9b0d2c0ab2d99912627693921c58b1a9e56ae7cb34495b5c308a1a58b3603419a6904031a64c8e3005d7531d476bfef382b7002da2a718a9229ef5 WHIRLPOOL 192764ed0a294da9933e0bc411322bae1422c23ad129f7a83c1a393590a52166dd4330702d4c590b0d9cd0801b9bf2df3ace617ce8aa5aca57b78579ee65700f
-EBUILD guitarix2-9999.ebuild 2580 SHA256 f19f1334b735999c60311fdd93f594066e70de96cc39d5c7ac68d823510a34b0 SHA512 e8d9a1b0657f7d6bfb0f875b4a697e9ef983aebeef086cd083c278edf1904150cc7e8c5439f6972571deb84bf21d5aa1229ba84545389e1af287ab4b8d4ab2f3 WHIRLPOOL 53e4c4f8479ad8dcb91eed4e8ad73280290ef784f03508e7971317401e001ce67e62218885aaf6be3aa96e2ea017aeb3b3c8c0debdb543d1ad36ba3082c7a225
-MISC ChangeLog 2229 SHA256 c15f2c5aca490da977bf22cd993813d5737ee111e16634f4db01362fa7817b30 SHA512 b9e83493867f146d72d34955ecc27945090a1caf17f83b182c23686e5e238fe61b70adf40c304086dabad5b38dbf6a47bbfda4d40a4f9b37b99cedd30183e072 WHIRLPOOL 0bdca6bcd45ef03cb41d6396861e44e7c12018bc38f259e82f87d72043fc3ec306cb7219f7c735db05af826791fff7c8c3da73920c138a2a91d600c395fba801
+EBUILD guitarix2-0.25.2.ebuild 2880 SHA256 33404df79e86728a29b5da711b564c5855f18ea65c4a779ce5efa63ffcfb3126 SHA512 81d4aa0490b15666f341fb7b10b2361d09a940f744a643333f050098211c07674ce88cae40628c6336359187331b550f2a5d6cc683a768d5d63ed14b45758f85 WHIRLPOOL ea74fb61b01d1716338c5ba25d85be126abbfa91d9ed2b156fed3556f41bd3b6fc2d55f3bc73423cbb7a20588aa8b12da1a4ab424ae1c9ee7aa34df0dd3ab093
+EBUILD guitarix2-9999.ebuild 2573 SHA256 047bf17698f4ecf1c7c911ae181a4439015a2ff8ea4779f326c26f80203dbe88 SHA512 15741632be8ef447db28859023139f2d3bfe6574e3d41fdad343d4269efecbeedcbf0b58bfa90da421cb414714186da2e9f6a8e2d45b74298b547f5258be743c WHIRLPOOL e8e82dbde0e39be616b4ed1d32643f70d9bcee7fa7e587521c9bd27f803230ddab7445d0a496680eff686b88360fbc4fdb2dbe0dc9dcdf26750bd35847013a1a
+MISC ChangeLog 2556 SHA256 0bdbe937717a7e8a0690b5a74e5a87d531e05e7afe5ae04ec1be51e2b03adbf9 SHA512 90518359dd361b88e7e546683c58ec3fd9f3a56351c6dbc84165d74f7b82ce5d03388223559ee411575bc47eace4454236e4e7327e1afc5afce2d98ca000fdf8 WHIRLPOOL 39665a09183c9e16208d26aec1545a535a9459c77563aedcf6b7dd8f5c6ef7e9446aafbda3b729f8b7d1660e70738f15a9c9e28ed57ef9565edf4d62953e5908
MISC metadata.xml 607 SHA256 b4ee6cdc57a98ad8486359cf2c27ceb543b67a151e4a7aff4b3e82b64511e05d SHA512 38011a5d2f23a185e738a6bf466ba1c870a4607664ae8c45830d824b5410c1416ed96ce913a066226d7b7ee3f48a70f6de5027450ecf28d1e6150639cf361bb6 WHIRLPOOL c13871b18ead19133a16cce12d987563379953c610a9241a0e016011722993fdee77dc2d785482142c5956b33c94e978faa778f80a538aef3d239a3bcc8db905
Added: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-desktop-entry.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-desktop-entry.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-desktop-entry.patch 2013-03-31 15:01:24 UTC (rev 2623)
@@ -0,0 +1,13 @@
+diff --git a/trunk/wscript b/trunk/wscript
+index 212673d..6c46ff8 100644
+--- a/trunk/wscript
++++ b/trunk/wscript
+@@ -521,7 +521,7 @@ def configure(conf):
+ else:
+ nls = 'no '
+ conf.define ('DISABLE_NLS', 1)
+- sub_file('guitarix.desktop.in', 'build/default/guitarix.desktop', (('^_', '%s' % ""), ))
++ sub_file('guitarix.desktop.in', 'guitarix.desktop', (('^_', '%s' % ""), ))
+ conf.define ('GETTEXT_PACKAGE', APPNAME)
+
+ conf.define ('ENABLE_NLS', [0,1][nls == 'yes'])
Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild 2013-03-31 14:33:33 UTC (rev 2622)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild 2013-03-31 15:01:24 UTC (rev 2623)
@@ -80,17 +80,20 @@
export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
tc-export AR CC CPP CXX RANLIB
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
+ einfo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
"--prefix=${EPREFIX}/usr" ${mywafconfargs[@]} \
configure || die "configure failed"
}
src_compile() {
- ./waf "--jobs=$(makeopts_jobs)" || die "build failed"
+ local jobs="--jobs=$(makeopts_jobs)"
+ einfo "./waf ${jobs}"
+ ./waf ${jobs} || die "build failed"
}
src_install() {
+ einfo "./waf --destdir=${D}"
./waf "--destdir=${D}" install || die "install failed"
base_src_install_docs
Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 2013-03-31 14:33:33 UTC (rev 2622)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 2013-03-31 15:01:24 UTC (rev 2623)
@@ -20,10 +20,6 @@
IUSE="+capture +convolver faust glade ladspa lv2 +meterbridge nls python"
-# The desktop entry cannot be created if nls is disabled
-# This can be removed when upstream has fixed the issue
-REQUIRED_USE="nls"
-
RDEPEND="
>=dev-cpp/glibmm-2.24.0
>=dev-cpp/gtkmm-2.20.0
@@ -52,6 +48,8 @@
DOCS=( changelog README )
+PATCHES=( "${FILESDIR}/${P}-desktop-entry.patch" )
+
src_configure() {
# About all gentoo packages install necessary libraries and headers
# and so should this package, hence force enable.
@@ -75,17 +73,20 @@
use python && mywafconfargs+=( --python-wrapper )
tc-export AR CC CPP CXX RANLIB
- echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
+ einfo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
"--prefix=${EPREFIX}/usr" ${mywafconfargs[@]} \
configure || die "configure failed"
}
src_compile() {
- ./waf "--jobs=$(makeopts_jobs)" || die "build failed"
+ local jobs="--jobs=$(makeopts_jobs)"
+ einfo "./waf ${jobs}"
+ ./waf ${jobs} || die "build failed"
}
src_install() {
+ einfo "./waf --destdir=${D}"
./waf "--destdir=${D}" install || die "install failed"
base_src_install_docs