| [proaudio] [2621] media-sound/guitarix: Temporarily force enable nls flag, thanks to shiznix who reported the issue. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2621
Author: lilrc
Date: 2013-03-31 14:05:41 +0200 (Sun, 31 Mar 2013)
Log Message:
-----------
media-sound/guitarix: Temporarily force enable nls flag, thanks to shiznix who reported the issue. Remove live patch due to new (better) behaviour of wscript
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
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch
Modified: trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog 2013-03-30 20:37:27 UTC (rev 2620)
+++ trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog 2013-03-31 12:05:41 UTC (rev 2621)
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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
+ reporting the issue.
+ Remove patches for wscript on live ebuild. The same behaviour is now achieved
+ by passing flags to configure.
+
30 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
-files/guitarix2-0.18.0-LINGUAS.patch, guitarix2-0.25.2.ebuild,
+files/guitarix2-0.25.2-no-ldconfig.patch,
Modified: trunk/overlays/proaudio/media-sound/guitarix2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/Manifest 2013-03-30 20:37:27 UTC (rev 2620)
+++ trunk/overlays/proaudio/media-sound/guitarix2/Manifest 2013-03-31 12:05:41 UTC (rev 2621)
@@ -1,9 +1,8 @@
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-wscript.patch 1231 SHA256 3db648a4812bfa51b5827fac4344e3c9ce3bbdac7e2ba35d3c0885dfcee08c57 SHA512 f82b7dcdda5fa26e3638a8cf044fe99917226f0da11fcfe85a781a2eb2fa609c57a20353cc8134f37e3a395cc5799f9071d253d32e789d3e55557992a22a30a2 WHIRLPOOL 25caa0360198760e70774f6914ced0ebec7487aa368a3d29a7a03d69923df4a5fdaec7df3da9899037004e5556f44045f9296e7cb30186077077415159ee778d
DIST guitarix2-0.25.2.tar.bz2 7091468 SHA256 ea655b81cce4968207cb1d590879047e01e0461a08d1f48d84e2f828981f8ff1 SHA512 448bf745aa75cf621f6e4bce4f6920e44d941c17a099a8ce05987a3167cc92cbdf75850f43a8feaeadef35e69b2c7f366dbc77a2363dbf6c67b7e4e4a4d06520 WHIRLPOOL 2469f23680b03023b68431d9f511966af488b6e200dff98afa6a6f351781d41c61cdc3b92ff7915893ed969a8f8a6cb8c6524017d435f25b7d9c8f45a5fd6db6
-EBUILD guitarix2-0.25.2.ebuild 2673 SHA256 19dcff347744d9da92b6952e258c048f765bf45ba8e05dd8a403d88d236187ce SHA512 7ad42a790992af1fcf1f0058aacc0071a09cd989755834ed4c642166981353f60b6125ac4657cdec2f3c41c41b4a3743355682e33d009ed8023726d22cef27ed WHIRLPOOL 8ca7ae5491902f34e1450e09ee1d282e059e1f67b3ccc1b6a4705328d12680974133ea3562efe87318ea7ffa2b87dada37c5b9c3b333eb62aad40b1b7504c154
-EBUILD guitarix2-9999.ebuild 2456 SHA256 8386963029c40794b246cbdc7317bfdaa69245b1c136d69e8f30ed08d12834d5 SHA512 5f8c5898176eabfba2b323d6805f593aef1748a9e77c79361d59754c4c16b507bcb62294655c459b176aa372e57eb8343510748dde53b6d848af964b98f08c2a WHIRLPOOL 5f5aeaf859970abed473c32821cbea12fb9e05d10d837f4a17f6451cfd46a6640a49a573067509dcb3cae8006d9c11b4f41888db684422c156e306ba03f0ed84
-MISC ChangeLog 1784 SHA256 9329be0142215b7e0bbb87fc87ec94dd135cb9399f089f5283ea4e15b6bb4ec1 SHA512 7e5eff3c70e860f0d8b112b675dcb6d74a24f34d09f4de7a42bed3718405c47cf3b7f4d285690fbe6eda464fa9c84b4e01c55d5d41919426090fa0d935f2bb69 WHIRLPOOL d451145c4492c874434e67005c72e607df701f3d01023541b31a35b642563c4fdb0eb0ea383951ca3238c72b9ba151ca18b30b867bc2fd8dff8eb14d342c2b2f
+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
MISC metadata.xml 607 SHA256 b4ee6cdc57a98ad8486359cf2c27ceb543b67a151e4a7aff4b3e82b64511e05d SHA512 38011a5d2f23a185e738a6bf466ba1c870a4607664ae8c45830d824b5410c1416ed96ce913a066226d7b7ee3f48a70f6de5027450ecf28d1e6150639cf361bb6 WHIRLPOOL c13871b18ead19133a16cce12d987563379953c610a9241a0e016011722993fdee77dc2d785482142c5956b33c94e978faa778f80a538aef3d239a3bcc8db905
Deleted: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch 2013-03-30 20:37:27 UTC (rev 2620)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch 2013-03-31 12:05:41 UTC (rev 2621)
@@ -1,35 +0,0 @@
-# This is a patch made by lilrc to disable calling
-# update-desktop-database and ldconfig from the build system, which
-# generates sandbox violations.
-# Portage does it automatically.
-
-diff --git a/trunk/wscript b/trunk/wscript
-index 3d92f60..fa80ccb 100644
---- a/trunk/wscript
-+++ b/trunk/wscript
-@@ -701,10 +701,6 @@ def configure(conf):
- # Build / Install
- ################################################################
-
--def post(ctx):
-- if os.geteuid() == 0:
-- Utils.exec_command('/sbin/ldconfig')
--
- def build(bld):
- if bld.env['INTLTOOL']:
- obj = bld.new_task_gen ('intltool_po')
-@@ -763,14 +759,7 @@ def build(bld):
- task.scan = po_scanner
- return task
- gen_desktop.create_task = gen_desktop_add_scanner
-- if Options.commands["install"]: ## newer waf version: bld.cmd == 'install'
-- try:
-- bld.exec_command(["update-desktop-database", Utils.subst_vars("${DATADIR}/applications", bld.env)])
-- except:
-- pass
-
-- if bld.env["GX_LIB_SHARED"]:
-- bld.add_post_fun(post)
- if bld.env["GX_LIB_DEV"]:
- bld.install_files('${PREFIX}/include/gxw','libgxw/gxw/*.h')
- bld.install_files('${PREFIX}/include','libgxw/gxw.h')
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-30 20:37:27 UTC (rev 2620)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild 2013-03-31 12:05:41 UTC (rev 2621)
@@ -20,6 +20,10 @@
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
Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 2013-03-30 20:37:27 UTC (rev 2620)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 2013-03-31 12:05:41 UTC (rev 2621)
@@ -20,6 +20,10 @@
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
@@ -48,16 +52,14 @@
DOCS=( changelog README )
-PATCHES=(
- "${FILESDIR}/${P}-wscript.patch"
-)
-
src_configure() {
# About all gentoo packages install necessary libraries and headers
# and so should this package, hence force enable.
local mywafconfargs=(
--shared-lib
--lib-dev
+ --no-ldconfig
+ --no-desktop-update
$(use_enable nls)
"--libdir=${EPREFIX}/usr/$(get_libdir)"
)