diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2015-05-03 17:27:58 +0000 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2015-05-03 17:27:58 +0000 |
| commit | f9d9412834d29e211fe79a5b8877b8713bd56965 (patch) | |
| tree | 8e87e6b9fa373dd9f2b778a3f6a954a4d87029d4 /app-admin | |
| parent | unmask system-llvm USE for dev-lang/rust, bug #546704 (diff) | |
| download | historical-f9d9412834d29e211fe79a5b8877b8713bd56965.tar.gz historical-f9d9412834d29e211fe79a5b8877b8713bd56965.tar.bz2 historical-f9d9412834d29e211fe79a5b8877b8713bd56965.zip | |
Fix bug 434110, update to EAPI 5, remove old.
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/cancd/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/cancd/Manifest | 26 | ||||
| -rw-r--r-- | app-admin/cancd/cancd-0.1.0-r3.ebuild (renamed from app-admin/cancd/cancd-0.1.0-r2.ebuild) | 16 | ||||
| -rw-r--r-- | app-admin/cancd/files/netconsole-init.d | 6 |
4 files changed, 39 insertions, 17 deletions
diff --git a/app-admin/cancd/ChangeLog b/app-admin/cancd/ChangeLog index 77663c78c769..62f9e8e11c3d 100644 --- a/app-admin/cancd/ChangeLog +++ b/app-admin/cancd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/cancd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.11 2015/04/14 23:40:36 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.12 2015/05/03 17:27:52 bircoph Exp $ + +*cancd-0.1.0-r3 (03 May 2015) + + 03 May 2015; Andrew Savchenko <bircoph@gentoo.org> -cancd-0.1.0-r2.ebuild, + +cancd-0.1.0-r3.ebuild, files/netconsole-init.d: + Fix bug 434110, update to EAPI=5. Remove old 14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -cancd-0.1.0.ebuild: Remove old. diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest index 377a496fdfee..fe88b3aa1f95 100644 --- a/app-admin/cancd/Manifest +++ b/app-admin/cancd/Manifest @@ -1,10 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX cancd-0.1.0-build.patch 262 SHA256 10be31f427940224cecd5b90de94dfd9b0a76368c57a8354b44f4c3905c8d192 SHA512 cbc3d0bfcdb2abae08268a408d2d7f7bc5898bd07c744878a6d8996dea5ea4f9f308078f9fe05566ee8cd06b3a5e083163f50d69f6795b31952934a88d69c481 WHIRLPOOL a8cdce4f61d03d7a683065bd43422d25723685b75008abfd2c745b5d5bb56257007af26992276c829fa47336a959f75e0f628d3f0e91f8e556dc3c3ade135a6a AUX cancd-0.1.0-c-cleanup.patch 1648 SHA256 55628aa8e2fabd3aa26bc0023d46562a238047b2f7ad5c8485b88794655f93d7 SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e WHIRLPOOL fb55e5d1ab1a9971a8423d6dadadcaacfc24dc6a2f300e7c1b28173d5beccf04309f511299af5f64ea06f9f497ee35548cfd6744459afd7ef54ccfe1e5c1b7ca AUX cancd-conf.d 605 SHA256 bbf84fdba07bde4a61864715e42a76c2b3ad2ecade4ad11b8ca4d557bfa9deb8 SHA512 baf0af880434bb875b4c3e1b146a5250652730d8ee0be0938662927aac90af00618519c0ee4cef81af430ab850b9cf2a98dae45990edc23df4f19d6b1f5676ce WHIRLPOOL 8eda969041bcae2dcdbb8aa43c3bc8aae4341afff7b5b2f1493adf99a21dc8cfda98686b0a607657e92db5fa1711f3ad28f5f97b521365bb73bd4bf1d653e4ef AUX cancd-init.d 621 SHA256 2107d774087d88cc263b7777ec64fa0f916f9672eaac8eb598dbc2f97016a685 SHA512 7636575deabaa880bd77be70a752993cdbe3e55ea2b153d9cfef301a7d18ec20cd20736fd5e88e5bb3d68732db133aca92b8ff6f21baddad7c092168175a5888 WHIRLPOOL 23ed53a0614f0ae0c841f26e08a890a055b24a215f6bcfb4f8f8ad10e7b703af294118b7312c0df852bd3edc1c19f714a2114ddd624fc52d0d6b782c57f0fcac AUX netconsole-conf.d 866 SHA256 480230a83fade7e2c284936fc8814c07e075d8296e37aa83772f8d8cb3c6ff96 SHA512 b20be2c12dddc2b6bf7778940190949a70607b4c9d67d0bf81a1495ea2b5c51c3ab476f902cf8ee8a1e5944b164f266f49f67da34d21990d10ff0f84e4cddd80 WHIRLPOOL 4c4ac57f3db932af9273060a15f5180a91eec8cd08db248596defc4d9f97a90f4215701b03b16176a23a793dc51771894b0d6972060c01b5a95a8f4b152683c4 -AUX netconsole-init.d 1624 SHA256 0e89a95b572450577ff1192feae29059ebab9caab99639557cb709bb9b0c401c SHA512 98d8f355e6607bbf69bf50ace366e5b868474ddbbc7b68a076bf013b862424b88a8aac3eeb5c4db3c54f3c73c17938a1b185bdc54be185d188863b9d08609ed0 WHIRLPOOL a3b68aa97ded393be32b7c70ca2094d80d40535307f53582812d2f43b99fa7740bc86a070a4ae23d8781d1ccd4397a0d1fcd2e346b473d65462c18cbf05d4a20 +AUX netconsole-init.d 1618 SHA256 b7c271f2278a9b07eb2ee5d3a30bb6803a8d6e277f7ef32c5c67bf66a38f98f8 SHA512 cfea2dd0ce5581414aa0c033865ba6a570f6d003871c4b79201f2e1447e361441fa2cb881cffd0c8191675147428bf90a157b20c0157764ff5c3b681a13fdc5c WHIRLPOOL 597191691c86c9338d0cf836241047f3327bc36b0a3d134a9c5f920d8e2d8c6129d9c3767650f3e8b5d3831562cfbf66e344cb443782a0ce18d21199fc5a1a2b DIST cancd-0.1.0.tar.gz 7634 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb WHIRLPOOL 84e1b6461bc5ae40b01c71112fed9999e590a7cbed54da6850131bd475eafb6ab7830a418a6fc46bf217645ed73aec080af6d4117a9ea97f1b48dad92cc93caf -EBUILD cancd-0.1.0-r2.ebuild 1412 SHA256 2f4dc7977b638a8f403da6a0447571925735689cb4dbc57ecbd32dafee46d22f SHA512 36ab09fdf09519d550406d26d0b1abb24ab8e28347322db3498f5f0e983da85922f7fcdb72388b26c194304b2246330205ce4d560f233fa66eedff5cebb0da44 WHIRLPOOL 70c21d98a8182493c75ee51fd06c05e71a980a40d26956d619699f73226ec44ef854da5c85d38f636419509d77960da309dabd7a1b21d5ec0d31ab08141e4eaf -MISC ChangeLog 1852 SHA256 ca19e23785116140793ca21835c07f27004ad9033c469699124fc85278925824 SHA512 80e279801f9a6c9e61570e33fbe67390306bffbda580432f3b9b7b9952d3fab830332b6d3c8852d8c1d52c61b26ac079044487a9f8ebd099bf1c9b2c62ee0277 WHIRLPOOL 363e3f42498a8671fa56c166dc936dfb91cca860a7cb9ff4cf5bce9c433d99185b92745db8cdf4a3adbbda4f8587633612f3dc6b14a401732db61e8b15b80c65 +EBUILD cancd-0.1.0-r3.ebuild 1322 SHA256 c1b9456bd03a4736a96333b3a1fec1a254c4eeda327c43956bda0306de1ce6a2 SHA512 047b0f3168353869c069f93280045714bb4b98c19edd927220e6f56206b5d694c251f5a48c09fdf31ca032b4babb61f5bed0d8ad22733d80f63dcf4c094543a6 WHIRLPOOL 1449a8ac0fd508e92eb773ba4aeb3453cfbd4a2220da821541fd87047e7f873b13a5a5437e08bd73210e61cfc504c2b23264797f39b1aa7be850573c0347ae1a +MISC ChangeLog 2061 SHA256 1b848e877c78beb772ecb284002d0f3c2b36948363e81f5fba443ab849f75339 SHA512 3da179ae869f61ada233d301ee3f28dc48224abc4d4150127032f6da6151b023404fd95d2bfc6eb8173087a56ed58845513e2abc80c6ab6af2bc4d481996062f WHIRLPOOL 708712fd64d55b771efcc3ab8311f7d8ee0d83b78febe1f8af86677c06c6586caab6732864262d0756fc27dcbbd3663971da127e4a49b8743834469d3e6f5567 MISC metadata.xml 254 SHA256 01e5e65407b8647d4a3ba7fc968e271368b319b1b34a2df8fa891c70099a3e63 SHA512 1e5e169b9f7bbc60a3b0e19a0f21d108b6d5cdea4ab299817c8d157370f8a6a876c901aa94e4c8ef817f91fe53fe4cf029d72931d5fdb15b91b8119dc3d78e55 WHIRLPOOL acd26f78ca257d987fda8fbec98f3a9df754b8470d36fcf137b219760e9cfb5b95656fa104847c8e3cdb5b1f284ad97f3d6924ef8343c763e83f942abbeb9f23 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJVRlqZAAoJEPZTWjO6HuSNvowP/jq+vbe02N0jv43Wq+xcW22u +sCvaa9d4zEPEUohK83uREpDXcyMQQi0HLH7zFUo/bPnVQ1RbAuKzIMD7EPAoiJSH +/rbtvRzyckG89jBvhGxlFsz1nmNjXRhChnf5om4nVdjzLupKeTd0LB3CGBDsTOUo +V7q9eGZFHIJycPfbs8MftfH/mWep2c8DESQdI3xMPJzJzrc2LxR7G3c2T5np0Mfd +hEoq7J+rQCh2pbY5zIWrHRthacz8VvRenHQmSdpa2+4jK5NZ+VOKl2td9G+j6U1J +Fmp6kPuVkZvr16/3/nLmMrjc/wl0sCuYTpY/hPeScz1G2OYJ0q5yS52Ey1C21uHg +pCfJeBp/arPPCogr1HSxyPVcjw5IeHgyl16eIHHguYEfhqQps5s4cvgh1SZjN2i9 +h3/niADOEFmRAUAP/teoq30mOEJ9x9FxVG6ueWvbnr99jtbLmwXmUmLy9moDI1mc +gnpx4JM2UT+C1Pb2VuWMTKMSERx7tZ2RBxKWet/Hm68PDWqxth8RJsq1S1DC5fPb ++9KF00s0xhxCuZn+KAHZ2ABALDKARNJa9dN3uu3wYZjfhGnCEOSMcPonnL96nBHK +lWfKtN0kI7GEWaQyjXXglq9XdDil5ajKdhRTtW2usD3acAwDPjtuEnwGLKio2lj/ +bsUqkoZ6i6lBU1IHgw5w +=UQDS +-----END PGP SIGNATURE----- diff --git a/app-admin/cancd/cancd-0.1.0-r2.ebuild b/app-admin/cancd/cancd-0.1.0-r3.ebuild index c829de6a16fc..bf854e1bcff5 100644 --- a/app-admin/cancd/cancd-0.1.0-r2.ebuild +++ b/app-admin/cancd/cancd-0.1.0-r3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r2.ebuild,v 1.1 2011/12/31 15:42:32 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r3.ebuild,v 1.1 2015/05/03 17:27:52 bircoph Exp $ + +EAPI=5 inherit eutils @@ -13,9 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-build.patch #246734 epatch "${FILESDIR}"/${P}-c-cleanup.patch # slight makefile cleanup @@ -26,12 +26,8 @@ src_unpack() { Makefile || die } -src_compile() { - emake cancd || die "emake failed" -} - src_install() { - dosbin cancd || die "dosbin failed" + dosbin cancd newinitd "${FILESDIR}"/cancd-init.d cancd newconfd "${FILESDIR}"/cancd-conf.d cancd newinitd "${FILESDIR}"/netconsole-init.d netconsole diff --git a/app-admin/cancd/files/netconsole-init.d b/app-admin/cancd/files/netconsole-init.d index 8636131be587..9f25356b9582 100644 --- a/app-admin/cancd/files/netconsole-init.d +++ b/app-admin/cancd/files/netconsole-init.d @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-init.d,v 1.3 2005/11/19 01:33:14 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-init.d,v 1.4 2015/05/03 17:27:52 bircoph Exp $ depend() { need net @@ -45,7 +45,7 @@ checkconfig() { return 1 fi - LC_ALL=C /sbin/ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null + LC_ALL=C ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null ret=$? if [ -z "${DEVICE}" -o "${ret}" -gt 0 ]; then |