commit: f30549f398802b2664e5ea0e5391c78772d469d0 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> AuthorDate: Sun Aug 9 15:02:16 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Sun Aug 9 15:02:16 2015 +0000 URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=f30549f3
Rearrange code to be consistent with the main tree. sys-power/suspend/Manifest | 4 ++-- sys-power/suspend/suspend-1.0_p20150622.ebuild | 7 ++++--- sys-power/suspend/suspend-9999.ebuild | 12 ++---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest index 5c8834d..09250bb 100644 --- a/sys-power/suspend/Manifest +++ b/sys-power/suspend/Manifest @@ -1,6 +1,6 @@ DIST suspend-1.0_p20120915.tar.xz 111080 SHA256 4fa7551ec5ce3ed5d7412ad14e01f5fbac3a541db9d94ad6adf20b87d9c32eca SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be WHIRLPOOL 6f5ea4a17572bc1e30d70258a0439b40a29ea67f0251cecec81bdd3dee92e7801645c37dbb868b0f498c093193bd574f361dc015810965c09f53d75cfb391e7f DIST suspend-1.0_p20150622.patch.xz 6052 SHA256 bc05a8896b89520b70a5c3b1a9903d94b75bc82756f6edbdddf53c6d1120af14 SHA512 8ca6d51e96b4d405133b4ee3bc246d79e4270052fe10202f94a85075dad314a33bb586ebbcf3a04c2ab93c74eb5f8d4e1dfca1c88fc56467d347eda147e4d3aa WHIRLPOOL 09f07d6ece378715c0bb1017ade8b97277f818e00accec0f2b5b4573664aafb68dc3713fe1780d4b38707120c0b62c35ec6d6818aec0f59ad3c14247b4cf1a7b -EBUILD suspend-1.0_p20150622.ebuild 1390 SHA256 657096dc9a89b71edd1091bf0f43bae25707c750ad5d77b3e7e15d4f8914a384 SHA512 191202001e8f639a689ebf7499ad4cb09e2051e181e8023c2f8b84ffe9bcd79b5fa044dc0b98df95525dbefc6541191f2fcb091ca845a63022eb048568ab6fb6 WHIRLPOOL a83776c73df8d34ca1101950dca9b99382899b5a6e471997fd988d4415570aa585eb37736fdc53c376eecff16e8a115528c689bc335b819154125adeb3f09b24 -EBUILD suspend-9999.ebuild 1380 SHA256 f09b2ba50e317618a59a97c558cae67cf9f22770ed2163a3a4daf07ed16f1284 SHA512 7f1d042ec34b509ebe99d1a50099e4e4037cc8d494d46675b2289ae2b2e79c35cedd93aca6a4bd2b94672a987edf6c07628423d489b7350da8896203859669e8 WHIRLPOOL d1872c3816f1b3a298640e3273cbd349a8fbd096f662e360a8e7e71834ab392569c1e64617842095f5e4adb3ba366053e98e8d7ce752382ca0ee8af4efd2983e +EBUILD suspend-1.0_p20150622.ebuild 1398 SHA256 fffa0fb89df4740bddf838b7c07afd6dce58af75a321df69d26c11328e2b793a SHA512 6f435acda69ae86335b4319d66e14d6558d240c0e70e018b5a4418c34bcd13478871d1d819e46c1ee2818c25d290919d2c2bdd637c7ac2bda585e94cc0e56ffe WHIRLPOOL 7c0c3ee87ecbc9a43c2afdab37866e8ab26de00f4f1070c40e67c40f27134577e5f84a057a806d880960b5c15466ea6650b00befdbe5c070e150585348047587 +EBUILD suspend-9999.ebuild 1211 SHA256 98e381756744bf1fb621adae3876f9801ad912a5953ddc46916af86170ff626c SHA512 b0b8bbf97b80a0eec5b2c18deba254d3f565fc787b8b2824d87a5e4823d38d20daa7fdf603b25b4c0bd83203abf030dd3c9b60f2317635b9c5359a374ea4d9b0 WHIRLPOOL 70d6c3e28700701fcc9528327b24bd91b0c8684dff25105810a1eecf0f2e3f2baf3315f4465f620dd0092c521eed411f464197b6cba35f4caac6812ee2de827a MISC ChangeLog 4961 SHA256 6c1ed86d27b80a6b04dc1f1b604f867dd836459c6be59d145489def500d88e83 SHA512 25513f777a399893202787932334e9a4f0b35ea231783467e4d4072be797b9592615fa10cfbcc83242431f1d1e82909ba784528ec3bd0cfbd943284a85c7e70b WHIRLPOOL 33b94ee57b3476b38fa6b676d566b2d4b77677bb238d55218887f7523e5dad744f4fd1a9858845cb7db6344e6b71a0eb8e9af5e3a96015642cc8da9a0e928aae MISC metadata.xml 461 SHA256 9a633660373b250a0c2633df4c4d5439552549885bbbb335a9b113cbf74a997e SHA512 72562dca1980eb0f3cca95f5fd2b7d963fcb1ed20b3a8f7ff940b4508ea8e0da3c9ae700936778ca5f9cca02c902d159f9535f9c4bee907f11b1217090141ca6 WHIRLPOOL f97a9f3d85f1e996be58f0e2b46d32b2007b4270ae4f8d2e97ffd1553a417d7234f8b499bdda16f258771804a6917f0d44c2badcb282fad1db7d4f6c815ea85a diff --git a/sys-power/suspend/suspend-1.0_p20150622.ebuild b/sys-power/suspend/suspend-1.0_p20150622.ebuild index 254ee92..e84a791 100644 --- a/sys-power/suspend/suspend-1.0_p20150622.ebuild +++ b/sys-power/suspend/suspend-1.0_p20150622.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.9 2014/03/01 22:15:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0_p20150622.ebuild,v 1.1 2015/08/06 21:53:54 xmw Exp $ EAPI=5 @@ -12,11 +12,10 @@ DESCRIPTION="Userspace Software Suspend and S2Ram" HOMEPAGE="http://suspend.sourceforge.net/"; SRC_URI="http://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz http://dev.gentoo.org/~bircoph/patches/${P}.patch.xz"; -KEYWORDS="~amd64 ~x86" -S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="crypt fbsplash +lzo threads" RDEPEND=" @@ -31,6 +30,8 @@ DEPEND="${RDEPEND} >=sys-apps/pciutils-2.2.4 virtual/pkgconfig" +S="${WORKDIR}/${PN}" + src_prepare() { epatch "${WORKDIR}/${P}.patch" eautoreconf diff --git a/sys-power/suspend/suspend-9999.ebuild b/sys-power/suspend/suspend-9999.ebuild index 4a3a70f..cdb8939 100644 --- a/sys-power/suspend/suspend-9999.ebuild +++ b/sys-power/suspend/suspend-9999.ebuild @@ -4,19 +4,11 @@ EAPI=5 -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/bircoph/suspend.git" -else - SRC_URI="mirror://sourceforge/${PN}/${P/-/-utils-}.tar.bz2" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P/-/-utils-}" -fi - -inherit autotools +inherit autotools git-r3 DESCRIPTION="Userspace Software Suspend and S2Ram" HOMEPAGE="http://suspend.sourceforge.net/"; +EGIT_REPO_URI="git://github.com/bircoph/${PN}.git" LICENSE="GPL-2" SLOT="0"
