From c78ebb99049b5d192c9e4ac7a680e89ef65c081b Mon Sep 17 00:00:00 2001 From: Björn Tropf Date: Fri, 15 Jan 2010 08:18:26 +0000 Subject: Clean kernel-check ebuilds svn path=/overlay/; revision=111 --- app-admin/kernel-check/Manifest | 7 ++--- .../files/kernel-check-0.3.16-kerneldir.patch | 25 --------------- .../kernel-check/kernel-check-0.3.16-r1.ebuild | 36 ---------------------- app-admin/kernel-check/kernel-check-0.3.17.ebuild | 15 +++++++-- app-admin/kernel-check/kernel-check-9999.ebuild | 20 ++++++++++-- 5 files changed, 32 insertions(+), 71 deletions(-) delete mode 100644 app-admin/kernel-check/files/kernel-check-0.3.16-kerneldir.patch delete mode 100644 app-admin/kernel-check/kernel-check-0.3.16-r1.ebuild (limited to 'app-admin') diff --git a/app-admin/kernel-check/Manifest b/app-admin/kernel-check/Manifest index 5523f32..f631f10 100644 --- a/app-admin/kernel-check/Manifest +++ b/app-admin/kernel-check/Manifest @@ -1,8 +1,5 @@ -AUX kernel-check-0.3.16-kerneldir.patch 1000 RMD160 ce23570239915400d8d1aa886c0f09facb5844b4 SHA1 827f798746304e3e0c64356efba452a881bc2827 SHA256 a80a45f0436fe98f285597eb652c30ca2cdb098373ac0606e400f1807ff330ee AUX kernel-check-extras.patch 272 RMD160 419e9513121587d362f5f57ed1c54fa9063bbb16 SHA1 6a6d07fd14ccb934d4a92f299a51216dcf80f37f SHA256 b823891e51851dc60e952bffdc02eaa1c9ed7bbf535570e39f765f05d6569abd -DIST kernel-check-0.3.16.tar.bz2 8119 RMD160 425cfd315d1de9f338a09001e3c70e88b17889ca SHA1 4e89f2e4bcdb84243692110dfa8f3a60644a7c06 SHA256 beabb99a4281f6e139c13b1d7a1e2f4f13b79c7a1faaa80f74f9994a32156364 DIST kernel-check-0.3.17.tar.bz2 16095 RMD160 5b735c8f2f6e1a37abfac62e9c60c75e41645db4 SHA1 5c2ba737a4ad5c0fc1546770e5788cf245941504 SHA256 06d56d927ec3cdff0281c1601280bc5b792d5af463e2c4bf2046ec0622662b37 -EBUILD kernel-check-0.3.16-r1.ebuild 637 RMD160 eab62176efd49281ca146cebc7144822416777e3 SHA1 7084244cccfd9c0103589ff91675e771ea867450 SHA256 12b50b5ee6a2e420797c3c42c1fabd490354944d189165d9c042ddc0ddfe7ce2 -EBUILD kernel-check-0.3.17.ebuild 657 RMD160 4cd7580dd491c159263a1bff47240f4f488229a4 SHA1 ea20c0a96336e0fdef246f423e960181b805a8d4 SHA256 c71a3010d2c043e329e0b79635b5a77259e4a43f4707b97ae09eb1622a0f3abf -EBUILD kernel-check-9999.ebuild 553 RMD160 d934a16f7ba259493c588432395b176d4a9da190 SHA1 006ac82222652e987fbf9b0959081612ef41d904 SHA256 d11c603266f7fe8dcb64c3f42299633d89d1eaccedcedcd2b1ba05bf6bb6189b +EBUILD kernel-check-0.3.17.ebuild 745 RMD160 7b8e20d1de796c01a28da8bfa530cf8a09b13299 SHA1 015b4425e8cd00add9daaf2bf2adf35ce1d95ed2 SHA256 1d80c2d26cd4125ad5f0d5306548e3cb5fe86e81eed0cf1f535b89f3f11b3c72 +EBUILD kernel-check-9999.ebuild 747 RMD160 6cddd63e55dea875cdac317e6fa71c0fe042c97e SHA1 d0e709f6725ead763fd129b957d811ec7cb9efc1 SHA256 7d27aa450f5edad1c9240a037cf9b3103a40a90d6cdd6b9ec590e8624f9ff71a MISC metadata.xml 220 RMD160 b15beca6dfcd8286236be6fc425d390b60b20df8 SHA1 afee7983f9fdf8a27cfa18c95b4a89b5e8cd6b9c SHA256 a48e54c5bbd6e9b4fe1b862e06f1f9e28e896a522f46f2ec962cc648dc5dcb86 diff --git a/app-admin/kernel-check/files/kernel-check-0.3.16-kerneldir.patch b/app-admin/kernel-check/files/kernel-check-0.3.16-kerneldir.patch deleted file mode 100644 index 4c3e3f7..0000000 --- a/app-admin/kernel-check/files/kernel-check-0.3.16-kerneldir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8cd5fa49f3586e50f0d0808a8386ddbdfce5b120 Mon Sep 17 00:00:00 2001 -From: Bjoern Tropf -Date: Mon, 14 Dec 2009 16:55:07 +0100 -Subject: [PATCH] Fix a missing replace - ---- - pym/kernelcheck/lib/kernellib.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pym/kernelcheck/lib/kernellib.py b/pym/kernelcheck/lib/kernellib.py -index d4ab5e2..264428b 100644 ---- a/pym/kernelcheck/lib/kernellib.py -+++ b/pym/kernelcheck/lib/kernellib.py -@@ -656,7 +656,7 @@ def eval_kernel_updates(kernel, kernel_eval, spinner): - compare.revision > kernel.revision): - compare.arch = kernel.arch - compare.genpatch = get_genpatch(PORTDIR, compare) -- compare_eval = eval_cve_files(DIR['out'], compare, spinner) -+ compare_eval = eval_cve_files(KERNELDIR, compare, spinner) - comparison = compare_evaluation(kernel_eval, compare_eval) - - for item in comparison.fixed: --- -1.6.3.3 - diff --git a/app-admin/kernel-check/kernel-check-0.3.16-r1.ebuild b/app-admin/kernel-check/kernel-check-0.3.16-r1.ebuild deleted file mode 100644 index 7795df7..0000000 --- a/app-admin/kernel-check/kernel-check-0.3.16-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit distutils - -DESCRIPTION="Gentoo Kernel Security" -HOMEPAGE="http://dev.gentoo.org/~asym/guide.xml" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kernel-check.git" - inherit git - KEYWORDS="" -else - SRC_URI="http://dev.gentoo.org/~asym/${P}.tar.bz2" - KEYWORDS="amd64 x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -DOCS="TODO" - -src_unpack() { - unpack ${A} -# cd "${S}" - epatch "${FILESDIR}/${P}-kerneldir.patch" -} - -src_install() { - distutils_src_install -} diff --git a/app-admin/kernel-check/kernel-check-0.3.17.ebuild b/app-admin/kernel-check/kernel-check-0.3.17.ebuild index b87a4b7..711b056 100644 --- a/app-admin/kernel-check/kernel-check-0.3.17.ebuild +++ b/app-admin/kernel-check/kernel-check-0.3.17.ebuild @@ -2,18 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + inherit distutils DESCRIPTION="Gentoo Kernel Security" HOMEPAGE="http://dev.gentoo.org/~asym/guide.xml" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kernel-check.git" inherit git + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kernel-check.git" KEYWORDS="" else SRC_URI="http://dev.gentoo.org/~asym/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="LGPL-2.1" @@ -26,7 +28,14 @@ RDEPEND="" DOCS="TODO" src_unpack() { - unpack ${A} + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi +} + +src_prepare() { if use extras; then epatch "${FILESDIR}/${PN}-extras.patch" fi diff --git a/app-admin/kernel-check/kernel-check-9999.ebuild b/app-admin/kernel-check/kernel-check-9999.ebuild index 43038a0..f60ea61 100644 --- a/app-admin/kernel-check/kernel-check-9999.ebuild +++ b/app-admin/kernel-check/kernel-check-9999.ebuild @@ -2,14 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + inherit distutils DESCRIPTION="Gentoo Kernel Security" HOMEPAGE="http://dev.gentoo.org/~asym/guide.xml" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kernel-check.git" inherit git + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/kernel-check.git" KEYWORDS="" else SRC_URI="http://dev.gentoo.org/~asym/${P}.tar.bz2" @@ -18,13 +20,27 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="" +IUSE="extras" DEPEND="" RDEPEND="" DOCS="TODO" +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi +} + +src_prepare() { + if use extras; then + epatch "${FILESDIR}/${PN}-extras.patch" + fi +} + src_install() { distutils_src_install } -- cgit v1.2.3-65-gdbad