[gentoo-genkernel] patch for bashcompletion-r1

[gentoo-genkernel] patch for bashcompletion-r1

[Richard Farina]

This has been driving me nuts for a while

Get rid of deprecation warning by using bash-completion-r1 instead of
bash-completion. Simple and logical migration.

Thanks,
Zero

--- genkernel-3.4.30.ebuild	2012-05-14 22:30:47.348296737 -0400
+++ genkernel-3.4.32.ebuild	2012-05-16 08:48:23.444013089 -0400
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v
1.2 2012/05/03 22:26:18 sping Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v
1.1 2012/05/14 00:20:53 sping Exp $

 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -38,12 +38,12 @@
 then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
 		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
+	inherit git-2 bash-completion eutils
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
 	KEYWORDS=""
 else
-	inherit bash-completion-r1 eutils
+	inherit bash-completion eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		${MY_HOME}/sources/genkernel/${P}.tar.bz2
 		${COMMON_URI}"
@@ -134,7 +134,7 @@
 		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
 		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."

-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	dobashcompletion "${FILESDIR}"/genkernel.bash
 	insinto /etc
 	doins "${FILESDIR}"/initramfs.mounts
 }

[gentoo-genkernel] Re: patch for bashcompletion-r1

[Richard Farina]

On 05/16/12 08:50, Richard Farina wrote:
> This has been driving me nuts for a while
> 
> Get rid of deprecation warning by using bash-completion-r1 instead of
> bash-completion. Simple and logical migration.
HA! Or the patch not in reverse....

ozzie genkernel # diff -Naur genkernel-3.4.32.ebuild genkernel-3.4.30.ebuild
--- genkernel-3.4.32.ebuild	2012-05-16 08:48:23.444013089 -0400
+++ genkernel-3.4.30.ebuild	2012-05-14 22:30:47.348296737 -0400
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v
1.1 2012/05/14 00:20:53 sping Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v
1.2 2012/05/03 22:26:18 sping Exp $

 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -38,12 +38,12 @@
 then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
 		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
-	inherit git-2 bash-completion eutils
+	inherit git-2 bash-completion-r1 eutils
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
 	KEYWORDS=""
 else
-	inherit bash-completion eutils
+	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		${MY_HOME}/sources/genkernel/${P}.tar.bz2
 		${COMMON_URI}"
@@ -134,7 +134,7 @@
 		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
 		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."

-	dobashcompletion "${FILESDIR}"/genkernel.bash
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
 	insinto /etc
 	doins "${FILESDIR}"/initramfs.mounts
 }


> 
> Thanks,
> Zero
> 

Re: [gentoo-genkernel] Re: patch for bashcompletion-r1

[Peter Hjalmarsson]

When we are at it, is there a reason why genkernel.bash is not
distributed with the genkernel tarball instead for living in FILESDIR?

Regards
Peter

ons 2012-05-16 klockan 08:52 -0400 skrev Richard Farina:
> On 05/16/12 08:50, Richard Farina wrote:
> > This has been driving me nuts for a while
> > 
> > Get rid of deprecation warning by using bash-completion-r1 instead of
> > bash-completion. Simple and logical migration.
> HA! Or the patch not in reverse....
> 
> ozzie genkernel # diff -Naur genkernel-3.4.32.ebuild genkernel-3.4.30.ebuild
> --- genkernel-3.4.32.ebuild	2012-05-16 08:48:23.444013089 -0400
> +++ genkernel-3.4.30.ebuild	2012-05-14 22:30:47.348296737 -0400
> @@ -1,6 +1,6 @@
>  # Copyright 1999-2012 Gentoo Foundation
>  # Distributed under the terms of the GNU General Public License v2
> -# $Header:
> /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v
> 1.1 2012/05/14 00:20:53 sping Exp $
> +# $Header:
> /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v
> 1.2 2012/05/03 22:26:18 sping Exp $
> 
>  # genkernel-9999        -> latest Git branch "master"
>  # genkernel-VERSION     -> normal genkernel release
> @@ -38,12 +38,12 @@
>  then
>  	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
>  		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
> -	inherit git-2 bash-completion eutils
> +	inherit git-2 bash-completion-r1 eutils
>  	S="${WORKDIR}/${PN}"
>  	SRC_URI="${COMMON_URI}"
>  	KEYWORDS=""
>  else
> -	inherit bash-completion eutils
> +	inherit bash-completion-r1 eutils
>  	SRC_URI="mirror://gentoo/${P}.tar.bz2
>  		${MY_HOME}/sources/genkernel/${P}.tar.bz2
>  		${COMMON_URI}"
> @@ -134,7 +134,7 @@
>  		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
>  		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
> 
> -	dobashcompletion "${FILESDIR}"/genkernel.bash
> +	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
>  	insinto /etc
>  	doins "${FILESDIR}"/initramfs.mounts
>  }
> 
> 
> > 
> > Thanks,
> > Zero
> > 
> 
> 

