diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-wm/openbox | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'x11-wm/openbox')
-rw-r--r-- | x11-wm/openbox/Manifest | 5 | ||||
-rw-r--r-- | x11-wm/openbox/openbox-3.6.1-r3.ebuild | 12 | ||||
-rw-r--r-- | x11-wm/openbox/openbox-3.6.1.ebuild | 96 | ||||
-rw-r--r-- | x11-wm/openbox/openbox-9999.ebuild | 12 |
4 files changed, 18 insertions, 107 deletions
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest index 41101e863b37..ac7826a7eb6d 100644 --- a/x11-wm/openbox/Manifest +++ b/x11-wm/openbox/Manifest @@ -2,7 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e -EBUILD openbox-3.6.1-r3.ebuild 2714 BLAKE2B 735fbe7b73f32fbd7c803fbc680d0477d02de029352a0221696d8037bf57d2a59b8c806193ae3f0a87310180e3a1ed3e9be5d3f88de84ca62227d3f02687000a SHA512 9f12c32c065eb54b9b50aa0444ea1d1e291e7a99c0b0b121c8940417c0ad99c2d1767dc2a2bdad786048882ce45356d97fa7da2d4711290153a3d94fe001f8d1 -EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 310fb7279464260f025ece227bad2a3481ce1fbe3f841d212949ed6a6d4ed2143789092b6c702628dea66569f03fa5a716442a0a7b686c437f707f15a0e06290 SHA512 a915e92e485f840e864280a1d633d7d75de916ca812158544a7561254d1335727f996ca0bd7724ea3b2ac4f4624d90a3a33ee800a39f9ffb747d11257b2d1612 -EBUILD openbox-9999.ebuild 2722 BLAKE2B 64238c8c479fdf98589cfa021d4bbd1e1962705f83baadb53a942a1f8220a598802b11d9dc8ce124f3384022a991e97a05751a320ca2875ee6bd56be20895d89 SHA512 78a05754f7dea9ef8d3be428b03ac286305b1fda2b19211233e569c46a94b433942964daae33ff323d6ba7bfe3a591522c4ed74f19e9b48239d6f1d789c8fac8 +EBUILD openbox-3.6.1-r3.ebuild 2730 BLAKE2B b1be9672b17b2567551398ff87b21d4ae763f8ca4d69b763a791ed734345ca6785d0c478f0d521bfa16cbb0b5abc656226f28b786db8650e7f630567bc8e7771 SHA512 5cbe020ce5824fb79a7a82be4bccd16d983c21d49f7df9df7d689891416d5519fc4a36472087ff7c6e11f337633296cefe3ce9049d143e584cdb4927e5798e20 +EBUILD openbox-9999.ebuild 2738 BLAKE2B 49e801f54ac09734cd974cd39ecb8314252b17d62642c4b83fb93846f59386e655cd8b93fef65d090e7eee3ce2c2bef41af07fdb5b6f44e802e2e7171dfbd880 SHA512 b809f5e7a3e127a863d911cf757baa08a6c2879bc015444d6a1695beaa0c4e6384e8654ba2207a47b15a4d12da9a1ba166d0e72242149801acce0d813acb9ccb MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207 diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild index a5c37f022d90..55a0b32061e7 100644 --- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild +++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild @@ -24,7 +24,12 @@ SLOT="3" IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="dev-libs/glib:2 +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo @@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2 ') ) " -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig +DEPEND=" + ${RDEPEND} x11-base/xorg-proto " diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild deleted file mode 100644 index 810985f6f7cf..000000000000 --- a/x11-wm/openbox/openbox-3.6.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -inherit multilib autotools ltprune python-r1 eutils - -DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager" -HOMEPAGE="http://openbox.org/" -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.openbox.org/dana/openbox" - SRC_URI="branding? ( - https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" -else - SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz - branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="3" -IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" -REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="dev-libs/glib:2 - >=dev-libs/libxml2-2.0 - >=media-libs/fontconfig-2 - x11-libs/cairo - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXt - >=x11-libs/pango-1.8[X] - imlib? ( media-libs/imlib2 ) - startup-notification? ( >=x11-libs/startup-notification-0.8 ) - svg? ( gnome-base/librsvg:2 ) - xdg? ( - ${PYTHON_DEPS} - dev-python/pyxdg[${PYTHON_USEDEP}] - ) - " -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - use xdg && python_setup - epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch - sed -i \ - -e "s:-O0 -ggdb ::" \ - -e 's/-fno-strict-aliasing//' \ - "${S}"/m4/openbox.m4 || die - epatch_user - eautoreconf -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable debug) \ - $(use_enable static-libs static) \ - $(use_enable nls) \ - $(use_enable imlib imlib2) \ - $(use_enable svg librsvg) \ - $(use_enable startup-notification) \ - $(use_enable session session-management) \ - --with-x -} - -src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} - emake DESTDIR="${D}" install - if use branding; then - insinto /usr/share/themes - doins -r "${WORKDIR}"/Surreal_Gentoo - # make it the default theme - sed -i \ - -e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \ - "${D}"/etc/xdg/openbox/rc.xml \ - || die "failed to set Surreal Gentoo as the default theme" - fi - use static-libs || prune_libtool_files --all - if use xdg ; then - python_replicate_script "${ED}"/usr/libexec/openbox-xdg-autostart - else - rm "${ED}"/usr/libexec/openbox-xdg-autostart || die - fi -} diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild index 736a89bce398..ad62edb8fa6f 100644 --- a/x11-wm/openbox/openbox-9999.ebuild +++ b/x11-wm/openbox/openbox-9999.ebuild @@ -24,7 +24,12 @@ SLOT="3" IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="dev-libs/glib:2 +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo @@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2 ') ) " -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig +DEPEND=" + ${RDEPEND} x11-base/xorg-proto " |