[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfconf/, profiles/

2019-05-24 Thread Michał Górny 
commit: a658aa90dffe45cd63dc55c2eebc5b964973e96a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 24 22:01:20 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 24 22:19:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a658aa90

xfce-base/xfconf: Drop old

Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask |  5 ---
 xfce-base/xfconf/Manifest |  2 -
 xfce-base/xfconf/xfconf-4.13.5.ebuild | 75 ---
 xfce-base/xfconf/xfconf-4.13.6.ebuild | 75 ---
 4 files changed, 157 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e9e097f18af..c620fef3125 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -545,11 +545,6 @@ dev-libs/gost-engine
 # Masked for removal on 2018-11-24, bug #669650.
 dev-db/pgadmin3
 
-# Lars Wendler  (22 Oct 2018)
-# Breaks dev-libs/gobject-introspection and its consumers
-# See #669278
-=xfce-base/xfconf-4.13.6
-
 # Thomas Deutschmann  (12 Oct 2018)
 # EOL and has known vulnerabilities. Please move to
 # Firefox 60 or newer if you can.

diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 2e3c4adf989..a662f1d2896 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,4 +1,2 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 
893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a
 SHA512 
114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
-DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B 
ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe
 SHA512 
34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
-DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 
6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2
 SHA512 
0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 DIST xfconf-4.13.7.tar.bz2 618676 BLAKE2B 
8f7dd97530d4781e2d46d8139800f54991d932db5de0050e66d711bafef1daa0355383fd139789037a92b462042563a9aa2269295785b2f8217a0e9ff6a00c80
 SHA512 
113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d

diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild 
b/xfce-base/xfconf/xfconf-4.13.5.ebuild
deleted file mode 100644
index 244033bffc4..000
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/;
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-   >=xfce-base/libxfce4util-4.10:=
-   perl? (
-   dev-lang/perl:=[-build(-)]
-   dev-perl/glib-perl
-   )
-   !https://bugzilla.xfce.org/show_bug.cgi?id=13840
-   nonfatal emake -j1 check || ret=1
-
-   kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
-   return "${ret}"
-}
-
-src_test() {
-   virtx my_test
-}
-
-src_install() {
-   default
-   find "${D}" -type f -name '*.la' -delete || die
-
-   if use perl; then
-   find "${ED}" -type f -name perllocal.pod -delete || die
-   find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-   fi
-}

diff --git a/xfce-base/xfconf/xfconf-4.13.6.ebuild 
b/xfce-base/xfconf/xfconf-4.13.6.ebuild
deleted file mode 100644
index 2cd890f3d36..000
--- a/xfce-base/xfconf/xfconf-4.13.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/;
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-   >=xfce-base/libxfce4util-4.10:=
-   perl? (
-   dev-lang/perl:=[-build(-)]
-   dev-perl/glib-perl
-   )
-

[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfconf/, profiles/

2017-06-07 Thread Michał Górny 
commit: 379df5fa8b1208b3876398def6c15e820701c37e
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun  6 07:48:38 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun  7 20:06:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379df5fa

xfce-base/xfconf: Bump to 4.13.1, EAPI=6, fix tests

 profiles/package.mask |  8 
 xfce-base/xfconf/Manifest |  1 +
 xfce-base/xfconf/xfconf-4.13.1.ebuild | 71 +++
 3 files changed, 80 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 93e9b6b8574..1d1ccfcd108 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny  (07 Jun 2017)
+# The new release changes API and *breaks* core Xfce components.
+# Upstream lists xfce-base/xfce4-settings and xfce-base/xfce4-panel
+# as being incompatible. The breakage is not exhibited at build time
+# but results in broken executables. Masked until upstream releases
+# fixed versions and for further testing.
+>=xfce-base/xfconf-4.13
+
 # Andreas Sturmlechner  (07 Jun 2017)
 # Needs some testing.
 ~media-gfx/exiv2-0.26

diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 0f94d4c693d..5c7ae17b32a 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,2 +1,3 @@
 DIST xfconf-4.12.0.tar.bz2 542544 SHA256 
9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156 SHA512 
60cc37a7207b0486f7f2de665870facf8e339241df344d7540082f3db447b3ac88bddd306d6a09a3868878cb477d1696491c71470052ef56cb649d773bd55b56
 WHIRLPOOL 
73241764a03c865c3bcda97a481e4ed9c6bfd8a3fdfd1a614291abad32f11157ba50a14d0ef918ad3c397fdd015d3dcf0cd07e24e43fbdd5125d5c273d536c16
 DIST xfconf-4.12.1.tar.bz2 564131 SHA256 
35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36 SHA512 
114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 WHIRLPOOL 
17ccadbf9759cf2c84f09f58f0f3c65a49a4dab3965a1deb7a42d5635075b4d60dc96556d0cc80d8b8df8c91bae51d9e3864409020b32058694d15f340d3f9c1
+DIST xfconf-4.13.1.tar.bz2 584229 SHA256 
17f149f8f0cdbd4f3c8fb7869015c57a5bc6ba1c842faade6d6ec75fea5b SHA512 
94504c71be3e98f635f20ab840a04aea08118962a9415a88bcdabf3960b3ba0b6f90a5c89b515bfef5bd5850738370ac885411ce3f4ecde944ca4e7976728080
 WHIRLPOOL 
95db672eec632aa3a2b74860ad88293ce7259956e08860c498e7141311224e1630f7d09b0568fb4508e398dffe5b280c837c9fcf7c412979ee235e198a33bd5c

diff --git a/xfce-base/xfconf/xfconf-4.13.1.ebuild 
b/xfce-base/xfconf/xfconf-4.13.1.ebuild
new file mode 100644
index 000..3e2ada0e1a3
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.13.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit virtualx xdg-utils
+
+DESCRIPTION="A flexible, easy-to-use configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/;
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug perl"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+   >=xfce-base/libxfce4util-4.10:=
+   perl? (
+   dev-lang/perl:=[-build(-)]
+   dev-perl/glib-perl
+   )"
+DEPEND="${RDEPEND}
+   dev-util/gdbus-codegen
+   dev-util/intltool
+   virtual/pkgconfig
+   sys-devel/gettext
+   perl? (
+   dev-perl/ExtUtils-Depends
+   dev-perl/ExtUtils-PkgConfig
+   )"
+
+src_configure() {
+   local myconf=(
+   $(use_enable perl perl-bindings)
+   $(use_enable debug checks)
+   --with-perl-options=INSTALLDIRS=vendor
+   )
+
+   xdg_environment_reset
+   econf "${myconf[@]}"
+}
+
+src_compile() {
+   emake OTHERLDFLAGS="${LDFLAGS}"
+}
+
+my_test() {
+   local out=$(./xfconfd/xfconfd --daemon) || return 1
+   eval "${out}"
+
+   local ret=0
+   nonfatal emake check || ret=1
+
+   kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
+   return "${ret}"
+}
+
+src_test() {
+   virtx my_test
+}
+
+src_install() {
+   default
+   find "${D}" -type f -name '*.la' -delete || die
+
+   if use perl; then
+   find "${ED}" -type f -name perllocal.pod -delete || die
+   find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
+   fi
+}