Re: [gentoo-genkernel] Re: patch for bashcompletion-r1

[Richard Farina]

On 05/16/12 11:28, Peter Hjalmarsson wrote:
> When we are at it, is there a reason why genkernel.bash is not
> distributed with the genkernel tarball instead for living in FILESDIR?

Now you are getting all existential, I just wanted to shut up the
warning ;-)

I happily yield to either course.

-Zero

> 
> Regards
> Peter
> 
> ons 2012-05-16 klockan 08:52 -0400 skrev Richard Farina:
>> On 05/16/12 08:50, Richard Farina wrote:
>>> This has been driving me nuts for a while
>>>
>>> Get rid of deprecation warning by using bash-completion-r1 instead of
>>> bash-completion. Simple and logical migration.
>> HA! Or the patch not in reverse....
>>
>> ozzie genkernel # diff -Naur genkernel-3.4.32.ebuild genkernel-3.4.30.ebuild
>> --- genkernel-3.4.32.ebuild	2012-05-16 08:48:23.444013089 -0400
>> +++ genkernel-3.4.30.ebuild	2012-05-14 22:30:47.348296737 -0400
>> @@ -1,6 +1,6 @@
>>  # Copyright 1999-2012 Gentoo Foundation
>>  # Distributed under the terms of the GNU General Public License v2
>> -# $Header:
>> /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v
>> 1.1 2012/05/14 00:20:53 sping Exp $
>> +# $Header:
>> /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v
>> 1.2 2012/05/03 22:26:18 sping Exp $
>>
>>  # genkernel-9999        -> latest Git branch "master"
>>  # genkernel-VERSION     -> normal genkernel release
>> @@ -38,12 +38,12 @@
>>  then
>>  	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
>>  		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
>> -	inherit git-2 bash-completion eutils
>> +	inherit git-2 bash-completion-r1 eutils
>>  	S="${WORKDIR}/${PN}"
>>  	SRC_URI="${COMMON_URI}"
>>  	KEYWORDS=""
>>  else
>> -	inherit bash-completion eutils
>> +	inherit bash-completion-r1 eutils
>>  	SRC_URI="mirror://gentoo/${P}.tar.bz2
>>  		${MY_HOME}/sources/genkernel/${P}.tar.bz2
>>  		${COMMON_URI}"
>> @@ -134,7 +134,7 @@
>>  		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
>>  		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
>>
>> -	dobashcompletion "${FILESDIR}"/genkernel.bash
>> +	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
>>  	insinto /etc
>>  	doins "${FILESDIR}"/initramfs.mounts
>>  }
>>
>>
>>>
>>> Thanks,
>>> Zero
>>>
>>
>>
> 
> 
> 
> 

Re: [gentoo-genkernel] Re: patch for bashcompletion-r1

[Sebastian Pipping]

Hey there,


On 05/16/2012 05:28 PM, Peter Hjalmarsson wrote:
> When we are at it, is there a reason why genkernel.bash is not
> distributed with the genkernel tarball instead for living in FILESDIR?

No objections.  If you care, please make a patch.


>>> Get rid of deprecation warning by using bash-completion-r1 instead of
>>> bash-completion. Simple and logical migration.
>> HA! Or the patch not in reverse....

Were bugging me to, thanks for bringing it up and for the patch.

Two issues about the patch, that I would like to mention:

 - The patch didn't apply from copy paste.  Please always attach
   patches, no inlining please.

 - The call to bash-completion_pkg_postinst was still left in


Should be fixed everywhere now:

+  16 May 2012; Sebastian Pipping <sping@gentoo.org>
genkernel-3.4.16.ebuild,
+  genkernel-3.4.16.1.ebuild, genkernel-3.4.17.ebuild,
genkernel-3.4.18.ebuild,
+  genkernel-3.4.19.ebuild, genkernel-3.4.20.ebuild,
genkernel-3.4.21.2.ebuild,
+  genkernel-3.4.22.1.ebuild, genkernel-3.4.23.1.ebuild,
+  genkernel-3.4.24.ebuild, genkernel-3.4.24_p1.ebuild,
+  genkernel-3.4.25.1.ebuild, genkernel-3.4.26.ebuild,
genkernel-3.4.27.ebuild,
+  genkernel-3.4.28.ebuild, genkernel-3.4.29.ebuild,
genkernel-3.4.32.ebuild,
+  genkernel-9999.ebuild:
+  Migrate from eclass bash-completion to bash-completion-r1, thanks to Rick
+  Farina of Pentoo
+

Best,



Sebastian