diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-plugins/docker | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'x11-plugins/docker')
| -rw-r--r-- | x11-plugins/docker/Manifest | 5 | ||||
| -rw-r--r-- | x11-plugins/docker/docker-1.5-r1.ebuild | 36 | ||||
| -rw-r--r-- | x11-plugins/docker/docker-1.5-r2.ebuild | 15 | ||||
| -rw-r--r-- | x11-plugins/docker/files/docker-1.5-makefile_rename.patch | 6 |
4 files changed, 14 insertions, 48 deletions
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest index a5a1baf5ae10..02ac8fedb82b 100644 --- a/x11-plugins/docker/Manifest +++ b/x11-plugins/docker/Manifest @@ -1,5 +1,4 @@ -AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d +AUX docker-1.5-makefile_rename.patch 1415 BLAKE2B 4c8e8d3eb49c857ad6b37096bfed717313bbb63b198c32724a21d40bf511b8da40658f4dddda6bff11bbe4f015ab8d3484d284eb12ca5fe0ba79492bc4162bc4 SHA512 28dccdcb24a74dc47c93678965084d97d6acaaa06c63169701a1463efd14a7807269186d7c224039631824fe26ec5ae8c3fafd26b5b989c4acd537f04ec4d769 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861 -EBUILD docker-1.5-r1.ebuild 775 BLAKE2B f298d1783d0d3919bc1d616427d11001553c034ac0dd0691b328fd9d24970accabcf7a0411419a50be9289dec538446d86d669d7f886f1ea169b3f6310108201 SHA512 0d177cd38c2e5724ae42ccf357ef662aac39e07d1053e3c9a5fde5682ab393ddd7fa2f422d33c8796b9216466e6b5c3e7b04c0a96776a3bdadd64a8868cc8b6e -EBUILD docker-1.5-r2.ebuild 690 BLAKE2B dfeefbb5077bf57d222be78b6d743436a71498bebbfcc0a56b954822efe10580a5c6a35600f61ac5fd2b003e98755d5dd395cea41d34a6eb631fe2ad07057bf9 SHA512 fd9a16410150284c15c7919e897487f2a85b32ce588e8ecb2ad7465c82a46d4b6720d2efa7bf3e47bdce8a885cfd981138c04b502549db3849082d914594d668 +EBUILD docker-1.5-r2.ebuild 714 BLAKE2B c592cf9bb313afe6e4d55303a478f6eec66af3a70af6e3f6ad1655b205d4c59af1d213b0b2c99c1bd6754c2c0155b81d8115e8afe2eca90905c76341ce4a5652 SHA512 6f3d0ac993130edb9a6ff0566c208420ae51535509bbc1ab87f85e9ec57e17dea2b9c4b6de2f5f40a3c8793e9a624d1242b9a1da8b2489e76c2744c50b442412 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724 diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild deleted file mode 100644 index d1ecaa22fe44..000000000000 --- a/x11-plugins/docker/docker-1.5-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2" -HOMEPAGE="https://icculus.org/openbox/2/docker/" -SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.0.4 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-makefile_rename.patch" -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README -} - -pkg_postinst() { - einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker" -} diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild index 37de7b671cf3..9f742ebe552d 100644 --- a/x11-plugins/docker/docker-1.5-r2.ebuild +++ b/x11-plugins/docker/docker-1.5-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2" @@ -10,17 +11,19 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" RDEPEND=">=dev-libs/glib-2.0.4 x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-makefile_rename.patch +) src_compile() { + tc-export PKG_CONFIG emake CC="$(tc-getCC)" } diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch index cf20a9135aa5..36cc92b00bf0 100644 --- a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch +++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2015-01-19 20:10:47.762522964 +0100 -+++ b/Makefile 2015-01-19 20:11:11.463545692 +0100 +--- a/Makefile ++++ b/Makefile @@ -5,12 +5,10 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# @@ -33,7 +33,7 @@ - $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \ - `pkg-config --libs glib-2.0` $^ -o $@ + $(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \ -+ `pkg-config --libs glib-2.0` -o $@ ++ `${PKG_CONFIG} --libs glib-2.0` -o $@ %.o: %.c $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $< |