diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2015-08-23 21:59:47 +0200 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2015-08-23 22:03:21 +0200 |
| commit | c838fdbcdf6321f023de69c4058d56d6226b5043 (patch) | |
| tree | 0a29e740c8e5225d309cebdd8d9ecbde870bfca2 /x11-plugins | |
| parent | dev-vcs/blogc-git-receiver: version bump (diff) | |
| download | gentoo-c838fdbcdf6321f023de69c4058d56d6226b5043.tar.gz gentoo-c838fdbcdf6321f023de69c4058d56d6226b5043.tar.bz2 gentoo-c838fdbcdf6321f023de69c4058d56d6226b5043.zip | |
x11-plugins/wmacpi: fix compilation with new libdockapp
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmacpi/Manifest | 2 | ||||
| -rw-r--r-- | x11-plugins/wmacpi/wmacpi-1.34.ebuild | 5 | ||||
| -rw-r--r-- | x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild | 5 | ||||
| -rw-r--r-- | x11-plugins/wmacpi/wmacpi-2.3.ebuild | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest index d7511807aeeb..f32d9281d7b9 100644 --- a/x11-plugins/wmacpi/Manifest +++ b/x11-plugins/wmacpi/Manifest @@ -1,3 +1,3 @@ DIST wmacpi-1.34.tar.gz 15509 SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2 -DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f +DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f SHA512 491709b5f0019084f6423737bbb47de4353f297f2469b72cd8eec1e93d62487db5d590235b0b774ce3828a26f6f589ddf9bf9896cfecd47249c37e6e230b739e WHIRLPOOL 7eb717cde21490e395beacacb89bb3df6bffae7f64c6a5298f955a8c68abae36fabe271d9815de4c3a45c9fa3e579dc5f46f85a6441bb566c11efaca86aa8575 DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild index d1e6e1dd8fa7..6588ec9984d0 100644 --- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild +++ b/x11-plugins/wmacpi/wmacpi-1.34.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="amd64 ppc -sparc x86" IUSE="acpi apm" -DEPEND="x11-libs/libdockapp" +DEPEND="<x11-libs/libdockapp-0.7" +RDEPEND="${DEPEND}" src_unpack() { unpack ${A} diff --git a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild index 4963b2f2e7ef..d9a2d107af88 100644 --- a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild +++ b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,8 +16,9 @@ SLOT="0" KEYWORDS="amd64 -ppc -sparc x86" IUSE="" -DEPEND="x11-libs/libdockapp +DEPEND="<x11-libs/libdockapp-0.7 x11-libs/libX11" +RDEPEND="${DEPEND}" src_unpack() { unpack ${A} diff --git a/x11-plugins/wmacpi/wmacpi-2.3.ebuild b/x11-plugins/wmacpi/wmacpi-2.3.ebuild index 9ec5c98b617f..3160bc9b5b49 100644 --- a/x11-plugins/wmacpi/wmacpi-2.3.ebuild +++ b/x11-plugins/wmacpi/wmacpi-2.3.ebuild @@ -15,13 +15,15 @@ SLOT="0" KEYWORDS="~amd64 -ppc -sparc ~x86" IUSE="" -DEPEND="x11-libs/libdockapp +DEPEND=">=x11-libs/libdockapp-0.7:= x11-libs/libX11" S=${WORKDIR}/dockapps src_prepare() { epatch "${FILESDIR}"/${P}-makefile.patch + + sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die } src_compile() { |