[gentoo-commits] repo/gentoo:master commit in: x11-libs/libcompizconfig/files/, x11-libs/libcompizconfig/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libcompizconfig/files/, x11-libs/libcompizconfig/

[Ettore Di Giacinto]

commit:     bd78c96a0f8b4b391e0667b019af74f2051b7319
Author:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 16:20:34 2017 +0000
Commit:     Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 16:55:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd78c96a

x11-libs/libcompizconfig: revbump, fixes bug #602286

* backport patch to fix compilation bug
* EAPI bump

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602286

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...fig-0.8.8-avoid-using-templates-in-c-code.patch | 35 ++++++++++++++++++++++
 ....8.8.ebuild => libcompizconfig-0.8.8-r1.ebuild} |  7 +++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
new file mode 100644
index 0000000000..498a4bfa4d
--- /dev/null
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
@@ -0,0 +1,35 @@
+From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001
+From: Scott Moreau <oreaus@gmail.com>
+Date: Wed, 9 Dec 2015 12:51:12 -0700
+Subject: [PATCH] Avoid using templates in C code
+
+libxslt uses templates and we cannot use templates in C code. Move the headers
+using templates outside extern "C" clause.
+---
+ src/compiz.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/compiz.cpp b/src/compiz.cpp
+index 43da02f..e5aba0f 100644
+--- a/src/compiz.cpp
++++ b/src/compiz.cpp
+@@ -23,6 +23,9 @@
+ #include <google/protobuf/io/zero_copy_stream_impl.h>
+ #endif
+ 
++#include <libxslt/transform.h>
++#include <libxslt/xsltutils.h>
++
+ extern "C"
+ {
+ #ifdef HAVE_CONFIG_H
+@@ -36,9 +39,6 @@ extern "C"
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
+-#include <libxslt/transform.h>
+-#include <libxslt/xsltutils.h>
+-
+ #include <locale.h>
+ 
+ #include <compiz-core.h>

diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
similarity index 83%
rename from x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild
rename to x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
index ce55678d2d..fbc67240c0 100644
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 inherit eutils
 
 DESCRIPTION="Compiz Configuration System"
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+#602286
+PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" )
+
 src_configure() {
 	econf \
 		--enable-fast-install \

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libcompizconfig/files/, x11-libs/libcompizconfig/

[Mikle Kolyada]

commit:     c3523c565f98a934738d5f9367ae0a2206c3dddc
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 22:36:54 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 22:37:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3523c56

x11-libs/libcompizconfig: remove last rited package

 x11-libs/libcompizconfig/Manifest                  |  1 -
 ...fig-0.8.8-avoid-using-templates-in-c-code.patch | 35 -------------------
 .../libcompizconfig-0.8.8-r1.ebuild                | 40 ----------------------
 x11-libs/libcompizconfig/metadata.xml              |  6 ----
 4 files changed, 82 deletions(-)

diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
deleted file mode 100644
index dcd9e11c5dd..00000000000
--- a/x11-libs/libcompizconfig/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libcompizconfig-0.8.8.tar.bz2 318176 BLAKE2B f0c5d8fc8749b1c5682a531c9aee8acc16988c3d3d8247558676c97134cd0d9d5bbcd7c2715610109468e7a149801cc64522bd3f8db8619121d69c0a76d72838 SHA512 1ba2f6143870d981e174c47fddb9fdd072a1c64a5a5f07779bd6261767a2c1a7612bdcb3f62a76c203f4ab630542c8ae750fff3ec30a0305f8851584c6a5d6bb

diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
deleted file mode 100644
index 498a4bfa4d1..00000000000
--- a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001
-From: Scott Moreau <oreaus@gmail.com>
-Date: Wed, 9 Dec 2015 12:51:12 -0700
-Subject: [PATCH] Avoid using templates in C code
-
-libxslt uses templates and we cannot use templates in C code. Move the headers
-using templates outside extern "C" clause.
----
- src/compiz.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/compiz.cpp b/src/compiz.cpp
-index 43da02f..e5aba0f 100644
---- a/src/compiz.cpp
-+++ b/src/compiz.cpp
-@@ -23,6 +23,9 @@
- #include <google/protobuf/io/zero_copy_stream_impl.h>
- #endif
- 
-+#include <libxslt/transform.h>
-+#include <libxslt/xsltutils.h>
-+
- extern "C"
- {
- #ifdef HAVE_CONFIG_H
-@@ -36,9 +39,6 @@ extern "C"
- #include <sys/stat.h>
- #include <errno.h>
- 
--#include <libxslt/transform.h>
--#include <libxslt/xsltutils.h>
--
- #include <locale.h>
- 
- #include <compiz-core.h>

diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
deleted file mode 100644
index a7fc1f91996..00000000000
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Compiz Configuration System"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/protobuf
-	>=x11-wm/compiz-${PV}
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-RESTRICT="test"
-
-#602286
-PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" )
-
-src_configure() {
-	econf \
-		--enable-fast-install \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc TODO
-	prune_libtool_files --all
-}

diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
deleted file mode 100644
index 30804a86277..00000000000
--- a/x11-libs/libcompizconfig/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
-</pkgmetadata>