From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-608359-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id A8B211381F3
for <garchives@archives.gentoo.org>; Wed, 10 Jul 2013 16:02:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 706BCE09DB;
Wed, 10 Jul 2013 16:02:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 003ECE09DB
for <gentoo-commits@lists.gentoo.org>; Wed, 10 Jul 2013 16:02:03 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D661533E8A0
for <gentoo-commits@lists.gentoo.org>; Wed, 10 Jul 2013 16:02:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 6EBB9E468F
for <gentoo-commits@lists.gentoo.org>; Wed, 10 Jul 2013 16:02:01 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1373471973.46d59e4fbb34740a30b263e90e5d27ae01fd4eb9.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/gnome-chemistry-utils/files/, sci-chemistry/gnome-chemistry-utils/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-chemistry/gnome-chemistry-utils/ChangeLog sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
X-VCS-Directories: sci-chemistry/gnome-chemistry-utils/files/ sci-chemistry/gnome-chemistry-utils/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 46d59e4fbb34740a30b263e90e5d27ae01fd4eb9
X-VCS-Branch: master
Date: Wed, 10 Jul 2013 16:02:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2e0b1b50-cd93-46f9-b2b5-77a3c545cb08
X-Archives-Hash: 60c2f519ff0c7843dba9a7b068dcac44
commit: 46d59e4fbb34740a30b263e90e5d27ae01fd4eb9
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 15:59:33 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 15:59:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=46d59e4f
sci-chemistry/gnome-chemistry-utils: Add live ebuild, fix extern C problems, #474498 and https://github.com/gentoo-science/sci/issues/84
Package-Manager: portage-2.2.0_alpha188
---
sci-chemistry/gnome-chemistry-utils/ChangeLog | 8 +++
.../gnome-chemistry-utils-0.14.2-extern-c.patch | 84 ++++++++++++++++++++++
.../gnome-chemistry-utils-0.14.2.ebuild | 12 +++-
....2.ebuild => gnome-chemistry-utils-9999.ebuild} | 19 +++--
4 files changed, 116 insertions(+), 7 deletions(-)
diff --git a/sci-chemistry/gnome-chemistry-utils/ChangeLog b/sci-chemistry/gnome-chemistry-utils/ChangeLog
index f45e5bf..d08eb82 100644
--- a/sci-chemistry/gnome-chemistry-utils/ChangeLog
+++ b/sci-chemistry/gnome-chemistry-utils/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*gnome-chemistry-utils-9999 (10 Jul 2013)
+
+ 10 Jul 2013; Justin Lecher <jlec@gentoo.org>
+ gnome-chemistry-utils-0.14.2.ebuild, +gnome-chemistry-utils-9999.ebuild,
+ +files/gnome-chemistry-utils-0.14.2-extern-c.patch:
+ Add live ebuild, fix extern C problems, #474498 and
+ https://github.com/gentoo-science/sci/issues/84
+
21 Jun 2013; Justin Lecher <jlec@gentoo.org>
gnome-chemistry-utils-0.14.2.ebuild, metadata.xml:
Fix min version of openbabel
diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
new file mode 100644
index 0000000..f505af9
--- /dev/null
+++ b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.2-extern-c.patch
@@ -0,0 +1,84 @@
+ goffice/gchemutils-priv.h | 2 +-
+ goffice/gchemutils.cc | 7 ++++---
+ goffice/gchemutils.h | 6 +++---
+ goffice/gogcuapp.h | 2 +-
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/goffice/gchemutils-priv.h b/goffice/gchemutils-priv.h
+index 480e1a5..deb9687 100644
+--- a/goffice/gchemutils-priv.h
++++ b/goffice/gchemutils-priv.h
+@@ -23,12 +23,12 @@
+ #ifndef GOFFICE_GCHEMUTILS_PRIV_H
+ #define GOFFICE_GCHEMUTILS_PRIV_H
+
+-#include "gchemutils.h"
+ #include <gcu/chem3ddoc.h>
+ #include <gcu/structs.h>
+ #include <gogcuapp.h>
+ #include <gcu/document.h>
+ #include <gcugtk/window.h>
++#include "gchemutils.h"
+
+ struct _GOGChemUtilsComponent
+ {
+diff --git a/goffice/gchemutils.cc b/goffice/gchemutils.cc
+index 2aa85b5..a477b13 100644
+--- a/goffice/gchemutils.cc
++++ b/goffice/gchemutils.cc
+@@ -20,6 +20,10 @@
+ * USA
+ */
+
++#include <map>
++#include <string>
++#include <cstring>
++
+ #include "config.h"
+ #include "gchemutils-priv.h"
+ #include "gogcpapp.h"
+@@ -31,9 +35,6 @@
+ #include <goffice/app/module-plugin-defs.h>
+ #include <goffice/component/go-component-factory.h>
+ #include <glib/gi18n-lib.h>
+-#include <map>
+-#include <string>
+-#include <cstring>
+
+ //gcuGOfficeApplication *app;
+
+diff --git a/goffice/gchemutils.h b/goffice/gchemutils.h
+index 2f62aa5..8e6acb9 100644
+--- a/goffice/gchemutils.h
++++ b/goffice/gchemutils.h
+@@ -23,12 +23,12 @@
+ #ifndef GOFFICE_GCHEMPAINT_H
+ #define GOFFICE_GCHEMPAINT_H
+
+-#include <goffice/component/goffice-component.h>
+-#include <goffice/component/go-component.h>
+-
+ extern "C"
+ {
+
++#include <goffice/component/goffice-component.h>
++#include <goffice/component/go-component.h>
++
+ typedef struct _GOGChemUtilsComponent GOGChemUtilsComponent;
+
+ typedef GOComponentClass GOGChemUtilsComponentClass;
+diff --git a/goffice/gogcuapp.h b/goffice/gogcuapp.h
+index 0012931..0cad715 100644
+--- a/goffice/gogcuapp.h
++++ b/goffice/gogcuapp.h
+@@ -23,9 +23,9 @@
+ #ifndef GO_GCU_APP_H
+ #define GO_GCU_APP_H
+
+-#include "gchemutils.h"
+ #include <gcu/structs.h>
+ #include <string>
++#include "gchemutils.h"
+
+ namespace gcu {
+ class Document;
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
index e0d8c6a..a761252 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
@@ -5,12 +5,11 @@
EAPI="5"
GCONF_DEBUG="no"
-inherit gnome2 versionator
+inherit eutils gnome2 versionator
DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
HOMEPAGE="http://gchemutils.nongnu.org/"
SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(get_version_component_range 1-2)/${P}.tar.bz2"
-RESTRICT="mirror"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -34,6 +33,15 @@ DEPEND="
virtual/pkgconfig
app-doc/doxygen"
+RESTRICT="mirror"
+
+PATCHES=( "${FILESDIR}"/${P}-extern-c.patch )
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ gnome2_src_prepare
+}
+
src_configure() {
local myeconfargs=(
$(use_enable nls)
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
similarity index 76%
copy from sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
copy to sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
index e0d8c6a..b6a74ef 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.2.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-9999.ebuild
@@ -5,20 +5,20 @@
EAPI="5"
GCONF_DEBUG="no"
-inherit gnome2 versionator
+inherit autotools flag-o-matic gnome2 versionator subversion
DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(get_version_component_range 1-2)/${P}.tar.bz2"
-RESTRICT="mirror"
+SRC_URI=""
+ESVN_REPO_URI="svn://svn.savannah.nongnu.org/gchemutils/trunk/gchemutils"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
LICENSE="GPL-3 FDL-1.3"
IUSE="gnumeric nls"
RDEPEND="
- >=dev-libs/glib-2.26.0:2
+ >=dev-libs/glib-2.36.0:2
>=dev-libs/libxml2-2.4.16:2
>=gnome-extra/libgsf-1.14.9
>=sci-chemistry/bodr-5
@@ -34,6 +34,15 @@ DEPEND="
virtual/pkgconfig
app-doc/doxygen"
+RESTRICT="mirror"
+
+ESVN_BOOTSTRAP="eautoreconf"
+
+src_prepare() {
+ subversion_src_prepare
+ gnome2_src_prepare
+}
+
src_configure() {
local myeconfargs=(
$(use_enable nls)