From d7b27d77bf5daac4077ceca971bb49952ffa0b10 Mon Sep 17 00:00:00 2001 From: Joe Sapp Date: Sat, 8 Oct 2011 18:02:51 +0000 Subject: [PATCH] Migrate to bash-completion-r1 Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- gnome-extra/gdesklets-core/ChangeLog | 6 +++++- gnome-extra/gdesklets-core/Manifest | 12 ++++++------ .../gdesklets-core/gdesklets-core-0.36.2-r3.ebuild | 9 +++------ .../gdesklets-core/gdesklets-core-0.36.3-r3.ebuild | 9 +++------ 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog index b39ef0b94462..df4140c0ca1a 100644 --- a/gnome-extra/gdesklets-core/ChangeLog +++ b/gnome-extra/gdesklets-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gdesklets-core # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.149 2011/10/08 17:40:29 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.150 2011/10/08 18:02:51 nixphoeni Exp $ + + 08 Oct 2011; Joe Sapp gdesklets-core-0.36.2-r3.ebuild, + gdesklets-core-0.36.3-r3.ebuild: + Migrate to bash-completion-r1 08 Oct 2011; Joe Sapp gdesklets-core-0.36.2-r3.ebuild, gdesklets-core-0.36.3-r3.ebuild: diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest index a4fdbead1fea..369c3c217d8a 100644 --- a/gnome-extra/gdesklets-core/Manifest +++ b/gnome-extra/gdesklets-core/Manifest @@ -8,14 +8,14 @@ AUX gdesklets-core-0.36.3-CFLAGS.patch 1091 RMD160 04837984101cc1ed089a0ea5a3504 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a DIST gDesklets-0.36.2.tar.bz2 3423236 RMD160 93b6c21848fe05cfda539173192901c5c3213e7a SHA1 56742080aa04c27548b8856b6e6aca8861a0d9b5 SHA256 178c651038f5943a714bfe632427d91d58d2caace95a645ecca7c9bd0552d6c8 DIST gdesklets-0.36.3.tar.bz2 3745626 RMD160 86da28930621071fca32d2bc9c0ebfe1a41d03f9 SHA1 0ad58885bf50f43aaa0cf186ba0678251f5de26a SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5 -EBUILD gdesklets-core-0.36.2-r3.ebuild 3728 RMD160 94d4882f0be0465e0265f0e284732f9b9fbfb8dd SHA1 b400bfa0862b52070339541009271da9573332a9 SHA256 21bf7cd79452b6d1865aaddf50b30d61e517f1771635386cb336e6c1ed9762cd -EBUILD gdesklets-core-0.36.3-r3.ebuild 3508 RMD160 1c7ee9d413c1d4d97ed1a004ed102a136e283b08 SHA1 9432215cae013154c975dd86c43a2a2c36fb0c7e SHA256 904ae21c88971ddc1a8150d9d6316897e3cea9df81208e211978a1573960eec9 -MISC ChangeLog 27632 RMD160 3ef3dacf2738222b924ccbe4976492582b0375a5 SHA1 23a71f08398f20a465136b753e71ed86a41b4c1e SHA256 5b6ac67758341a89926569980ace75760d4ba39dc4c710a60263187937cba66c +EBUILD gdesklets-core-0.36.2-r3.ebuild 3626 RMD160 2320918c4bc788c891f420ee926b66f33357f2b4 SHA1 159877ca7d46d5c89cbec3c8748bc005eb195c17 SHA256 14fe23c26b066016ca38eba0a2171ee693be6a957b7f2734258c11abd01e1e3e +EBUILD gdesklets-core-0.36.3-r3.ebuild 3412 RMD160 89e6e41cb02d86f478699100647d60e6404cace8 SHA1 6925b9c32891af483d0b8d72eab8274df7518b92 SHA256 fa57cb7c553f751c733abda44fd6ee2bf3e6e4482f1dcfb1d5df50c7fc146a1f +MISC ChangeLog 27780 RMD160 33eb68905bccfe9f50ea190e07d1417901e0caa8 SHA1 f591ad2d710c5cc319d8d6a203533e5a39db9e0a SHA256 25d5af695a89723781538f2f50b115ea971bd9ee986bcb7353d38172997d73f3 MISC metadata.xml 393 RMD160 e2b43a43703079b731adbfe7ef2d112265b9fdaf SHA1 36dc36c90800e7d73ec015f5d92da2822c6f3b25 SHA256 b4b0b139bfb5f5f2b03813fc571937bf021bdf7d158d26816ffab10aa654f5cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6Qi2QACgkQguHVVE4VAzqGrAEAstMGJJljPfuzIv3D1Tu1+pnB -KUvQyr4obYs0f3h2W7oA/iix1gDjh/LlvkLJHxHyAEYsFY0BbJBfw+s0szgaC+TM -=qT5q +iF4EAREIAAYFAk6QkJgACgkQguHVVE4VAzp50wD+KDQdmObYyxv+FEmY3/PLufEJ +WtUJnOYTQv3iqU66QsUA/2BUblnu05Bc/1b5QQMeinGXMd9zFURrWU1fS8RSzuAd +=fEFW -----END PGP SIGNATURE----- diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild index fe1b5c68ab9e..18ed5d868bfa 100644 --- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild +++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.10 2011/10/08 17:40:29 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.11 2011/10/08 18:02:51 nixphoeni Exp $ EAPI=3 # desklets don't run with USE=debug @@ -8,7 +8,7 @@ GCONF_DEBUG="no" PYTHON_USE_WITH="xml" PYTHON_DEPEND="2:2.4" -inherit gnome2 python eutils autotools multilib bash-completion +inherit gnome2 python eutils autotools multilib bash-completion-r1 MY_PN="gDesklets" MY_P="${MY_PN}-${PV}" @@ -74,8 +74,7 @@ src_install() { gnome2_src_install # Install bash completion script - BASHCOMPLETION_NAME="gDesklets" \ - dobashcompletion "contrib/bash/gdesklets" + dobashcomp "contrib/bash/gdesklets" # Install autostart script insinto "/etc/xdg/autostart" @@ -121,8 +120,6 @@ pkg_postinst() { elog "after the first time you run gDesklets" elog - BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst - } pkg_postrm() { diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild index 205e6fb2f0e0..2088371982ec 100644 --- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild +++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.8 2011/10/08 17:40:29 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.9 2011/10/08 18:02:51 nixphoeni Exp $ EAPI=3 # desklets don't run with USE=debug @@ -8,7 +8,7 @@ GCONF_DEBUG="no" PYTHON_USE_WITH="xml" PYTHON_DEPEND="2:2.4" -inherit gnome2 python eutils autotools multilib bash-completion +inherit gnome2 python eutils autotools multilib bash-completion-r1 MY_PN="${PN/-core}" MY_P="${MY_PN}-${PV}" @@ -74,8 +74,7 @@ src_install() { gnome2_src_install # Install bash completion script - BASHCOMPLETION_NAME="gDesklets" \ - dobashcompletion "contrib/bash/gdesklets" + dobashcompletion "contrib/bash/gdesklets" # Install the gdesklets-control-getid script insinto "/usr/$(get_libdir)/gdesklets" @@ -113,8 +112,6 @@ pkg_postinst() { elog "after the first time you run gDesklets" elog - BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst - } pkg_postrm() { -- 2.26.2