From: Mike Frysinger Date: Mon, 5 Dec 2011 20:59:41 +0000 (+0000) Subject: Clean up code a bit and drop MY_P handling which hopefully should no longer be needed. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=098af6e8dfc75f42032904b61641fc9eb67868b1;p=gentoo.git Clean up code a bit and drop MY_P handling which hopefully should no longer be needed. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog index 1b770144c517..170b3ca437ee 100644 --- a/sys-apps/iproute2/ChangeLog +++ b/sys-apps/iproute2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/iproute2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.176 2011/12/03 10:28:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.177 2011/12/05 20:59:41 vapier Exp $ + + 05 Dec 2011; Mike Frysinger iproute2-2.6.38.ebuild, + iproute2-3.1.0.ebuild, iproute2-9999.ebuild: + Clean up code a bit and drop MY_P handling which hopefully should no longer + be needed. 03 Dec 2011; Mike Frysinger iproute2-3.1.0.ebuild, iproute2-9999.ebuild: diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 97e01d1a626b..9fab240c9ef5 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -17,15 +17,15 @@ DIST iproute2-3.1.0.tar.bz2 404147 RMD160 8ec8fdb6aabad462a70a33b6e915281fe65580 EBUILD iproute2-2.6.29.1-r1.ebuild 2737 RMD160 390ab7a08c245e50b6ce69766a812225b52c4bb5 SHA1 417f0dcb0720eb0d878ffe583a391512cefb887f SHA256 3652c262e52359e898b74f3eb428ceb9690c3d6b08c76654c7b35a5933695e40 EBUILD iproute2-2.6.35-r2.ebuild 2611 RMD160 d35ca09dedb9eaff75703cbd1f15c0eaabb3b9e1 SHA1 9938aa61a7ba97cce8007502cf183d95cf60b62d SHA256 5f14ab7b77672d49df8e9648975613cde048220c915670cdc4adb0610b54fcd8 EBUILD iproute2-2.6.35-r3.ebuild 2881 RMD160 32368f70d63f5675681df3fcb405d141b20d7272 SHA1 479bded179abf64ba1dae27c8cef1b38ea8dc7a9 SHA256 de74bd52f5e4c975030e74072f8651b12d91af7076e111b44cc399097fdfb1b9 -EBUILD iproute2-2.6.38.ebuild 2463 RMD160 a02158a4b773dcd43dfc888405b0531bfc613ebe SHA1 d28c9051a48b4614100addd4bfe2b5eb5bf6f82b SHA256 d7ec4a6b3c6ce80fa6520c95450d5d0592099103692c97bc0f3d16c5a918a660 -EBUILD iproute2-3.1.0.ebuild 2532 RMD160 ac42e7a2672ce0e7e44506e06110f8161f487f90 SHA1 bd39b3dcf54e74a0e9cf9c37b5744f320fa0783d SHA256 f74cccfa7563e317f5d80a4af69db59c3d7ae6b6ef8681a7b047dc4036435f92 -EBUILD iproute2-9999.ebuild 2532 RMD160 d4c0976a8bc1aed275722b2a11870a9812ec9786 SHA1 8b503a3b7fb7387957699bbb8245ae2d494f0825 SHA256 d0b69cfed5e55fa3f6ed63d0676e4fd1bb81d875c56978d8bc3af682bd84a8b8 -MISC ChangeLog 31162 RMD160 be1c895939ce575fdde66944bd9695596820f43d SHA1 0608211c1be6655d85c85e2ecd7c0408cc7cd24c SHA256 d988e666d7bfa1989e486baedbb4c1d7cea99128453984fbb74d23741153965e +EBUILD iproute2-2.6.38.ebuild 2264 RMD160 ffb5f0d996e52dbd2eba129b5ee511dcb849ae83 SHA1 40587dc4257b05ae89e1923c9652918dcf961678 SHA256 2828aaadaf13c9b70a4b288c94d7bdfc70c01d09c7deb6ad6121611efd3e7db4 +EBUILD iproute2-3.1.0.ebuild 2404 RMD160 c91eb57df8198aa4de78d35948057ed07db82fce SHA1 523d9da169cc665105d7b73deb31d6814fb1606d SHA256 1ea73101017f3b3c7aa04e19ab7c19e73321c05a64ac9afbe8dfb037e09156a8 +EBUILD iproute2-9999.ebuild 2404 RMD160 a1794d19f8eb4b1635253288354404aad837b3e4 SHA1 350297730f6bdddf154546cbbb5635a7f7f3b228 SHA256 7369fd2ef6c468db1fa27cf884a0eeac92750faa37c7834a0bf594e9a191c075 +MISC ChangeLog 31375 RMD160 675234cbfa8d3da9ed07e0cb8e09c710e2e9c050 SHA1 ea6eafa1af3732d7c4152d1acc52013334d9eb26 SHA256 c20d80dc737a388d4a75f9b4fb403dab4e4bdb862c4b133760c0db7939f47be0 MISC metadata.xml 246 RMD160 f577c668ed7c33423595f7d3db200a5868749b60 SHA1 7727cd7938065c32bef28eee0e3ef096125217e1 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7Z+eoACgkQaC/OocHi7JZ/MQEAi8to3HApQ4uQ8KKwTZAmUGPM -C0V7Gi9CfMzJoNthTbYA+wWzMrWI3rKDO+sSV9xUoHcJhxAX+132u6fFdVJJqONS -=ZHMh +iF4EAREIAAYFAk7dMMUACgkQaC/OocHi7JarrAD+PYpYhsCP0UczVcQn4K8qMElM +SGBXszRnjD1dmAvmoIIA/Rju9a0bh0hH19dO/u3pgDGXlhNaUzbHF0TN56vD7Zdj +=IgIl -----END PGP SIGNATURE----- diff --git a/sys-apps/iproute2/iproute2-2.6.38.ebuild b/sys-apps/iproute2/iproute2-2.6.38.ebuild index 9a04fe7c566a..e0bb05287fee 100644 --- a/sys-apps/iproute2/iproute2-2.6.38.ebuild +++ b/sys-apps/iproute2/iproute2-2.6.38.ebuild @@ -1,29 +1,26 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.3 2011/10/18 21:41:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.4 2011/12/05 20:59:41 vapier Exp $ -EAPI=4 +EAPI="4" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" -[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" +inherit eutils toolchain-funcs flag-o-matic -if [[ ${PV} == *.*.*.* ]] ; then - MY_PV=${PV%.*}-${PV##*.} +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" else - MY_PV=${PV} + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -MY_P="${PN}-${MY_PV}" - -inherit eutils toolchain-funcs flag-o-matic base ${SCM_ECLASS} -unset SCM_ECLASS DESCRIPTION="kernel routing and traffic control utilities" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -[[ ${PV} == "9999" ]] || SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -[[ ${PV} == "9999" ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="atm berkdb minimal" RDEPEND="!net-misc/arpd @@ -35,15 +32,9 @@ DEPEND="${RDEPEND} >=sys-kernel/linux-headers-2.6.27 elibc_glibc? ( >=sys-libs/glibc-2.7 )" -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907 - "${FILESDIR}"/${PN}-2.6.38-parallel-build.patch -) - src_prepare() { - base_src_prepare + epatch "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907 + epatch "${FILESDIR}"/${PN}-2.6.38-parallel-build.patch sed -i \ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ diff --git a/sys-apps/iproute2/iproute2-3.1.0.ebuild b/sys-apps/iproute2/iproute2-3.1.0.ebuild index f454cc9cd298..fecae23cc683 100644 --- a/sys-apps/iproute2/iproute2-3.1.0.ebuild +++ b/sys-apps/iproute2/iproute2-3.1.0.ebuild @@ -1,28 +1,26 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.2 2011/12/03 10:28:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.1.0.ebuild,v 1.3 2011/12/05 20:59:41 vapier Exp $ -EAPI=4 +EAPI="4" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" +inherit eutils toolchain-funcs flag-o-matic -if [[ ${PV} == *.*.*.* ]] ; then - MY_PV=${PV%.*}-${PV##*.} +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" else - MY_PV=${PV} + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -MY_P="${PN}-${MY_PV}" - -inherit eutils toolchain-funcs flag-o-matic -[[ ${PV} == "9999" ]] && inherit git-2 DESCRIPTION="kernel routing and traffic control utilities" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -[[ ${PV} == "9999" ]] || SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -[[ ${PV} == "9999" ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="atm berkdb minimal" RDEPEND="!net-misc/arpd @@ -34,8 +32,6 @@ DEPEND="${RDEPEND} >=sys-kernel/linux-headers-2.6.27 elibc_glibc? ( >=sys-libs/glibc-2.7 )" -S=${WORKDIR}/${MY_P} - src_prepare() { epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 9cf6e68943eb..b4d22821b958 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,28 +1,26 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.18 2011/12/03 10:28:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.19 2011/12/05 20:59:41 vapier Exp $ -EAPI=4 +EAPI="4" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" +inherit eutils toolchain-funcs flag-o-matic -if [[ ${PV} == *.*.*.* ]] ; then - MY_PV=${PV%.*}-${PV##*.} +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" else - MY_PV=${PV} + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -MY_P="${PN}-${MY_PV}" - -inherit eutils toolchain-funcs flag-o-matic -[[ ${PV} == "9999" ]] && inherit git-2 DESCRIPTION="kernel routing and traffic control utilities" HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -[[ ${PV} == "9999" ]] || SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -[[ ${PV} == "9999" ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="atm berkdb minimal" RDEPEND="!net-misc/arpd @@ -34,8 +32,6 @@ DEPEND="${RDEPEND} >=sys-kernel/linux-headers-2.6.27 elibc_glibc? ( >=sys-libs/glibc-2.7 )" -S=${WORKDIR}/${MY_P} - src_prepare() { epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907