Sync with portage [Sun Jul 1 15:39:15 MSK 2012].

mhiretskiy
root 12 years ago
parent 4f39f6674f
commit 2199895de7

@ -1,3 +1,2 @@
DIST java-access-bridge-1.24.2.tar.bz2 284738 RMD160 e3c682b8ac8f36fb4dd05fc9bc88481e54905aca SHA1 bad965e3e79f2d489181b2638c825b2c4c09740d SHA256 ebe4d299657d757f0841c870d9f975975979ad5fc921171bd37de95d6c3f5960
DIST java-access-bridge-1.26.0.tar.bz2 284756 RMD160 875d31e1640ce42a067307b3a8002ffb425d25fe SHA1 e8d577ba7946bd60ddc2b2a65b713521dd30e160 SHA256 bcd12f011ecaff0ec850f772b6691c9ce8b4f1070a7c2ae2a7b5af00e73c2cef
DIST java-access-bridge-1.6.0.tar.bz2 122911 RMD160 22112f8c3a2faa1acae054a4dce09cfe09d757f0 SHA1 947bd364214c01a6e6ba947a5b39a3e0fc9236ac SHA256 9a5ac1b59d2a0185fad08ca665a72b06b6fea69e583d5d995fc97c0e46fca520
DIST java-access-bridge-1.26.2.tar.bz2 311663 RMD160 e5e2722e33704b55807607f7588fbd9ad24accf8 SHA1 5f08bba19531954cec82df1bcdb89df67ee890a4 SHA256 a0ede71f282c8dab9fecf60abdf6a45ffa3552a9dfe6533a55011cbc34f653d8

@ -1,12 +1,15 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.24.2.ebuild,v 1.4 2012/05/21 23:17:23 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild,v 1.1 2012/06/30 18:05:43 pacho Exp $
EAPI=4
GNOME_TARBALL_SUFFIX="bz2"
GNOME2_LA_PUNT="yes"
EAPI="2"
inherit java-pkg-2 gnome2 eutils autotools
DESCRIPTION="Gnome Java Accessibility Bridge"
HOMEPAGE="http://developer.gnome.org/projects/gap/"
HOMEPAGE="https://live.gnome.org/Java%20Access%20Bridge/"
LICENSE="LGPL-2"
SLOT="0"
@ -14,7 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEPEND=">=gnome-base/libbonobo-2
>=gnome-extra/at-spi-1.7.10:1"
>=gnome-extra/at-spi-1.7.10:1
x11-apps/xprop"
RDEPEND="$COMMON_DEPEND
>=virtual/jre-1.4"
@ -33,7 +37,8 @@ src_prepare() {
pkg_setup() {
java-pkg-2_pkg_setup
G2CONF="--with-java-home=${JDK_HOME}"
G2CONF+="--disable-static
--with-java-home=${JDK_HOME}"
}
src_configure() {
@ -41,7 +46,7 @@ src_configure() {
}
src_compile() {
emake JAVAC="${JAVAC} ${JAVACFLAGS}" || die "compile failure"
emake JAVAC="${JAVAC} ${JAVACFLAGS}"
}
src_install() {
@ -61,8 +66,6 @@ pkg_preinst() {
}
pkg_postinst() {
elog
elog "The Java Accessibility Bridge for GNOME has been installed."
elog
elog "To enable accessibility support with your java applications, you"
elog "have to enable CORBA traffic over IP. To do this, you may add the"

@ -1,73 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0-r2.ebuild,v 1.4 2012/05/21 23:17:23 vapier Exp $
EAPI="2"
inherit java-pkg-2 gnome2 eutils autotools
DESCRIPTION="Gnome Java Accessibility Bridge"
HOMEPAGE="http://developer.gnome.org/projects/gap/"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEPEND=">=gnome-base/libbonobo-2
>=gnome-extra/at-spi-1.7.10:1"
RDEPEND="$COMMON_DEPEND
>=virtual/jre-1.4"
DEPEND="$COMMON_DEPEND
>=virtual/jdk-1.4
virtual/pkgconfig"
DOCS="AUTHORS ChangeLog NEWS README"
src_prepare() {
java-pkg-2_src_prepare
epatch "${FILESDIR}"/${P}-missingclasses.patch
eautoreconf
}
pkg_setup() {
java-pkg-2_pkg_setup
G2CONF="--with-java-home=${JDK_HOME}"
}
src_configure() {
gnome2_src_configure
}
src_compile() {
emake JAVAC="${JAVAC} ${JAVACFLAGS}" || die "compile failure"
}
src_install() {
gnome2_src_install
java-pkg_dojar "${D}"/usr/share/jar/*.jar
insinto /usr/share/${PN}
doins "${D}"/usr/share/jar/*.properties
rm -rf "${D}"/usr/share/jar
}
pkg_preinst() {
java-pkg-2_pkg_preinst
gnome2_pkg_preinst
}
pkg_postinst() {
elog
elog "The Java Accessibility Bridge for GNOME has been installed."
elog
elog "To enable accessibility support with your java applications, you"
elog "have to enable CORBA traffic over IP. To do this, you may add the"
elog "following line to your /etc/orbitrc or ~/.orbitrc file:"
elog
elog " ORBIIOPIPv4=1"
elog
}

@ -1,56 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.6.0.ebuild,v 1.12 2012/05/03 01:48:59 jdhore Exp $
EAPI="2"
inherit java-pkg-2 gnome2
DESCRIPTION="Gnome Java Accessibility Bridge"
HOMEPAGE="http://developer.gnome.org/projects/gap/"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
COMMON_DEPEND=">=gnome-base/libbonobo-2
>=gnome-extra/at-spi-1.7.10:1"
RDEPEND="$COMMON_DEPEND
>=virtual/jre-1.4"
DEPEND="$COMMON_DEPEND
>=virtual/jdk-1.4
virtual/pkgconfig"
DOCS="AUTHORS ChangeLog NEWS README"
pkg_setup() {
java-pkg-2_pkg_setup
G2CONF="--with-java-home=${JDK_HOME}"
}
src_install() {
gnome2_src_install
java-pkg_dojar "${D}"/usr/share/jar/*.jar
insinto /usr/share/${PN}
doins "${D}"/usr/share/jar/*.properties
rm -rf "${D}"/usr/share/jar
}
pkg_postinst() {
elog
elog "The Java Accessibility Bridge for GNOME has been installed."
elog
elog "To enable accessibility support with your java applications, you"
elog "have to enable CORBA traffic over IP. To do this, you may add the"
elog "following line to your /etc/orbitrc or ~/.orbitrc file:"
elog
elog " ORBIIOPIPv4=1"
elog
}

@ -4,6 +4,12 @@
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
<maintainer>
<email>daniel@constexpr.org</email>
<name>Daniel Scharrer</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
</pkgmetadata>

@ -1,28 +1,29 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-dicts/eblook/eblook-1.6.1.ebuild,v 1.6 2012/04/25 16:08:25 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-dicts/eblook/eblook-1.6.1.ebuild,v 1.7 2012/07/01 09:57:13 jlec Exp $
IUSE=""
EAPI=4
DESCRIPTION="EBlook is an interactive search utility for electronic dictionaries"
DESCRIPTION="Interactive search utility for electronic dictionaries"
HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/"
SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ppc"
IUSE=""
DEPEND=">=dev-libs/eb-3.3.4"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${P%_*}"
src_compile() {
econf --with-eb-conf=/etc/eb.conf
emake || die
src_prepare() {
sed \
-e 's:LDFAGS:LDFLAGS:g' \
-i configure || die
}
src_install() {
make DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog INSTALL NEWS README VERSION
src_configure() {
econf --with-eb-conf=/etc/eb.conf
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.1.ebuild,v 1.4 2012/05/03 19:24:27 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.1.ebuild,v 1.5 2012/07/01 07:58:19 qiaomuf Exp $
EAPI="3"
@ -16,7 +16,12 @@ KEYWORDS="~amd64 ~x86"
IUSE="gtk gtk3"
RDEPEND="dev-libs/glib:2
x11-libs/gtk+:2"
gtk? (
x11-libs/gtk+:2
)
gtk3? (
x11-libs/gtk+:3
)"
DEPEND="${RDEPEND}
app-arch/xz-utils
~app-i18n/fcitx-4.2.1

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.4.ebuild,v 1.1 2012/06/07 06:34:03 qiaomuf Exp $
# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-configtool/fcitx-configtool-0.4.4.ebuild,v 1.2 2012/07/01 07:58:19 qiaomuf Exp $
EAPI="3"
@ -16,7 +16,12 @@ KEYWORDS="~amd64 ~x86"
IUSE="gtk gtk3"
RDEPEND="dev-libs/glib:2
x11-libs/gtk+:2"
gtk? (
x11-libs/gtk+:2
)
gtk3? (
x11-libs/gtk+:3
)"
DEPEND="${RDEPEND}
app-arch/xz-utils
~app-i18n/fcitx-4.2.4

@ -1,26 +1,32 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild,v 1.15 2009/11/24 19:29:06 darkside Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/dvorak7min/dvorak7min-1.6.1.ebuild,v 1.16 2012/07/01 09:49:58 jlec Exp $
EAPI=4
inherit toolchain-funcs
DESCRIPTION="simple ncurses-based typing tutor for learning the Dvorak keyboard layout"
DESCRIPTION="Simple ncurses-based typing tutor for learning the Dvorak keyboard layout"
HOMEPAGE="http://www.linalco.com/comunidad.html"
SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_prepare() {
emake clean
}
src_compile() {
make clean
emake CC="$(tc-getCC)" \
emake \
CC="$(tc-getCC)" \
PROF="${CFLAGS}" \
|| die "emake failed"
LDFLAGS="${LDFLAGS}"
}
src_install() {
dobin dvorak7min || die "dobin failed"
dobin ${PN}
dodoc ChangeLog README
}

@ -1,3 +1,4 @@
DIST gramps-3.2.5.tar.gz 7300072 RMD160 e474f2bd2d861babe3512004a8a16eecd337db3c SHA1 80f6284af8fd1290b16f6db17d4867e4a6e027d4 SHA256 6cb97629913cb48e7804d35099813b86727c15b82b6f7a6438fe01935fc8dba2
DIST gramps-3.2.6.tar.gz 7340674 RMD160 dcea12b7adb86cd4c213eb10afcb1c4649281433 SHA1 0e3343921400758668158bbfa072b37a702ea1b9 SHA256 66db9727e6aa7d65d6b4f798348c7b41b60f0eb4e06a8b8ae5b1f04cc6bdb0ec
DIST gramps-3.3.1.tar.gz 8793331 RMD160 52bf70fa49de5fcec8d6c917312eaa8bca9cb264 SHA1 76d062268bf48d90fc3d8003dffd7947af393147 SHA256 b186e539e571eebcd077b9684b9e8f8e30e77e1d63ad5b58d18b4b0d6c772375
DIST gramps-3.4.0.tar.gz 9470815 RMD160 8a323a2d3e366d9911282f7e9fbc2a2952a75de3 SHA1 6eec8629807ed84d196d83c43d0c20abd9cda544 SHA256 4d029c4f3d3ffd369cbf3859f86f3602ce97a038ed6238b9811d0bf3cd15acf0

@ -0,0 +1,11 @@
--- src/config.py.orig 2012-06-02 07:05:21.479670747 +0200
+++ src/config.py 2012-06-02 07:05:58.444713800 +0200
@@ -302,7 +302,7 @@
register('preferences.use-last-view', True)
register('preferences.last-view', '')
register('preferences.last-views', [])
-register('preferences.use-bsddb3', False)
+register('preferences.use-bsddb3', True)
register('preferences.family-relation-type', 3) # UNKNOWN
register('researcher.researcher-addr', '')

@ -0,0 +1,91 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.4.0.ebuild,v 1.1 2012/06/30 16:59:23 fauli Exp $
EAPI=3
PYTHON_DEPEND="2:2.6"
GCONF_DEBUG="no"
inherit eutils gnome2 python
DESCRIPTION="Genealogical Research and Analysis Management Programming System"
HOMEPAGE="http://www.gramps-project.org/"
SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="gnome reports spell webkit"
RDEPEND="dev-python/bsddb3
>=dev-python/pygtk-2.16.0
dev-python/pygoocanvas
x11-misc/xdg-utils
gnome-base/librsvg:2
gnome? ( dev-python/libgnome-python
dev-python/gconf-python )
spell? ( dev-python/gtkspell-python )
reports? ( media-gfx/graphviz )
webkit? ( dev-python/pywebkitgtk )"
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/libiconv
virtual/pkgconfig"
DOCS="NEWS README TODO"
pkg_setup() {
G2CONF="${G2CONF} --disable-mime-install PYTHON="${EROOT}"/usr/bin/python2"
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
gnome2_src_prepare
epatch "${FILESDIR}/${P}-use_bsddb3.patch"
# This is for bug 215944, so .pyo/.pyc files don't get into the
# file system
mv "${S}"/py-compile "${S}"/py-compile.orig
ln -s $(type -P true) "${S}"/py-compile
# Fix install path, bug 423315 for example
einfo "Fix installation path"
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
find . -iname 'Makefile.in' | xargs \
sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
|| die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/Makefile.in || die
sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
-i src/docgen/Makefile.in || die
einfo "Fix wrapper script"
sed "s;@datadir@;$(python_get_sitedir);" \
-i gramps.sh.in || die
einfo "Fix icon location"
sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
}
src_install() {
python_need_rebuild
gnome2_src_install
}
pkg_postinst() {
gnome2_pkg_postinst
python_mod_optimize ${PN}
}
pkg_postrm() {
gnome2_pkg_postrm
python_mod_cleanup ${PN}
}

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index eca7a05..b5ac45c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_INIT([Kanatest], [0.4.8], [pasp@users.sf.net])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
AC_CONFIG_SRCDIR([src/about.c])
AC_CONFIG_HEADER([config.h])

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.8.ebuild,v 1.8 2012/05/03 19:41:35 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/kanatest/kanatest-0.4.8.ebuild,v 1.9 2012/07/01 00:32:15 naota Exp $
EAPI="1"
@ -24,7 +24,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}+gtk-2.22.patch
epatch "${FILESDIR}"/${P}+gtk-2.22.patch \
"${FILESDIR}"/${P}-autoconf.patch
eautoreconf
}

@ -1,2 +1,2 @@
DIST dia2code-0.8.1.tar.gz 71453 RMD160 522e48761a4779fd9af9752fd46d8b3ed4717615 SHA1 5d72a23e82208e789ef1ecceee80edfb8813025b SHA256 af4a086753558ff5af436c3c1e870703cf455831517cd43ac3dacb7d6c0205a3
DIST dia2code-0.8.3.tar.gz 133043 RMD160 6db53298445a864e3895edd469713db24692f4aa SHA1 9a3e3fb766928ad4cf59d97cdfa099bbdd5801af SHA256 60d7d9e61ce0fe997cbcd9901a35d0dac4346e11f092c8277151cd2a3bed11b4
DIST dia2code-0.8.4.tar.gz 156221 RMD160 3653371f2b9bb77b3a862ea8e1beefea63ec2bfe SHA1 ca967d358e659ad77d3a72fbb9769f73825b5037 SHA256 d4fc86d8d6e0894d81b82bbd96a40f9c07a65e8554f736245799745dff34feb2

@ -1,8 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.1.ebuild,v 1.18 2009/09/23 16:09:58 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.4.ebuild,v 1.1 2012/06/30 17:44:41 pacho Exp $
inherit flag-o-matic
EAPI=4
inherit flag-o-matic autotools
DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours."
HOMEPAGE="http://dia2code.sourceforge.net/"
@ -10,22 +12,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ia64 ppc sparc x86"
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND="dev-libs/libxml2"
RDEPEND="${DEPEND}
>=app-office/dia-0.90.0"
src_compile () {
# libxml2 header fix
append-flags -I/usr/include/libxml2/libxml
econf || die
emake || die
src_prepare() {
eautoreconf # Needed to prevent maintainer-mode to get activated
}
src_install() {
make DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog README TODO
default
doman dia2code.1
}

@ -1,3 +1,2 @@
DIST grisbi-0.6.0rc2.tar.bz2 1946861 RMD160 b3253a03019c39c8a2ba26eb21d7e30719f4d70a SHA1 a6d0984058af45602f8f1c94507bcbf110218367 SHA256 4f590468f74aae312cb4e36021bd37f68a23c26cc7619040d8363e88157768ab
DIST grisbi-0.8.2.tar.bz2 1873004 RMD160 dc1ec637cde4fec5af26a8402ddf89b6150f9038 SHA1 a6ce95696f896c0eadbd3dafec795b39b0e656ea SHA256 d0f62fdbfbaec3863fc1f34e55198fc5564377ad9939a08d864de6019cfd0946
DIST grisbi-0.8.8.tar.bz2 1905934 RMD160 43937d66a4527b1da28bbc566fe6c0773994ec52 SHA1 c7843ac37cea66d3dd8ebac79bc3a2561a633b8b SHA256 7c69fbdff557c4b82de0b878fc2b7f6c93ab9abd72351eabbdecc9be4d78946f
DIST grisbi-0.8.9.tar.bz2 1923855 RMD160 8d7e6705bfb2c0d249b9c71deffbe718483af04b SHA1 97cfa19f3fc288ca8a7ba4c3f36c247835621d4c SHA256 ea01522bc4fa34bc0ba4b94324c15218f3d79d4a5cfcd44f87a2ef8eed101080

@ -1,38 +0,0 @@
From ad49bfcb6a29dda93170ea14c38d599df2bbf72d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
Date: Sun, 14 Feb 2010 21:39:50 +0100
Subject: [PATCH 1/2] properly detect gmodule
This usually doesn't happen unless gcc is configured to force
--as-needed through spec files.
---
configure.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.in b/configure.in
index 972fbc2..e2e84ce 100644
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ AC_CHECK_LIB(intl,main)
dnl
dnl Standard GTK checks
dnl
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2)
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2])
LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
@@ -44,8 +44,8 @@ dnl
AC_MSG_CHECKING(whether GLib supports loadable modules)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$GLIB_LIBS $LIBS"
+CFLAGS="$CFLAGS $GTK_CFLAGS"
+LIBS="$GTK_LIBS $LIBS"
AC_TRY_RUN([
#include <glib.h>
#include <gmodule.h>
--
1.6.6.1

@ -1,25 +0,0 @@
From 3af09ff549167fd9de721f1434422faa9969645d Mon Sep 17 00:00:00 2001
From: pbiava <pierre.biava@nerim.net>
Date: Wed, 23 Feb 2011 20:34:30 +0100
Subject: [PATCH 1/5] fixes bug 1289
---
src/etats_config.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/etats_config.c b/src/etats_config.c
index 9db2da3..9bf8e7d 100644
--- a/src/etats_config.c
+++ b/src/etats_config.c
@@ -5576,7 +5576,7 @@ GtkWidget *cree_ligne_comparaison_montant ( gint amount_comparison_number )
/* on crée alors le bouton de lien */
- widget = cree_bouton_lien ( widget );
+ widget = cree_bouton_lien ( widget_1 );
gtk_box_pack_start ( GTK_BOX ( hbox ),
widget,
FALSE,
--
1.7.4

@ -1,25 +0,0 @@
From 3aeefce5f46ae6989cc6a9c2569af895a9a00659 Mon Sep 17 00:00:00 2001
From: pbiava <pierre.biava@nerim.net>
Date: Thu, 24 Feb 2011 23:07:02 +0100
Subject: [PATCH 2/5] fixes a crash when importing a file without extension
---
src/import.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/import.c b/src/import.c
index 44802bf..1d5ceeb 100644
--- a/src/import.c
+++ b/src/import.c
@@ -681,7 +681,7 @@ gboolean import_select_file ( GtkWidget * button, GtkWidget * assistant )
extension = strrchr ( iterator -> data, '.' );
/* unzip Gnucash file if necessary */
- if ( strcmp ( extension, ".gnc" ) == 0 )
+ if ( extension && strcmp ( extension, ".gnc" ) == 0 )
gsb_import_gunzip_file ( iterator -> data );
/* get contents of file */
--
1.7.4

@ -1,38 +0,0 @@
From 63b110a42e88e2b06c0ff432df0282db395cef17 Mon Sep 17 00:00:00 2001
From: pbiava <pierre.biava@nerim.net>
Date: Fri, 25 Feb 2011 20:56:03 +0100
Subject: [PATCH 3/5] fixes bug 1293 : Problem of updating of the pointing balance
---
src/gsb_form.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/gsb_form.c b/src/gsb_form.c
index fc81b59..e66c7c2 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -105,6 +105,7 @@ static gboolean gsb_form_validate_form_transaction ( gint transaction_number,
/*START_EXTERN*/
extern GdkColor calendar_entry_color;
+extern gint mise_a_jour_liste_comptes_accueil;
extern GtkWidget *navigation_tree_view;
extern gsb_real null_real;
extern GtkWidget *window;
@@ -2660,7 +2661,12 @@ gboolean gsb_form_finish_edition ( void )
if ( is_transaction )
{
affiche_dialogue_soldes_minimaux ();
- update_transaction_in_trees (transaction_number);
+ update_transaction_in_trees ( transaction_number );
+ if ( gsb_data_transaction_get_marked_transaction ( transaction_number ) == OPERATION_POINTEE )
+ {
+ gsb_navigation_update_statement_label ( account_number );
+ mise_a_jour_liste_comptes_accueil = 1;
+ }
}
/* as we modify or create a transaction, we invalidate the current report */
--
1.7.4

@ -1,682 +0,0 @@
From 5e25d0add90786446d6083ac46c8f374ae1463cc Mon Sep 17 00:00:00 2001
From: pbiava <pierre.biava@nerim.net>
Date: Fri, 25 Feb 2011 21:33:51 +0100
Subject: [PATCH 4/5] fix memory leaks thanks Philippe D.
---
src/bet_data.c | 199 +++++++++++++++++++++++++++++++-----------
src/gsb_assistant_account.c | 1 +
src/gsb_file_config.c | 3 +
src/gsb_file_load.c | 3 +
src/gsb_select_icon.c | 12 ++-
src/import.c | 5 +-
src/import_csv.c | 3 +
src/utils.c | 1 +
src/utils_dates.c | 5 +-
src/utils_editables.c | 3 +
src/utils_files.c | 3 +-
src/utils_str.c | 11 ++-
12 files changed, 188 insertions(+), 61 deletions(-)
diff --git a/src/bet_data.c b/src/bet_data.c
index 0c9f7e5..fbc25d7 100644
--- a/src/bet_data.c
+++ b/src/bet_data.c
@@ -264,13 +264,19 @@ gboolean bet_data_hist_add_div ( gint account_number,
{
gchar *key;
gchar *sub_key;
+ gchar *div_number_str, *account_number_str; // only to avoid memory leaks
struct_hist_div *shd;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_number ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_number_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
+ g_free ( account_number_str );
+ }
+ g_free ( div_number_str );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -342,13 +348,19 @@ void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd )
{
gchar *key;
gchar *sub_key;
+ gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *tmp_shd;
+ div_number_str = utils_str_itoa ( shd -> div_number );
if ( shd -> account_nb == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( shd -> div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( shd -> account_nb ), ":",
- utils_str_itoa ( shd -> div_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( shd -> account_nb );
+ key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( div_number_str );
if ( ( tmp_shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -383,13 +395,19 @@ gboolean bet_data_remove_div_hist ( gint account_number, gint div_number, gint s
{
gchar *key;
char *sub_key;
+ gchar *div_number_str, *account_number_str; // only to avoid memory leaks
struct_hist_div *shd;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_number ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_number_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
+ g_free ( account_number_str );
+ }
+ g_free ( div_number_str );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -418,14 +436,20 @@ gboolean bet_data_search_div_hist ( gint account_number, gint div_number, gint s
{
gchar *key;
gchar *sub_key;
+ gchar *div_number_str, *account_number_str; // only to avoid memory leaks
gint origin;
struct_hist_div *shd;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_number ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_number_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
+ g_free ( account_number_str );
+ }
+ g_free ( div_number_str );
origin = gsb_data_account_get_bet_hist_data ( account_number );
@@ -539,15 +563,21 @@ gchar *bet_data_get_div_name ( gint div_num,
gboolean bet_data_get_div_edited ( gint account_number, gint div_number, gint sub_div_nb )
{
gchar *key;
+ gchar *div_number_str, *account_number_str; // only to avoid memory leaks
gint origin;
struct_hist_div *shd;
gboolean edited;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_number ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_number_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
+ g_free ( account_number_str );
+ }
+ g_free ( div_number_str );
origin = gsb_data_account_get_bet_hist_data ( account_number );
@@ -589,13 +619,19 @@ gboolean bet_data_set_div_edited ( gint account_nb,
gboolean edited )
{
gchar *key;
+ gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_nb == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( account_nb );
+ key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( div_number_str );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -628,14 +664,20 @@ gboolean bet_data_set_div_edited ( gint account_nb,
gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb )
{
gchar *key;
+ gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
gsb_real amount;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_nb == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( account_nb );
+ key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( div_number_str );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -674,13 +716,19 @@ gboolean bet_data_set_div_amount ( gint account_nb,
gsb_real amount )
{
gchar *key;
+ gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
+ div_number_str = utils_str_itoa ( div_number );
if ( account_nb == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
+ key = g_strconcat ("0:", div_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
- utils_str_itoa ( div_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( account_nb );
+ key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( div_number_str );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -1167,16 +1215,22 @@ void struct_free_bet_future ( struct_futur_data *scheduled )
gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
{
gchar *key;
+ gchar *future_number_str, *account_nb_str; // only to avoid memory leaks
future_number ++;
if ( scheduled -> frequency == 0 )
{
+ future_number_str = utils_str_itoa ( future_number );
if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
+ key = g_strconcat ("0:", future_number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
- utils_str_itoa ( future_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( scheduled -> account_number );
+ key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( future_number_str );
scheduled -> number = future_number;
g_hash_table_insert ( bet_future_list, key, scheduled );
@@ -1196,11 +1250,16 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
date = gsb_date_copy ( scheduled -> date );
while ( date != NULL && g_date_valid ( date ) )
{
+ future_number_str = utils_str_itoa ( future_number );
if ( scheduled -> account_number == 0 )
key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
else
- key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
- utils_str_itoa ( future_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( scheduled -> account_number );
+ key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( future_number_str );
if ( mother_row == future_number )
new_sch = scheduled;
@@ -1236,16 +1295,22 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
gboolean bet_data_future_set_lines_from_file ( struct_futur_data *scheduled )
{
gchar *key;
+ gchar *number_str, *account_nb_str; // only to avoid memory leaks
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( scheduled -> number ), NULL );
- else
- key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
- utils_str_itoa ( scheduled -> number ), NULL );
+ number_str = utils_str_itoa ( scheduled -> number );
+ if ( scheduled -> account_number == 0 )
+ key = g_strconcat ("0:", number_str, NULL );
+ else
+ {
+ account_nb_str = utils_str_itoa ( scheduled -> account_number );
+ key = g_strconcat ( account_nb_str, ":", number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( number_str );
- bet_data_future_set_max_number ( scheduled -> number );
+ bet_data_future_set_max_number ( scheduled -> number );
- g_hash_table_insert ( bet_future_list, key, scheduled );
+ g_hash_table_insert ( bet_future_list, key, scheduled );
return TRUE;
}
@@ -1557,12 +1622,18 @@ GDate *bet_data_array_get_date_max ( gint account_number )
gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
{
gchar *key;
+ gchar *number_str, *account_nb_str; // only to avoid memory leaks
+ number_str = utils_str_itoa ( scheduled -> number );
if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( scheduled -> number ), NULL );
+ key = g_strconcat ("0:", number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( scheduled -> account_number ), ":",
- utils_str_itoa ( scheduled -> number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( scheduled -> account_number );
+ key = g_strconcat ( account_nb_str, ":", number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( number_str );
g_hash_table_replace ( bet_future_list, key, scheduled );
@@ -1582,13 +1653,19 @@ gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number )
{
gchar *key;
+ gchar *number_str, *account_nb_str; // only to avoid memory leaks
struct_futur_data *scheduled;
- if ( account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( number ), NULL );
+ number_str = utils_str_itoa ( number );
+ if ( scheduled -> account_number == 0 )
+ key = g_strconcat ("0:", number_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( account_number ), ":",
- utils_str_itoa ( number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_nb_str, ":", number_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( number_str );
if ( ( scheduled = g_hash_table_lookup ( bet_future_list, key ) ) )
return scheduled;
@@ -1651,14 +1728,20 @@ GHashTable *bet_data_transfert_get_list ( void )
gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert )
{
gchar *key;
+ gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
transfert_number ++;
+ transfert_nb_str = utils_str_itoa ( transfert_number );
if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( transfert_number ), NULL );
+ key = g_strconcat ("0:", transfert_nb_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
- utils_str_itoa ( transfert_number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( transfert -> account_number );
+ key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( transfert_nb_str );
transfert -> number = transfert_number;
g_hash_table_insert ( bet_transfert_list, key, transfert );
@@ -1715,12 +1798,18 @@ gboolean bet_data_transfert_remove_line ( gint account_number, gint number )
gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert )
{
gchar *key;
+ gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
+ transfert_nb_str = utils_str_itoa ( transfert -> number );
if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
+ key = g_strconcat ("0:", transfert_nb_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
- utils_str_itoa ( transfert -> number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( transfert -> account_number );
+ key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( transfert_nb_str );
if ( transfert -> number > transfert_number )
transfert_number = transfert -> number;
@@ -1740,12 +1829,18 @@ gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfer
gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
{
gchar *key;
+ gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
+ transfert_nb_str = utils_str_itoa ( transfert -> number );
if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
+ key = g_strconcat ("0:", transfert_nb_str, NULL );
else
- key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
- utils_str_itoa ( transfert -> number ), NULL );
+ {
+ account_nb_str = utils_str_itoa ( transfert -> account_number );
+ key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
+ g_free ( account_nb_str );
+ }
+ g_free ( transfert_nb_str );
g_hash_table_replace ( bet_transfert_list, key, transfert );
diff --git a/src/gsb_assistant_account.c b/src/gsb_assistant_account.c
index 84f1caf..83eb348 100644
--- a/src/gsb_assistant_account.c
+++ b/src/gsb_assistant_account.c
@@ -498,6 +498,7 @@ void gsb_assistant_account_change_account_icon ( GtkWidget *button, gpointer dat
{
devel_debug ( error -> message );
dialogue_error ( error -> message );
+ g_error_free ( error );
}
else
{
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index 851552c..6dcfb94 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -1540,7 +1540,10 @@ gchar *gsb_config_get_old_conf_name ( void )
}
}
else
+ {
dialogue_error ( error -> message );
+ g_error_free ( error );
+ }
if ( g_slist_length ( liste ) == 0 )
return NULL;
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index f5be275..4c78fb8 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -9027,7 +9027,10 @@ void gsb_file_load_copy_old_file ( gchar *filename, gchar *file_content)
file_copy = g_file_new_for_path ( copy_old_filename );
if ( !g_file_copy ( file_ori, file_copy, G_FILE_COPY_OVERWRITE,
NULL, NULL, NULL, &error ) )
+ {
dialogue_error (error -> message );
+ g_error_free ( error );
+ }
}
}
/* Local Variables: */
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index bbbf6d9..7a75142 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -369,7 +369,10 @@ GtkTreePath * gsb_select_icon_fill_icon_view ( gchar * name_icon )
g_dir_close ( dir );
}
else
+ {
dialogue_error ( error -> message );
+ g_error_free ( error );
+ }
if ( tree_path == NULL )
tree_path = gtk_tree_path_new_from_string ( "0" );
@@ -657,7 +660,10 @@ GdkPixbuf *gsb_select_icon_get_default_logo_pixbuf ( void )
(GRISBI_PIXMAPS_DIR, "grisbi-logo.png", NULL), &error );
if ( ! pixbuf )
+ {
devel_debug ( error -> message );
+ g_error_free ( error );
+ }
if ( gdk_pixbuf_get_width (pixbuf) > LOGO_WIDTH ||
gdk_pixbuf_get_height (pixbuf) > LOGO_HEIGHT )
@@ -890,6 +896,7 @@ gboolean gsb_select_icon_new_account_icon_from_file ( gint account_number,
filename, NULL );
devel_debug ( tmp_str );
dialogue_error ( tmp_str );
+ g_error_free ( error );
g_free ( tmp_str );
g_free ( icon );
@@ -909,13 +916,12 @@ GdkPixbuf *gsb_select_icon_change_account_pixbuf ( gint account_number,
{
GSList *list_tmp;
GdkPixbuf *pixbuf;
- GError *error = NULL;
if ( icon_buffer
&&
icon_buffer -> account_number == account_number )
{
- pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, &error );
+ pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, NULL );
if ( pixbuf )
{
g_object_unref ( icon_buffer -> pixbuf );
@@ -937,7 +943,7 @@ GdkPixbuf *gsb_select_icon_change_account_pixbuf ( gint account_number,
if ( icon -> account_number == account_number )
{
- pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, &error );
+ pixbuf = gdk_pixbuf_new_from_file_at_size ( filename , 32, 32, NULL );
if ( pixbuf )
{
g_object_unref ( icon -> pixbuf );
diff --git a/src/import.c b/src/import.c
index 1d5ceeb..5543aa1 100644
--- a/src/import.c
+++ b/src/import.c
@@ -534,6 +534,7 @@ gboolean import_switch_type ( GtkCellRendererText *cell, const gchar *path,
if ( ! g_file_get_contents ( nom_fichier, &tmp_str, NULL, &error ) )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
+ g_error_free ( error );
return FALSE;
}
@@ -688,6 +689,7 @@ gboolean import_select_file ( GtkWidget * button, GtkWidget * assistant )
if ( ! g_file_get_contents ( iterator -> data, &tmp_str, NULL, &error ) )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
+ g_error_free ( error );
return FALSE;
}
@@ -4386,6 +4388,7 @@ gboolean gsb_import_by_rule ( gint rule )
if ( ! g_file_get_contents ( filename, &pointeur_char, NULL, &error ) )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
+ g_error_free ( error );
i++;
continue;
}
@@ -4677,6 +4680,7 @@ gboolean gsb_import_set_tmp_file ( gchar *filename,
{
g_free (contenu_fichier);
g_print ( _("Unable to create tmp file: %s\n"), error -> message);
+ g_error_free ( error );
return FALSE;
}
@@ -4710,7 +4714,6 @@ gboolean gsb_import_gunzip_file ( gchar *filename )
dialogue_error ( tmpstr );
g_free ( file_content);
g_error_free (error);
-
return FALSE;
}
else
diff --git a/src/import_csv.c b/src/import_csv.c
index 88b1462..4b1707f 100644
--- a/src/import_csv.c
+++ b/src/import_csv.c
@@ -1081,6 +1081,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
if ( ! g_file_get_contents ( filename, &tmp_str, &size, &error ) )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
+ g_error_free ( error );
return FALSE;
}
@@ -1091,6 +1092,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
if ( contents == NULL )
{
+ g_error_free ( error );
error = NULL;
size = 0;
bytes_written = 0;
@@ -1105,6 +1107,7 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
if ( bytes_written == 0 )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
+ g_error_free ( error );
return FALSE;
}
}
diff --git a/src/utils.c b/src/utils.c
index 16361ef..aeb64ef 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -555,6 +555,7 @@ void lance_mailer ( const gchar *uri )
tmp_str = g_strdup_printf ( _("Grisbi was unable to execute a mailer to write at <tt>%s</tt>.\n"
"The error was: %s."),
uri, error -> message );
+ g_error_free ( error );
dialogue_error_hint ( tmp_str, _("Cannot execute mailer") );
g_free(tmp_str);
}
diff --git a/src/utils_dates.c b/src/utils_dates.c
index 4f45bb2..c84118e 100644
--- a/src/utils_dates.c
+++ b/src/utils_dates.c
@@ -79,6 +79,7 @@ gchar *gsb_date_today ( void )
date = gdate_today ( );
date_string = gsb_format_gdate ( date );
gsb_date_set_last_date ( date_string );
+ g_free ( date_string );
g_date_free ( date );
}
return (last_date);
@@ -678,8 +679,10 @@ gchar *gsb_date_get_compiled_time ( void )
date = g_date_new_dmy ( atoi ( tab[1] ), mois, atoi ( tab[2] ) );
g_strfreev (tab);
+ str = gsb_format_gdate ( date );
+ g_date_free ( date );
- return gsb_format_gdate ( date );
+ return str;
}
diff --git a/src/utils_editables.c b/src/utils_editables.c
index ecfd082..6b15472 100644
--- a/src/utils_editables.c
+++ b/src/utils_editables.c
@@ -155,7 +155,10 @@ gsb_real gsb_utils_edit_calculate_entry ( GtkWidget *entry )
if ( string && strlen ( string ) )
pointeur = string + strlen ( string );
else
+ {
+ g_free ( string );
return total;
+ }
if ( g_utf8_strchr ( string, -1, '-' ) || g_utf8_strchr ( string, -1, '+' ) )
{
diff --git a/src/utils_files.c b/src/utils_files.c
index d86629a..032db50 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -534,7 +534,6 @@ GSList *utils_files_check_UTF8_validity ( const gchar *contents,
gint long_str = 0;
gsize size = 0;
gsize bytes_written = 0;
- GError * error = NULL;
gint i = 0;
gchar *ptr;
@@ -565,7 +564,7 @@ GSList *utils_files_check_UTF8_validity ( const gchar *contents,
do
{
tmp_str = g_convert ( string, long_str, "UTF-8", charset_array[i],
- &size, &bytes_written, &error );
+ &size, &bytes_written, NULL );
if ( tmp_str )
{
result = g_malloc0 ( sizeof ( struct struc_check_encoding ) );
diff --git a/src/utils_str.c b/src/utils_str.c
index 8c1e881..729a8a8 100644
--- a/src/utils_str.c
+++ b/src/utils_str.c
@@ -892,12 +892,16 @@ gchar *utils_str_dtostr ( gdouble number, gint nbre_decimal, gboolean canonical
{
gchar buffer[G_ASCII_DTOSTR_BUF_SIZE];
gchar *str_number;
+ gchar *decimal;
gchar *format;
gint nbre_char;
- format = g_strconcat ( "%.", utils_str_itoa ( nbre_decimal ), "f", NULL );
-
+ decimal = utils_str_itoa ( nbre_decimal );
+ format = g_strconcat ( "%.", decimal, "f", NULL );
nbre_char = g_sprintf ( buffer, format, number );
+ g_free ( decimal );
+ g_free ( format );
+
if ( nbre_char > G_ASCII_DTOSTR_BUF_SIZE )
return NULL;
@@ -1004,7 +1008,10 @@ gchar *utils_str_incremente_number_from_str ( const gchar *str_number, gint incr
new_str_number = utils_str_itoa ( number );
if ( prefix && strlen ( prefix ) > 0 )
+ {
new_str_number = g_strconcat ( prefix, new_str_number, NULL );
+ g_free ( prefix );
+ }
return new_str_number;
}
--
1.7.4

@ -1,397 +0,0 @@
From 6697ec365f3829f945b82888e59851657ca198ca Mon Sep 17 00:00:00 2001
From: pbiava <pierre.biava@nerim.net>
Date: Fri, 25 Feb 2011 22:57:45 +0100
Subject: [PATCH 5/5] fixes bug of compilation
---
src/bet_data.c | 221 ++++++++++++--------------------------------------------
1 files changed, 46 insertions(+), 175 deletions(-)
diff --git a/src/bet_data.c b/src/bet_data.c
index fbc25d7..d0067f3 100644
--- a/src/bet_data.c
+++ b/src/bet_data.c
@@ -55,6 +55,7 @@ static GDate *bet_data_futur_get_next_date ( struct_futur_data *scheduled,
const GDate *date_max );
static struct_futur_data *bet_data_future_copy_struct ( struct_futur_data *scheduled );
static void bet_data_future_set_max_number ( gint number );
+static gchar *bet_data_get_key ( gint account_number, gint div_number );
static gboolean bet_data_update_div ( SH *sh,
gint transaction_number,
gint sub_div,
@@ -264,19 +265,9 @@ gboolean bet_data_hist_add_div ( gint account_number,
{
gchar *key;
gchar *sub_key;
- gchar *div_number_str, *account_number_str; // only to avoid memory leaks
struct_hist_div *shd;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_number == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_number_str = utils_str_itoa ( account_number );
- key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
- g_free ( account_number_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_number, div_number );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -348,19 +339,9 @@ void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd )
{
gchar *key;
gchar *sub_key;
- gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *tmp_shd;
- div_number_str = utils_str_itoa ( shd -> div_number );
- if ( shd -> account_nb == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( shd -> account_nb );
- key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( shd -> account_nb, shd -> div_number );
if ( ( tmp_shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -395,19 +376,9 @@ gboolean bet_data_remove_div_hist ( gint account_number, gint div_number, gint s
{
gchar *key;
char *sub_key;
- gchar *div_number_str, *account_number_str; // only to avoid memory leaks
struct_hist_div *shd;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_number == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_number_str = utils_str_itoa ( account_number );
- key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
- g_free ( account_number_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_number, div_number );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -436,20 +407,10 @@ gboolean bet_data_search_div_hist ( gint account_number, gint div_number, gint s
{
gchar *key;
gchar *sub_key;
- gchar *div_number_str, *account_number_str; // only to avoid memory leaks
gint origin;
struct_hist_div *shd;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_number == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_number_str = utils_str_itoa ( account_number );
- key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
- g_free ( account_number_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_number, div_number );
origin = gsb_data_account_get_bet_hist_data ( account_number );
@@ -563,21 +524,11 @@ gchar *bet_data_get_div_name ( gint div_num,
gboolean bet_data_get_div_edited ( gint account_number, gint div_number, gint sub_div_nb )
{
gchar *key;
- gchar *div_number_str, *account_number_str; // only to avoid memory leaks
gint origin;
struct_hist_div *shd;
gboolean edited;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_number == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_number_str = utils_str_itoa ( account_number );
- key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
- g_free ( account_number_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_number, div_number );
origin = gsb_data_account_get_bet_hist_data ( account_number );
@@ -619,19 +570,9 @@ gboolean bet_data_set_div_edited ( gint account_nb,
gboolean edited )
{
gchar *key;
- gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_nb == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( account_nb );
- key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_nb, div_number );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -664,20 +605,10 @@ gboolean bet_data_set_div_edited ( gint account_nb,
gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb )
{
gchar *key;
- gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
gsb_real amount;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_nb == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( account_nb );
- key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_nb, div_number );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -716,19 +647,9 @@ gboolean bet_data_set_div_amount ( gint account_nb,
gsb_real amount )
{
gchar *key;
- gchar *div_number_str, *account_nb_str; // only to avoid memory leaks
struct_hist_div *shd;
- div_number_str = utils_str_itoa ( div_number );
- if ( account_nb == 0 )
- key = g_strconcat ("0:", div_number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( account_nb );
- key = g_strconcat ( account_nb_str, ":", div_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( div_number_str );
+ key = bet_data_get_key ( account_nb, div_number );
if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
{
@@ -1215,22 +1136,12 @@ void struct_free_bet_future ( struct_futur_data *scheduled )
gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
{
gchar *key;
- gchar *future_number_str, *account_nb_str; // only to avoid memory leaks
future_number ++;
if ( scheduled -> frequency == 0 )
{
- future_number_str = utils_str_itoa ( future_number );
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", future_number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( scheduled -> account_number );
- key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( future_number_str );
+ key = bet_data_get_key ( scheduled -> account_number, future_number );
scheduled -> number = future_number;
g_hash_table_insert ( bet_future_list, key, scheduled );
@@ -1250,16 +1161,7 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
date = gsb_date_copy ( scheduled -> date );
while ( date != NULL && g_date_valid ( date ) )
{
- future_number_str = utils_str_itoa ( future_number );
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( future_number ), NULL );
- else
- {
- account_nb_str = utils_str_itoa ( scheduled -> account_number );
- key = g_strconcat ( account_nb_str, ":", future_number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( future_number_str );
+ key = bet_data_get_key ( scheduled -> account_number, future_number );
if ( mother_row == future_number )
new_sch = scheduled;
@@ -1295,18 +1197,8 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled )
gboolean bet_data_future_set_lines_from_file ( struct_futur_data *scheduled )
{
gchar *key;
- gchar *number_str, *account_nb_str; // only to avoid memory leaks
- number_str = utils_str_itoa ( scheduled -> number );
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( scheduled -> account_number );
- key = g_strconcat ( account_nb_str, ":", number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( number_str );
+ key = bet_data_get_key ( scheduled -> account_number, scheduled -> number );
bet_data_future_set_max_number ( scheduled -> number );
@@ -1622,18 +1514,8 @@ GDate *bet_data_array_get_date_max ( gint account_number )
gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
{
gchar *key;
- gchar *number_str, *account_nb_str; // only to avoid memory leaks
- number_str = utils_str_itoa ( scheduled -> number );
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( scheduled -> account_number );
- key = g_strconcat ( account_nb_str, ":", number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( number_str );
+ key = bet_data_get_key ( scheduled -> account_number, scheduled -> number );
g_hash_table_replace ( bet_future_list, key, scheduled );
@@ -1653,19 +1535,9 @@ gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled )
struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number )
{
gchar *key;
- gchar *number_str, *account_nb_str; // only to avoid memory leaks
struct_futur_data *scheduled;
- number_str = utils_str_itoa ( number );
- if ( scheduled -> account_number == 0 )
- key = g_strconcat ("0:", number_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( account_number );
- key = g_strconcat ( account_nb_str, ":", number_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( number_str );
+ key = bet_data_get_key ( account_number, number );
if ( ( scheduled = g_hash_table_lookup ( bet_future_list, key ) ) )
return scheduled;
@@ -1728,20 +1600,10 @@ GHashTable *bet_data_transfert_get_list ( void )
gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert )
{
gchar *key;
- gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
transfert_number ++;
- transfert_nb_str = utils_str_itoa ( transfert_number );
- if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", transfert_nb_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( transfert -> account_number );
- key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( transfert_nb_str );
+ key = bet_data_get_key ( transfert -> account_number, transfert_number );
transfert -> number = transfert_number;
g_hash_table_insert ( bet_transfert_list, key, transfert );
@@ -1798,18 +1660,8 @@ gboolean bet_data_transfert_remove_line ( gint account_number, gint number )
gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert )
{
gchar *key;
- gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- transfert_nb_str = utils_str_itoa ( transfert -> number );
- if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", transfert_nb_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( transfert -> account_number );
- key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( transfert_nb_str );
+ key = bet_data_get_key ( transfert -> account_number, transfert -> number );
if ( transfert -> number > transfert_number )
transfert_number = transfert -> number;
@@ -1829,18 +1681,8 @@ gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfer
gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
{
gchar *key;
- gchar *transfert_nb_str, *account_nb_str; // only to avoid memory leaks
- transfert_nb_str = utils_str_itoa ( transfert -> number );
- if ( transfert -> account_number == 0 )
- key = g_strconcat ("0:", transfert_nb_str, NULL );
- else
- {
- account_nb_str = utils_str_itoa ( transfert -> account_number );
- key = g_strconcat ( account_nb_str, ":", transfert_nb_str, NULL );
- g_free ( account_nb_str );
- }
- g_free ( transfert_nb_str );
+ key = bet_data_get_key ( transfert -> account_number, transfert -> number );
g_hash_table_replace ( bet_transfert_list, key, transfert );
@@ -1962,6 +1804,35 @@ gboolean bet_data_remove_all_bet_data ( gint account_number )
}
+/**
+ * retourne la clef de recherche de la division passée en paramètre.
+ *
+ *
+ *
+ * */
+gchar *bet_data_get_key ( gint account_number, gint div_number )
+{
+ gchar *key;
+ gchar *div_number_str, *account_number_str; /* only to avoid memory leaks */
+
+ div_number_str = utils_str_itoa ( div_number );
+
+ if ( account_number == 0 )
+ key = g_strconcat ("0:", div_number_str, NULL );
+ else
+ {
+ account_number_str = utils_str_itoa ( account_number );
+ key = g_strconcat ( account_number_str, ":", div_number_str, NULL );
+
+ g_free ( account_number_str );
+ }
+
+ g_free ( div_number_str );
+
+ return key;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
--
1.7.4

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Grisbi
Comment=A personnal account manager
Exec=grisbi
Icon=grisbi
Terminal=false
Type=Application
MimeType=application/x-grisbi;
Categories=Office;

@ -1,67 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.6.0_rc2.ebuild,v 1.9 2012/05/03 20:00:40 jdhore Exp $
EAPI="2"
inherit eutils autotools
IUSE="nls ofx ssl"
MY_PV=${PV/_rc/rc}
DESCRIPTION="Grisbi is a personal accounting application for Linux"
HOMEPAGE="http://www.grisbi.org"
SRC_URI="mirror://sourceforge/grisbi/${PN}-${MY_PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
S="${WORKDIR}/${PN}-${MY_PV}"
# minimum gtk 2.10 to have print support
RDEPEND="dev-libs/libxml2
>=x11-libs/gtk+-2.10.0:2
ssl? ( dev-libs/openssl )
ofx? ( >=dev-libs/libofx-0.7.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
epatch "${FILESDIR}/0.6.0_rc2-properly-detect-gmodule.patch"
# Apply location patchs
ebegin "Applying Gentoo documentation location patch"
for i in \
$(find ./ -name 'Makefile.am') \
$(find ./ -name 'grisbi-manuel.html')
do
sed -i "s;doc/grisbi/;doc/${PF}/;g" "${i}"
done
eend 0
# Fix Icon value in desktop file
sed -i "s/grisbi.png/grisbi/" share/grisbi.desktop || die
AT_M4DIR="macros" eautoreconf
}
src_configure() {
econf \
--with-plugins \
$(use_with ofx) \
$(use_enable nls) || die
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS NEWS README
}
pkg_postinst() {
elog "The first thing you should do is set up the browser command in"
elog "preferences after you start up grisbi. Otherwise you will not"
elog "be able to see the help and manuals."
}

@ -1,54 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.8.2.ebuild,v 1.6 2012/05/03 20:00:40 jdhore Exp $
EAPI="3"
inherit eutils gnome2
IUSE="nls ofx ssl"
DESCRIPTION="Grisbi is a personal accounting application for Linux"
HOMEPAGE="http://www.grisbi.org"
SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/0.8.x/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
RDEPEND="dev-libs/libxml2
>=dev-libs/glib-2.18.0
>=x11-libs/gtk+-2.12.0:2
ssl? ( >=dev-libs/openssl-0.9.5 )
ofx? ( >=dev-libs/libofx-0.7.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
G2CONF="
--with-plugins
--with-libxml2
$(use_with ssl openssl)
$(use_with ofx)
$(use_enable nls)"
DOCS="AUTHORS NEWS README"
}
src_prepare() {
gnome2_src_prepare
epatch \
"${FILESDIR}/0.8.2-0001-fixes-bug-1289.patch" \
"${FILESDIR}/0.8.2-0002-fixes-a-crash-when-importing-a-file-without-extensio.patch" \
"${FILESDIR}/0.8.2-0003-fixes-bug-1293-Problem-of-updating-of-the-pointing-b.patch" \
"${FILESDIR}/0.8.2-0004-fix-memory-leaks-thanks-Philippe-D.patch" \
"${FILESDIR}/0.8.2-0005-fixes-bug-of-compilation.patch"
}
pkg_postinst() {
gnome2_pkg_postinst
elog "The first thing you should do is set up the browser command in"
elog "preferences after you start up grisbi. Otherwise you will not"
elog "be able to see the help and manuals."
}

@ -0,0 +1,39 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.8.9.ebuild,v 1.1 2012/06/30 17:50:39 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2
DESCRIPTION="Grisbi is a personal accounting application for Linux"
HOMEPAGE="http://www.grisbi.org"
SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/0.8.x/${P}.tar.bz2"
IUSE="nls ofx ssl"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="dev-libs/libxml2
>=dev-libs/glib-2.18.0:2
>=x11-libs/gtk+-2.12.0:2
x11-misc/xdg-utils
ssl? ( >=dev-libs/openssl-0.9.5 )
ofx? ( >=dev-libs/libofx-0.7.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
G2CONF+="--with-plugins
--with-libxml2
--without-cunit
--disable-static
$(use_with ssl openssl)
$(use_with ofx)
$(use_enable nls)"
DOCS="AUTHORS NEWS README"
}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
</pkgmetadata>

@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.8 2012/06/17 19:36:49 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r3.ebuild,v 1.9 2012/06/30 16:20:28 jlec Exp $
EAPI="4"
EAPI=4
inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="A small (static) UNIX Shell"
HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/"
HOMEPAGE="http://www.canb.auug.org.au/~dbell/"
SRC_URI="http://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
LICENSE="freedist"
@ -15,16 +15,20 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="static"
DEPEND="static? ( sys-libs/zlib[static-libs] )
DEPEND="
static? ( sys-libs/zlib[static-libs] )
!static? ( >=sys-libs/zlib-1.2.3 )"
RDEPEND="!static? ( ${DEPEND} )"
src_prepare() {
epatch "${FILESDIR}"/sash-3.7-builtin.patch
sed -i \
sed \
-e "s:-O3:${CFLAGS}:" \
Makefile || die
-i Makefile || die
sed \
-e 's:linux/ext2_fs.h:ext2fs/ext2_fs.h:g' \
-i cmd_chattr.c || die
}
src_compile() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.2 2012/06/30 11:06:26 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.3 2012/06/30 21:00:14 jdhore Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls"
RDEPEND="

@ -0,0 +1,18 @@
xbsql/Makefile.am | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/xbsql/Makefile.am b/xbsql/Makefile.am
index c281358..5a09198 100644
--- a/xbsql/Makefile.am
+++ b/xbsql/Makefile.am
@@ -1,9 +1,4 @@
-DEBUG = -g
-CC = g++
-CFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG)
-CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG)
-LDFLAGS = $(DEBUG)
-INCLUDE = -I/usr/local/include
+CC = $(CXX)
lib_LTLIBRARIES = libxbsql.la
bin_PROGRAMS = xql

@ -0,0 +1,19 @@
--- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500
+++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500
@@ -6977,10 +6977,15 @@
if test -f /usr/lib/libncurses.so
then
curses=ncurses
-
+ elif test -f /usr/lib64/libncurses.so
+ then
+ curses=ncurses
elif test -f /usr/lib/libcurses.so
then
curses=curses
+ elif test -f /usr/lib64/libcurses.so
+ then
+ curses=curses
else
{ { echo "$as_me:6985: error: No (n)curses installation" >&5
echo "$as_me: error: No (n)curses installation" >&2;}

@ -0,0 +1,66 @@
diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am
--- xbsql-0.11/xbsql/Makefile.am.BAD 2009-08-19 23:32:27.481185284 -0400
+++ xbsql-0.11/xbsql/Makefile.am 2009-08-19 23:32:47.157206308 -0400
@@ -17,10 +17,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
xb_assignlist.cpp xb_create.cpp \
xbsql.tab.c xb_datetime.cpp
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
+libxbsql_la_LIBADD = -lxbase64
xql_SOURCES = xql.cpp
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
#
#
diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in
--- xbsql-0.11/xbsql/Makefile.in.BAD 2009-08-19 23:32:54.384058775 -0400
+++ xbsql-0.11/xbsql/Makefile.in 2009-08-19 23:33:03.928059382 -0400
@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
xbsql.tab.c xb_datetime.cpp
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
+libxbsql_la_LIBADD = -lxbase64
xql_SOURCES = xql.cpp
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
#install-data-hook:
diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp
--- xbsql-0.11/xbsql/xbsql.cpp.BAD 2009-08-19 23:34:23.880063863 -0400
+++ xbsql-0.11/xbsql/xbsql.cpp 2009-08-19 23:34:47.393184432 -0400
@@ -207,7 +207,7 @@ void XBaseSQL::setError
break ;
default :
- e = xbStrError (rc) ;
+ e = GetErrorMessage (rc) ;
break ;
}
@@ -230,7 +230,7 @@ void XBaseSQL::setError
char t[1024] ;
va_list aptr ;
- strcpy (t, xbStrError (rc)) ;
+ strcpy (t, GetErrorMessage (rc)) ;
strcat (t, ": ") ;
int l = strlen(t) ;
diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h
--- xbsql-0.11/xbsql/xbsql.h.BAD 2009-08-19 23:35:45.087088919 -0400
+++ xbsql-0.11/xbsql/xbsql.h 2009-08-19 23:34:06.949184421 -0400
@@ -43,8 +43,7 @@ XBSQL_API int strncasecmp (const char *s
#endif
-#include <xbase/xbase.h>
-#include <xbase/xbexcept.h>
+#include <xbase64/xbase64.h>
class XBaseSQL ;
class XBSQLTable ;

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
</pkgmetadata>

@ -0,0 +1,40 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11-r1.ebuild,v 1.1 2012/06/30 17:15:51 jlec Exp $
EAPI=4
AUTOTOOLS_AUTORECONF=yes
inherit autotools-utils
DESCRIPTION="An SQL Wrapper for the XBase library"
HOMEPAGE="http://www.rekallrevealed.org/"
SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc static-libs"
RDEPEND="
>=dev-db/xbase-3.1.2
sys-libs/readline"
DEPEND="${RDEPEND}
sys-devel/automake
sys-devel/libtool"
PATCHES=(
"${FILESDIR}"/${P}-ncurses64.patch
"${FILESDIR}"/${P}-xbase64.patch
"${FILESDIR}"/${P}-autotools.patch
)
DOCS=( AUTHORS Announce ChangeLog INSTALL README TODO )
AUTOTOOLS_IN_SOURCE_BUILD=1
src_install() {
autotools-utils_src_install
use doc && dohtml doc/*
}

@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11.ebuild,v 1.9 2012/06/16 14:56:15 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11.ebuild,v 1.10 2012/06/30 17:15:51 jlec Exp $
inherit base
DESCRIPTION="XBSQL: An SQL Wrapper for the XBase library"
DESCRIPTION="An SQL Wrapper for the XBase library"
HOMEPAGE="http://www.rekallrevealed.org/"
SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"

@ -1,4 +1 @@
DIST dsiutils-1.0.10-src.tar.gz 267700 RMD160 be4310cc4771a6ce793386f61fed3ae5eadc48e6 SHA1 9a1b676240f0ea6b33dc0ae9db3296811e738cc8 SHA256 d3eda619ab7f897f9c0aeb4065a5866dc8fa17afbb83e15750f7972bb87444d0
DIST dsiutils-1.0.4-src.tar.gz 253689 RMD160 204ce85f0c2dbdba7114e665fd4b7a511990cef1 SHA1 b2ee932f3c463bd08c046ce457b0247f67039a87 SHA256 6170656a8f8837cff8d076534345e0544c717e0a78db85465113eed20e51eea7
DIST dsiutils-1.0.5-src.tar.gz 254157 RMD160 1465a6ffab7ad6c49494ed5e0cd7b5896804fd56 SHA1 dec7637e7651441d7ba8eb4ae813e39c5ab375b5 SHA256 d6fe0af47d03f098e5bc967dcaf025d91a5590a26534548279a6289f05f37651
DIST dsiutils-1.0.7-src.tar.gz 259235 RMD160 6710901ee9c28034f65ecae4ffea2cf2ba3ba3df SHA1 c984ad99554381c98085d1d0d1ec48d7ce66df00 SHA256 b545fdd7c70394ab06a119244b90197e321210ad7c97e888558f1fa79f607aa1

@ -0,0 +1,58 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.10-r2.ebuild,v 1.1 2012/06/30 21:50:40 sera Exp $
EAPI="4"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
HOMEPAGE="http://dsiutils.dsi.unimi.it/"
SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEP="
dev-java/commons-io:1
dev-java/jsap:0
dev-java/log4j:0
dev-java/commons-collections:0
dev-java/colt:0
dev-java/fastutil:5.0
dev-java/commons-configuration:0
dev-java/commons-lang:2.1
dev-java/junit:0"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.5"
# Failes to build with jdk7 #423519
DEPEND="${COMMON_DEP}
|| ( virtual/jdk:1.6 virtual/jdk:1.5 )
test? (
dev-java/emma:0
dev-java/ant-junit:0
dev-java/ant-trax:0
)"
JAVA_ANT_REWRITE_CLASSPATH="yes"
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
EANT_GENTOO_CLASSPATH="commons-io-1,jsap,log4j,commons-collections,colt,fastutil-5.0,commons-configuration,commons-lang-2.1,junit"
EANT_TEST_TARGET="junit"
EANT_TEST_ANT_TASKS="ant-trax"
EANT_TEST_EXTRA_ARGS="-Djar.base=/usr/share/emma/lib"
src_test() {
java-pkg-2_src_test
}
src_install() {
java-pkg_newjar "${P}.jar"
use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src/it
}

@ -1,59 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.10.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source test"
JAVA_ANT_CLASSPATH_TAGS="javac xjavac junit"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
HOMEPAGE="http://dsiutils.dsi.unimi.it/"
SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEP="dev-java/commons-io:1
dev-java/jsap:0
dev-java/log4j:0
dev-java/commons-collections:0
dev-java/colt:0
dev-java/fastutil:5.0
dev-java/commons-configuration:0
dev-java/commons-lang:2.1
dev-java/junit:0"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
test? (
dev-java/emma:0
dev-java/ant-junit:0
dev-java/ant-trax:0
)
${COMMON_DEP}"
java_prepare() {
java-ant_rewrite-classpath
}
JAVA_ANT_REWRITE_CLASSPATH="1"
EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
src_install() {
java-pkg_newjar "${P}.jar"
use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src
}
src_test() {
ANT_TASKS="ant-junit,ant-trax" eant \
-Djar.base=/usr/share/emma/lib \
-Dgentoo.classpath="$(java-pkg_getjars --build-only ${EANT_GENTOO_CLASSPATH})" \
junit
}

@ -1,56 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.4.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
EAPI="1"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
HOMEPAGE="http://dsiutils.dsi.unimi.it/"
SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEP="dev-java/commons-io:1
=dev-java/jsap-2*
dev-java/log4j
dev-java/commons-collections
dev-java/colt
=dev-java/fastutil-5.1*
dev-java/commons-configuration
dev-java/commons-lang:2.1
=dev-java/junit-3*"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/emma )
${COMMON_DEP}"
src_unpack() {
unpack ${A}
cd "${S}"
java-ant_rewrite-classpath
}
EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
src_install() {
java-pkg_newjar "${P}.jar"
use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src
}
#emma configuration files are currently not distributed with
#source. therefore tests fail before even run.
RESTRICT="test"
src_test() {
eant -Djar.base=/usr/share/emma/lib junit
}

@ -1,56 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.5.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
EAPI="1"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
HOMEPAGE="http://dsiutils.dsi.unimi.it/"
SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEP="dev-java/commons-io:1
=dev-java/jsap-2*
dev-java/log4j
dev-java/commons-collections
dev-java/colt
=dev-java/fastutil-5.1*
dev-java/commons-configuration
dev-java/commons-lang:2.1
=dev-java/junit-3*"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/emma )
${COMMON_DEP}"
src_unpack() {
unpack ${A}
cd "${S}"
java-ant_rewrite-classpath
}
EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
src_install() {
java-pkg_newjar "${P}.jar"
use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src
}
#emma configuration files are currently not distributed with
#source. therefore tests fail before even run.
RESTRICT="test"
src_test() {
eant -Djar.base=/usr/share/emma/lib junit
}

@ -1,56 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/dsiutils/dsiutils-1.0.7.ebuild,v 1.2 2012/04/13 18:05:15 ulm Exp $
EAPI="1"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A Mish Mash of classes that were initially distributed with mg4j (amount others)."
HOMEPAGE="http://dsiutils.dsi.unimi.it/"
SRC_URI="http://dsiutils.dsi.unimi.it/${P}-src.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
COMMON_DEP="dev-java/commons-io:1
=dev-java/jsap-2*
dev-java/log4j
dev-java/commons-collections
dev-java/colt
=dev-java/fastutil-5.1*
dev-java/commons-configuration
dev-java/commons-lang:2.1
=dev-java/junit-3*"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/emma )
${COMMON_DEP}"
src_unpack() {
unpack ${A}
cd "${S}"
java-ant_rewrite-classpath
}
EANT_GENTOO_CLASSPATH="commons-io:1,jsap,log4j,commons-collections,colt,fastutil:5.0,commons-configuration,commons-lang:2.1,junit"
src_install() {
java-pkg_newjar "${P}.jar"
use doc && java-pkg_dojavadoc docs
use source && java-pkg_dosrc src
}
#emma configuration files are currently not distributed with
#source. therefore tests fail before even run.
RESTRICT="test"
src_test() {
eant -Djar.base=/usr/share/emma/lib junit
}

@ -0,0 +1,69 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.3.1-r1.ebuild,v 1.1 2012/07/01 08:17:12 sera Exp $
EAPI="4"
JAVA_PKG_IUSE="doc"
inherit java-pkg-2 java-ant-2
MY_P="${PN}-src-${PV}"
DESCRIPTION="Open Source Java/XML Presentation Compiler"
HOMEPAGE="http://xmlc.objectweb.org/"
SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip
http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
COMMON_DEP="
dev-java/ant-core:0
dev-java/asm:3
dev-java/gnu-regexp:1
dev-java/log4j:0
dev-java/nekohtml:0
dev-java/xerces:2
dev-java/xml-commons-external:1.4
dev-java/xml-commons-resolver:0
java-virtuals/servlet-api:2.5"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
${COMMON_DEP}"
S="${WORKDIR}/${MY_P}/"
java_prepare() {
find -name '*.jar' -exec rm -v {} + || die
# get rid of jarjar, and add ant.jar to the taskdef module's classpath
epatch "${FILESDIR}/${P}-build.xml.patch"
}
JAVA_ANT_REWRITE_CLASSPATH="yes"
EANT_BUILD_TARGET="all-libs"
EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core"
src_install() {
# the rest of jars are included in all-runtime
java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar
java-pkg_register-ant-task
newdoc xmlc/modules/xmlc/README.XMLC README || die
dodoc xmlc/modules/xmlc/ChangeLog || die
dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \
xmlc/bugs/bugs.html || die
# move the generated documentation around
if use doc; then
mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
fi
}

@ -4,9 +4,11 @@ DIST pl-6.0.1.tar.gz 13717873 RMD160 6339eafe9f13f1d4807f24c37073b2196a8c4c7f SH
DIST pl-6.1.5.tar.gz 14027422 RMD160 076154f60aa92795cd0c7b07d7df2979fddd42bd SHA1 62b40afe1973935b26ad5aa93621c165d41c5d25 SHA256 c42b37dafb840635d686766a9cb0b5d65877189d1081083e1b54f759b85757fd
DIST pl-6.1.6.tar.gz 14368849 RMD160 68439aa591ad25b48a33f6e004da8154b8e35117 SHA1 b38a3ca6aa7679dc3296a8765f6b02c004a4cb3f SHA256 012156532eef7d400049628c3ef3bd3220c6e0c42fa71107d4234eaa494fe8d4
DIST pl-6.1.7.tar.gz 14383101 RMD160 f8a460fdfe3948379a5066179a4a0ba8b8b81f42 SHA1 7043685e2953380374ce2147b0035eaf677b7783 SHA256 b2914bd934a0f5e4aa3cf80e3d8e563be0194492ae4390cac8001e31ac2e2044
DIST pl-6.1.8.tar.gz 14396885 RMD160 a0c6d736232ae291180bc6894648333b2bc39861 SHA1 36b718643e0afa4fe45ea9af71cb5a12e3566747 SHA256 10b2c82140ecaf48f00aa5ac3626d8087ecc57529494654118aadfdde0f06d7d
DIST swi-prolog-5.10.5-gentoo-patchset-5.tar.gz 10284 RMD160 42b868f886c639fd612e4c03cbabceb4a70b603a SHA1 26275151c36fb0322f60ec4eadfe0852e02f0b71 SHA256 7f7817602dd844cbd587a665164c85a9d0d8a00b09cfce50f9784119563c11ef
DIST swi-prolog-6.0.0-gentoo-patchset-0.tar.gz 4092 RMD160 73ea1a7f5dffff2c411983abc48e6e028d6366ad SHA1 8adb49c195d9f2250721f16bfb849f45c42e040e SHA256 7e64c64db768e0ad5fd682b3d5b6a3b92bb0d4d8663af26dbd5ab717d712564c
DIST swi-prolog-6.0.1-gentoo-patchset-2.tar.gz 5328 RMD160 9a10120f80739027542a7f7e96b0b0f81f7e2fa8 SHA1 311876be4eb30784f89bdc04d8868d74de5b47cf SHA256 3822c85351b47364c121ed4583e9801d0fec74f9cff8c8886800f5503700e0a6
DIST swi-prolog-6.1.5-gentoo-patchset-0.tar.gz 5328 RMD160 86c272d53777f08d36be13e75235b35dba8a0a77 SHA1 48d280080bce8a03b9218dc41ba97a9150c32fe0 SHA256 67bff762024a06bb375ad0b8a4be8f700f36b86cfa9efe7559d135b22109ece1
DIST swi-prolog-6.1.6-gentoo-patchset-0.tar.gz 6195 RMD160 91c1188cab47b04e454c7f35ed4f0d81e6e38ada SHA1 7dc70dbef0a219571665076216f66ec2282656a7 SHA256 7d44e63b55ad5a482346a4a3b5489698cad241a4fb6245b952cff106a3736ef9
DIST swi-prolog-6.1.7-gentoo-patchset-0.tar.gz 5228 RMD160 d82a1f4c79e875aef7c0367f680f1c16f91e4a81 SHA1 72f50df6be928a983ebc58cab9f703914c478b87 SHA256 e81726dd4a4a67fea39ae8ecc1930bd9febc52a7e36a181a48b77848bb641fee
DIST swi-prolog-6.1.8-gentoo-patchset-0.tar.gz 5211 RMD160 6318b3a26b7578ed06fb5cebcfcc66098d48e641 SHA1 c720ba597630e0d16d77c8162df2c5866d4e7c1a SHA256 33616aa70e7782eaf9d06e55d69fa9302a9c1291dc9ffcedde449edbc63285e9

@ -0,0 +1,130 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.1.8.ebuild,v 1.1 2012/07/01 07:37:58 keri Exp $
EAPI=2
inherit eutils flag-o-matic java-pkg-opt-2 multilib
PATCHSET_VER="0"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
RDEPEND="sys-libs/ncurses
archive? ( app-arch/libarchive )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline )
gmp? ( dev-libs/gmp )
ssl? ( dev-libs/openssl )
java? ( >=virtual/jdk-1.4 )
X? (
virtual/jpeg
x11-libs/libX11
x11-libs/libXft
x11-libs/libXpm
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM )"
DEPEND="${RDEPEND}
X? ( x11-proto/xproto )
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/pl-${PV}"
src_prepare() {
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
}
src_configure() {
append-flags -fno-strict-aliasing
use ppc && append-flags -mno-altivec
use hardened && append-flags -fno-unit-at-a-time
use debug && append-flags -DO_DEBUG
cd "${S}"/src
econf \
--libdir=/usr/$(get_libdir) \
$(use_enable gmp) \
$(use_enable readline) \
$(use_enable static-libs static) \
--enable-shared \
--enable-custom-flags COFLAGS="${CFLAGS}"
}
src_compile() {
cd "${S}"/src
emake || die "emake failed"
if ! use minimal ; then
local jpltestconf
if use java && use test ; then
jpltestconf="--with-junit=$(java-config --classpath junit)"
fi
cd "${S}/packages"
econf \
--libdir=/usr/$(get_libdir) \
$(use_with archive) \
--with-chr \
--with-clib \
--with-clpqr \
--with-cpp \
--with-http \
$(use_with java jpl) \
${jpltestconf} \
--with-nlp \
$(use_with odbc) \
--with-PDT \
--with-pldoc \
--with-plunit \
--with-protobufs \
--with-R \
--with-RDF \
--with-semweb \
--with-sgml \
$(use_with ssl) \
--with-table \
--with-tipc \
--with-utf8proc \
$(use_with X xpce) \
$(use_with zlib) \
COFLAGS='"${CFLAGS}"'
emake || die "packages emake failed"
fi
}
src_test() {
cd "${S}/src"
emake check || die "make check failed. See above for details."
if ! use minimal ; then
cd "${S}/packages"
emake check || die "make check failed. See above for details."
fi
}
src_install() {
emake -C src DESTDIR="${D}" install || die "install src failed"
if ! use minimal ; then
emake -C packages DESTDIR="${D}" install || die "install packages failed"
if use doc ; then
emake -C packages DESTDIR="${D}" html-install || die "html-install failed"
fi
fi
dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION || die
}

@ -1 +1,2 @@
DIST libofx-0.9.4.tar.gz 1263379 RMD160 f42cf37a425692bcb0007586601683244e036656 SHA1 7370245c011ac4ea9313ba24a88c70e0eb9c317b SHA256 9b30641fd5672e7a4a7fd3dd789a8a9df80039e5cc5756e28e16e8935560dbaf
DIST libofx-0.9.5.tar.gz 1526857 RMD160 7ad1d1447e049bfed49acd858a91bc07bd2dfd3a SHA1 7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73 SHA256 a075c5634b94bad16f8c949eeb77625d31bedea3bb10a8da174b989ffab7e78e

@ -0,0 +1,11 @@
diff -ruN libofx-0.9.5.orig/ofxconnect/ofxpartner.cpp libofx-0.9.5/ofxconnect/ofxpartner.cpp
--- libofx-0.9.5.orig/ofxconnect/ofxpartner.cpp 2011-03-31 00:30:50.000000000 +0200
+++ libofx-0.9.5/ofxconnect/ofxpartner.cpp 2012-06-30 21:57:35.747989782 +0200
@@ -37,6 +37,7 @@
#include <vector>
#include <algorithm>
#include <string.h>
+#include <unistd.h>
using std::string;
using std::vector;

@ -0,0 +1,47 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.9.5.ebuild,v 1.1 2012/06/30 20:01:52 dilfridge Exp $
EAPI=4
inherit base
DESCRIPTION="A library to support the Open Financial eXchange XML format"
HOMEPAGE="http://libofx.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc static-libs test"
RDEPEND=">=app-text/opensp-1.5
dev-cpp/libxmlpp:2.6
>=net-misc/curl-7.9.7"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( sys-apps/help2man )
test? ( app-crypt/gnupg )"
PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
src_prepare() {
base_src_prepare
# Be sure DTD gets installed in correct path after redefining docdir in install
sed -i \
-e 's:$(DESTDIR)$(docdir):$(DESTDIR)$(LIBOFX_DTD_DIR):' \
dtd/Makefile.in || die
}
src_configure() {
econf \
$(use_enable static-libs static) \
--disable-doxygen
}
src_install() {
emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL}
find "${ED}" -name '*.la' -exec rm -f {} +
}

@ -0,0 +1,29 @@
libtrain/lcommon.c | 1 +
libtrain/roma.c | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/libtrain/lcommon.c b/libtrain/lcommon.c
index 8519c86..01a775e 100644
--- a/libtrain/lcommon.c
+++ b/libtrain/lcommon.c
@@ -2,6 +2,7 @@
/* this file is modified by FURUKAWA Yo (you@ss.iij4u.or.jp) */
#include "lfunc.h"
+#include <string.h>
BYTE Tmpbuf[ 256 ] ;
char FileBuf[ 1024 ] ;
diff --git a/libtrain/roma.c b/libtrain/roma.c
index e61a428..41b969c 100644
--- a/libtrain/roma.c
+++ b/libtrain/roma.c
@@ -13,6 +13,8 @@
#include <string.h>
#endif /* MAIN */
+#include <string.h>
+
#define Strlen(s) strlen((s))
#define Strcpy(d,s) strcpy((d),(s))
#define iskanji(x) (((x)>=0x81 && (x)<=0x9F)||((x)>=0xE0 && (x)<=0xFC))

@ -1,8 +1,12 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtrain/libtrain-0.9b.ebuild,v 1.13 2009/09/23 17:24:33 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtrain/libtrain-0.9b.ebuild,v 1.14 2012/07/01 10:12:22 jlec Exp $
inherit toolchain-funcs
EAPI=4
AUTOTOOLS_AUTORECONF=yes
inherit autotools-utils
DESCRIPTION="Library for calculating fastest train routes"
SRC_URI="http://www.on.rim.or.jp/~katamuki/software/train/${P}.tar.gz"
@ -11,16 +15,11 @@ HOMEPAGE="http://www.on.rim.or.jp/~katamuki/software/train/"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~ppc sparc x86"
IUSE=""
IUSE="debug static-libs "
DEPEND=""
RDEPEND="${DEPEND}"
src_compile() {
econf || die
emake CC="$(tc-getCC)" || die
}
PATCHES=( "${FILESDIR}"/${P}-impl-dec.patch )
src_install () {
make DESTDIR="${D}" install || die
src_configure() {
local myeconfargs=( $(use_enable debug) )
autotools-utils_src_configure
}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
</pkgmetadata>

@ -0,0 +1,82 @@
diff --git a/configure.ac b/configure.ac
index 2e58d68..49b812a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
X11_LD_FLAGS="-lXt -lX11"
M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
- if test "x$HAVE_XAW" = "xyes"; then
+ AC_ARG_WITH(athena,
+ AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
+ if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
[Define to 1 if you have the Xaw header files.])
XAW_LD_FLAGS="-lXaw -lXmu"
@@ -149,7 +151,9 @@ else
fi
AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
-if test "x$HAVE_FRIBIDI" = "xyes"; then
+AC_ARG_WITH(fribidi,
+ AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
+if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
AC_DEFINE(HAVE_FRIBIDI, 1,
[Define to 1 if you have Fribidi library and header file.])
M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
@@ -202,8 +206,10 @@ fi
AC_SUBST(OTF_LD_FLAGS)
dnl Check for Freetype2 usability.
+AC_ARG_WITH(freetype,
+ AS_HELP_STRING([--with-freetype],[enable Freetype support]))
AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
FREETYPE_INC=`freetype-config --cflags`
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no,
#else
Version too old. Compiling this line should fail.
#endif])
-if test "x$HAVE_XFT2" = "xyes"; then
+AC_ARG_WITH(xft,
+ AS_HELP_STRING([--with-xft],[enable Xft2 support]))
+if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
AC_DEFINE(HAVE_XFT2, 1,
[Define to 1 if you have Xft2 library and header file.])
M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
@@ -330,7 +338,9 @@ else
fi
AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
-if test "x$HAVE_XML2" = "xyes"; then
+AC_ARG_WITH(libxml2,
+ AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
+if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
AC_DEFINE(HAVE_XML2, 1,
[Define to 1 if you have libxml2 library and header file])
M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS)
dnl Check for Anthy usability.
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
-if test "x$HAVE_ANTHY" = "xyes"; then
+AC_ARG_WITH(anthy,
+ AS_HELP_STRING([--with-anthy],[with anthy suport]))
+if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
AC_DEFINE(HAVE_ANTHY, 1,
[Define to 1 if you have Anthy library and header file])
M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS)
dnl Check for Ispell usability.
AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
-if test "x$HAVE_ISPELL" = "xyes"; then
+AC_ARG_WITH(ispell,
+ AS_HELP_STRING([--with-ispell],[with ispell suport]))
+if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"

@ -0,0 +1,73 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild,v 1.1 2012/07/01 01:25:44 naota Exp $
EAPI=4
inherit eutils autotools
DESCRIPTION="Multilingual Library for Unix/Linux"
HOMEPAGE="http://www.m17n.org/m17n-lib/"
SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="anthy athena anthy bidi fontconfig gd spell libotf libxml2 X xft"
RDEPEND="
anthy? ( app-i18n/anthy )
spell? ( app-text/ispell )
libxml2? ( dev-libs/libxml2 )
X? (
athena? ( x11-libs/libXaw )
bidi? ( dev-libs/fribidi )
fontconfig? ( media-libs/fontconfig )
gd? ( media-libs/gd[png] )
libotf? ( >=dev-libs/libotf-0.9.4 )
xft? (
>=media-libs/freetype-2.1
x11-libs/libXft )
x11-libs/libX11
)
~dev-db/m17n-db-${PV}"
# athena? ( x11-libs/libXaw )
# athena shoud be enabled to build m17n-edit properly when X is enabled.
# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
#
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.6.2-gui.patch \
"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
"${FILESDIR}"/${PN}-1.6.3-configure.patch
eautoreconf
}
src_configure() {
local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
if use X; then
myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
$(use_with xft)"
else
myconf+=" --without-x --disable-gui --without-athena --without-friidi
--without-fontconfig --without-freetype --without-gd --without-libotf
--without-xft"
fi
econf ${myconf} || die
}
src_install() {
# bug #363239
emake -j1 DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog NEWS README TODO
}

@ -7,9 +7,15 @@
Builds the Graphical User Interface API and utilities for the
package.
</flag>
<flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg>
input method.</flag>
<flag name='athena'>Enable the MIT Athena widget set
(<pkg>x11-libs/libXaw</pkg>)</flag>
<flag name='gd'>
Build API and utilities based on <pkg>media-libs/gd</pkg>. This
flag is only meaningful if the X USE flag is also enabled.
</flag>
<flag name='libotf'>Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
<flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
</use>
</pkgmetadata>

@ -1 +1,2 @@
DIST core-107.01.tar.gz 364373 RMD160 5a496d71ac40bd709675e12a90233956a7a9309d SHA1 ef4443939cb42f5778912608d3023a669b06d44f SHA256 1a8c6e5806e452cf7afe75b89c1678ae58648ee15d1a843a4d1be360de8cc97e
DIST core-108.00.01.tar.gz 407778 RMD160 30f3afd33c98c1b57cce2cf7d51724b6a112f131 SHA1 49f93c6728f3eac1bc85f516daefcf5ff87347df SHA256 37f1d0d0d12c623d14e10e3418103b3dd2e21584a9c166ab589ce5550934d665

@ -0,0 +1,38 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-108.00.01.ebuild,v 1.1 2012/06/30 17:16:34 aballier Exp $
EAPI="3"
OASIS_BUILD_DOCS=1
OASIS_BUILD_TESTS=1
inherit oasis base
MY_P=${P/_/\~}
DESCRIPTION="Jane Street's alternative to the standard library"
HOMEPAGE="http://www.janestreet.com/ocaml"
SRC_URI="http://bitbucket.org/yminsky/ocaml-core/downloads/${P}.tar.gz"
LICENSE="LGPL-2.1-linking-exception"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RDEPEND="dev-ml/res
>=dev-ml/sexplib-108.00.01
>=dev-ml/bin-prot-108.00.01
>=dev-ml/fieldslib-108.00.01
>=dev-ml/pa_ounit-108.00.01
>=dev-ml/variantslib-108.00.01
>=dev-ml/pipebang-108.00.01"
DEPEND="${RDEPEND}
>=dev-ml/oasis-0.3
test? ( >=dev-ml/ounit-1.0.2 )"
PATCHES=( "${FILESDIR}/${P}-nocust.patch" "${FILESDIR}/${P}-noinl.patch" )
src_prepare() {
base_src_prepare
oasis setup || die
}

@ -0,0 +1,13 @@
Index: core-108.00.01/_oasis
===================================================================
--- core-108.00.01.orig/_oasis
+++ core-108.00.01/_oasis
@@ -63,7 +63,7 @@ Executable test_runner
Path: lib_test
MainIs: test_runner.ml
Build$: flag(tests)
- Custom: true
+# Custom: true
# CompiledObject: best
Install: false
BuildDepends: core,oUnit (>= 1.0.2)

@ -0,0 +1,12 @@
Index: core-108.00.01/lib_test/test.ml
===================================================================
--- core-108.00.01.orig/lib_test/test.ml
+++ core-108.00.01/lib_test/test.ml
@@ -21,7 +21,6 @@ let all () =
flatten
(TestList
[
- Core.Inline_tests.tests ();
Avltree_test.test;
Bag_test.test;
Bigbuffer_test.test;

@ -1 +1,2 @@
DIST core_extended-107.01.tar.gz 221763 RMD160 32f27b44a000e1823954386915037ab0180e023a SHA1 a954781fdf31b7be8b2160c6c5273839ea8236ad SHA256 ca321d81eaed900a2381610bb9eff0ca7e48768de5715ce9c49016f5e27f9adf
DIST core_extended-108.00.01.tar.gz 272736 RMD160 a4eae4d538d87ab96f58c8a6769465a6573e8d61 SHA1 5788bff94009dd7971a2e78f4633fd7fb88f0247 SHA256 ac7cf7a399ed33a47c6fccc9eae3aa16bfe9f930d61642331f1fa1eb9b6fecf2

@ -0,0 +1,31 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_extended/core_extended-108.00.01.ebuild,v 1.1 2012/06/30 18:13:34 aballier Exp $
EAPI="3"
OASIS_BUILD_DOCS=1
#FIXME!
#OASIS_BUILD_TESTS=1
inherit oasis
MY_P=${P/_/\~}
DESCRIPTION="Jane Street's alternative to the standard library"
HOMEPAGE="http://www.janestreet.com/ocaml"
SRC_URI="http://bitbucket.org/yminsky/ocaml-core/downloads/${P}.tar.gz"
LICENSE="LGPL-2.1-linking-exception"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="dev-ml/pcre-ocaml
>=dev-ml/sexplib-108.00.01
>=dev-ml/bin-prot-108.00.01
>=dev-ml/fieldslib-108.00.01
>=dev-ml/pa_ounit-108.00.01
>=dev-ml/variantslib-108.00.01
>=dev-ml/pipebang-108.00.01"
DEPEND="${RDEPEND}
test? ( >=dev-ml/ounit-1.1.0 )"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.4 2012/03/08 11:46:09 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.5 2012/06/30 20:25:34 aballier Exp $
EAPI="2"
@ -16,6 +16,10 @@ SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc +ocamlopt"
src_prepare() {
epatch "${FILESDIR}/${P}-ocaml4.patch"
}
src_compile() {
emake all || die "failed to build"
if use ocamlopt; then

@ -0,0 +1,17 @@
Fixes ocaml 4 compatibility.
From upstream:
svn diff http://ocaml-extlib.googlecode.com/svn/trunk/ -c 396
Index: extlib/extHashtbl.ml
===================================================================
--- extlib/extHashtbl.ml (revision 395)
+++ extlib/extHashtbl.ml (revision 396)
@@ -32,6 +32,7 @@
}
include Hashtbl
+ let create n = Hashtbl.create (* no seed *) n
external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"

@ -1,5 +1,2 @@
DIST ocamlnet-2.2.9.tar.gz 1877257 RMD160 1299e1316e0547171089b0caaa9deb13c4c67c31 SHA1 ca073c60f86fede60d4c479e5589127010482804 SHA256 134530a4357879e095bdbbb5f21f78634a16ef4d787eb151676b7fee7e4c0dc9
DIST ocamlnet-3.2.1.tar.gz 2732852 RMD160 dba1ac7005a6d0ae03a4dacf37f13eee55f3cfce SHA1 69bb8228ea5f8f7f258991b04196a555afe12e88 SHA256 3d68a178c172e2e68fbe0527b4224a07f5f61722515c7cecb1d77b1a96436ef0
DIST ocamlnet-3.4.1.tar.gz 3195528 RMD160 d55d84834549c9a0b32d9e5609cdf5df44e57ef1 SHA1 1359380351c2049325d4629fc837d543477bc28e SHA256 c8e802fc1ffdb4f1e9a74dfa274b2baf0e909ef3038384add7e3c573616a19a8
DIST ocamlnet-3.5.1.tar.gz 3290994 RMD160 133a2572e9ef8a5bf62880a2a6696391d0938a08 SHA1 7e1c2ab3ada6735139b47eb852495cd609ebfd6e SHA256 1304eea88aacbc08864e7ff8fce58fab495f41c99b6379784121fc9e92ca8426
DIST ocamlnet-3.5.tar.gz 3290489 RMD160 150b8aa3557b2fe96842273cd99e4eb7211f8e6a SHA1 c984c62861a7f3ba2dcef7fa3a29c7fa3cf36828 SHA256 bf509cdbfefa7cead1676131c41f22ea0aa516b8ade57a7d961cde9a1cb623f1

@ -1,188 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## build_w_camlp5.dpatch by Stefano Zacchiroli <zack@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Enable building against camlp5 (the "classical" version of camlp4)
@DPATCH@
diff -urNad trunk~/Makefile.rules trunk/Makefile.rules
--- trunk~/Makefile.rules 2007-07-31 18:20:57.000000000 +0200
+++ trunk/Makefile.rules 2007-09-08 12:42:33.000000000 +0200
@@ -13,7 +13,7 @@
OCAMLFIND = ocamlfind
OCAMLYACC = ocamlyacc
OCAMLLEX = ocamllex
-CAMLP4 = camlp4
+CAMLP4 = camlp5
OCAMLMKLIB = ocamlmklib
OCAMLDOC = $(OCAMLFIND) ocamldoc
diff -urNad trunk~/src/equeue-gtk1/Makefile trunk/src/equeue-gtk1/Makefile
--- trunk~/src/equeue-gtk1/Makefile 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/equeue-gtk1/Makefile 2007-09-08 12:42:33.000000000 +0200
@@ -9,7 +9,7 @@
INCLUDES += $(INC_EQUEUE)
-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/equeue-gtk1/Makefile.pre trunk/src/equeue-gtk1/Makefile.pre
--- trunk~/src/equeue-gtk1/Makefile.pre 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/equeue-gtk1/Makefile.pre 2007-09-08 12:42:33.000000000 +0200
@@ -6,6 +6,6 @@
include ./Makefile.gtk
-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/equeue-gtk2/Makefile.pre trunk/src/equeue-gtk2/Makefile.pre
--- trunk~/src/equeue-gtk2/Makefile.pre 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/equeue-gtk2/Makefile.pre 2007-09-08 12:42:33.000000000 +0200
@@ -6,7 +6,7 @@
include ./Makefile.gtk
-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile trunk/src/nethttpd-for-netcgi1/Makefile
--- trunk~/src/nethttpd-for-netcgi1/Makefile 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/nethttpd-for-netcgi1/Makefile 2007-09-08 12:42:33.000000000 +0200
@@ -8,7 +8,7 @@
nethttpd_engine.mli nethttpd_services.mli nethttpd_plex.mli
INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI1) $(INC_NETPLEX)
-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
#PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
# do this to enable test coverage calculations
diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile.pre trunk/src/nethttpd-for-netcgi1/Makefile.pre
--- trunk~/src/nethttpd-for-netcgi1/Makefile.pre 2007-09-08 12:42:32.000000000 +0200
+++ trunk/src/nethttpd-for-netcgi1/Makefile.pre 2007-09-08 12:42:33.000000000 +0200
@@ -6,6 +6,6 @@
INSTALL_EXTRA +=
-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/nethttpd-for-netcgi1/nethttpd_types.mli trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli
--- trunk~/src/nethttpd-for-netcgi1/nethttpd_types.mli 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli 2007-09-08 12:43:01.000000000 +0200
@@ -117,10 +117,10 @@
*)
class redirected_environment :
- ?in_state : Netcgi1_compat.Netcgi_env.input_state ->
- ?in_header : http_header ->
- ?properties : (string * string) list ->
- ?in_channel : Netchannels.in_obj_channel ->
+ ?in_state: Netcgi1_compat.Netcgi_env.input_state ->
+ ?in_header: http_header ->
+ ?properties: (string * string) list ->
+ ?in_channel: Netchannels.in_obj_channel ->
extended_environment ->
extended_environment
(** This class overlays the input-side containers of an existing environment.
diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile trunk/src/nethttpd-for-netcgi2/Makefile
--- trunk~/src/nethttpd-for-netcgi2/Makefile 2007-07-31 18:20:59.000000000 +0200
+++ trunk/src/nethttpd-for-netcgi2/Makefile 2007-09-08 12:42:33.000000000 +0200
@@ -9,7 +9,7 @@
nethttpd_intro.txt
INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI2) $(INC_NETPLEX)
-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
#PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
# do this to enable test coverage calculations
diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile.pre trunk/src/nethttpd-for-netcgi2/Makefile.pre
--- trunk~/src/nethttpd-for-netcgi2/Makefile.pre 2007-09-08 12:42:32.000000000 +0200
+++ trunk/src/nethttpd-for-netcgi2/Makefile.pre 2007-09-08 12:42:33.000000000 +0200
@@ -15,7 +15,7 @@
INSTALL_EXTRA +=
-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/netplex/Makefile trunk/src/netplex/Makefile
--- trunk~/src/netplex/Makefile 2007-07-31 18:21:00.000000000 +0200
+++ trunk/src/netplex/Makefile 2007-09-08 12:42:33.000000000 +0200
@@ -19,7 +19,7 @@
ALLMT_EXTRA = netplex_mt.cmo
OPTMT_EXTRA = netplex_mt.cmx
-PP_OPTIONS = -syntax camlp4o -package camlp4
+PP_OPTIONS = -syntax camlp5o -package camlp5
OCAMLC_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
OCAMLOPT_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
diff -urNad trunk~/src/netplex/Makefile.pre trunk/src/netplex/Makefile.pre
--- trunk~/src/netplex/Makefile.pre 2007-07-31 18:21:00.000000000 +0200
+++ trunk/src/netplex/Makefile.pre 2007-09-08 12:42:33.000000000 +0200
@@ -9,7 +9,7 @@
INSTALL_EXTRA = netplex-packlist netplex_mt.cmo netplex_mt.cmx netplex_mt.o
INSTOTHER = install-netplex-admin
-PP_OPTIONS = -syntax camlp4o -package camlp4
+PP_OPTIONS = -syntax camlp5o -package camlp5
include $(TOP_DIR)/Makefile.rules
diff -urNad trunk~/src/netplex/netplex_config.ml trunk/src/netplex/netplex_config.ml
--- trunk~/src/netplex/netplex_config.ml 2007-07-31 18:21:00.000000000 +0200
+++ trunk/src/netplex/netplex_config.ml 2007-09-08 12:42:33.000000000 +0200
@@ -29,7 +29,7 @@
and semi_parse_tree_list =
parser
| [< 'Kwd ";";
- tl = parse_tree_list;
+ tl = parse_tree_list
>] -> tl
| [< >] -> []
@@ -47,7 +47,7 @@
and parse_rhs =
parser
| [< 'Kwd "=";
- v = parse_param_value;
+ v = parse_param_value
>] ->
`Parameter v
| [< 'Kwd "{";
diff -urNad trunk~/src/netstring/Makefile.def trunk/src/netstring/Makefile.def
--- trunk~/src/netstring/Makefile.def 2007-07-31 18:20:58.000000000 +0200
+++ trunk/src/netstring/Makefile.def 2007-09-08 12:42:33.000000000 +0200
@@ -46,7 +46,7 @@
netchannels_tut.txt netmime_tut.txt netsendmail_tut.txt \
netulex_tut.txt neturl_tut.txt
-PP_OPTIONS = -package camlp4 -syntax camlp4o
+PP_OPTIONS = -package camlp5 -syntax camlp5o
OCAMLC_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
OCAMLOPT_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
diff -urNad trunk~/src/netstring/netmime.ml trunk/src/netstring/netmime.ml
--- trunk~/src/netstring/netmime.ml 2007-07-31 18:20:58.000000000 +0200
+++ trunk/src/netstring/netmime.ml 2007-09-08 12:42:33.000000000 +0200
@@ -579,7 +579,7 @@
;;
-let storage ?ro ?fin : store -> (mime_body * out_obj_channel) = function
+let storage ?ro ?fin = function
`Memory ->
let body = new memory_mime_body_int ~ro_first:false ?ro "" in
let body_ch = body#open_value_wr() in

@ -1,11 +0,0 @@
Index: ocamlnet-2.2.9/src/rpc-auth-local/Makefile
===================================================================
--- ocamlnet-2.2.9.orig/src/rpc-auth-local/Makefile
+++ ocamlnet-2.2.9/src/rpc-auth-local/Makefile
@@ -1,5 +1,6 @@
TOP_DIR=../..
+CC_OPTIONS += -ccopt -D_GNU_SOURCE
PKGNAME = rpc-auth-local
OBJECTS = rpc_auth_local.cmo
COBJECTS = rpclocal.o

@ -1,72 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.11 2009/09/28 16:43:22 betelgeuse Exp $
EAPI="2"
inherit eutils findlib
DESCRIPTION="Modules for OCaml application-level Internet protocols"
HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
LICENSE="as-is GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE="gtk ssl tk httpd +ocamlopt"
RESTRICT="installsources"
# the auth-dh compile flag has been disabled as well, since it depends on
# ocaml-cryptgps, which is not available.
DEPEND=">=dev-ml/findlib-1.0
>=dev-ml/pcre-ocaml-5
>=dev-ml/camlp5-5.05
>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
gtk? ( >=dev-ml/lablgtk-2 )
ssl? ( dev-ml/ocaml-ssl )"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}/build_w_camlp5.dpatch"
epatch "${FILESDIR}/${P}-glibc28.patch"
}
ocamlnet_use_with() {
if use $1; then
echo "-with-$2"
else
echo "-without-$2"
fi
}
ocamlnet_use_enable() {
if use $1; then
echo "-enable-$2"
else
echo "-disable-$2"
fi
}
src_configure() {
./configure \
-bindir /usr/bin \
-datadir /usr/share/${PN} \
$(ocamlnet_use_enable gtk gtk2) \
$(ocamlnet_use_enable ssl ssl) \
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_with httpd nethttpd) \
|| die "Error : econf failed!"
}
src_compile() {
emake -j1 all || die "make failed"
if use ocamlopt; then
emake -j1 opt || die "make failed"
fi
}
src_install() {
export STRIP_MASK="*/bin/*"
findlib_src_install
}

@ -1,72 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.2.1.ebuild,v 1.3 2011/05/09 08:42:19 phajdan.jr Exp $
EAPI="2"
inherit eutils findlib
MY_P=${P/_beta/test}
DESCRIPTION="Modules for OCaml application-level Internet protocols"
HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
LICENSE="as-is GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE="gtk ssl tk httpd +ocamlopt zip"
RESTRICT="installsources"
# the auth-dh compile flag has been disabled as well, since it depends on
# ocaml-cryptgps, which is not available.
DEPEND=">=dev-ml/findlib-1.0
>=dev-ml/pcre-ocaml-5
>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
gtk? ( >=dev-ml/lablgtk-2 )
ssl? ( >=dev-ml/ocaml-ssl-0.4 )
zip? ( dev-ml/camlzip )
"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
ocamlnet_use_with() {
if use $1; then
echo "-with-$2"
else
echo "-without-$2"
fi
}
ocamlnet_use_enable() {
if use $1; then
echo "-enable-$2"
else
echo "-disable-$2"
fi
}
src_configure() {
./configure \
-bindir /usr/bin \
-datadir /usr/share/${PN} \
$(ocamlnet_use_enable gtk gtk2) \
$(ocamlnet_use_enable ssl ssl) \
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_enable zip zip) \
$(ocamlnet_use_with httpd nethttpd) \
|| die "Error : econf failed!"
}
src_compile() {
emake -j1 all || die "make failed"
if use ocamlopt; then
emake -j1 opt || die "make failed"
fi
}
src_install() {
export STRIP_MASK="*/bin/*"
findlib_src_install
}

@ -1,75 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.4.1.ebuild,v 1.1 2011/11/02 15:05:41 aballier Exp $
EAPI="2"
inherit eutils findlib
MY_P=${P/_beta/test}
DESCRIPTION="Modules for OCaml application-level Internet protocols"
HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
LICENSE="as-is GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
RESTRICT="installsources"
# the auth-dh compile flag has been disabled as well, since it depends on
# ocaml-cryptgps, which is not available.
DEPEND=">=dev-ml/findlib-1.0
pcre? ( >=dev-ml/pcre-ocaml-5 )
>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
cryptokit? ( dev-ml/cryptokit )
gtk? ( >=dev-ml/lablgtk-2 )
ssl? ( >=dev-ml/ocaml-ssl-0.4 )
zip? ( dev-ml/camlzip )
"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
ocamlnet_use_with() {
if use $1; then
echo "-with-$2"
else
echo "-without-$2"
fi
}
ocamlnet_use_enable() {
if use $1; then
echo "-enable-$2"
else
echo "-disable-$2"
fi
}
src_configure() {
./configure \
-bindir /usr/bin \
-datadir /usr/share/${PN} \
$(ocamlnet_use_enable cryptokit crypto) \
$(ocamlnet_use_enable gtk gtk2) \
$(ocamlnet_use_enable pcre pcre) \
$(ocamlnet_use_enable ssl ssl) \
$(ocamlnet_use_enable tk tcl) \
$(ocamlnet_use_enable zip zip) \
$(ocamlnet_use_with httpd nethttpd) \
|| die "Error : econf failed!"
}
src_compile() {
emake -j1 all || die "make failed"
if use ocamlopt; then
emake -j1 opt || die "make failed"
fi
}
src_install() {
export STRIP_MASK="*/bin/*"
findlib_src_install
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.5.1.ebuild,v 1.1 2012/03/07 09:28:17 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.5.1.ebuild,v 1.2 2012/06/30 18:18:04 aballier Exp $
EAPI="2"
@ -13,7 +13,7 @@ SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
LICENSE="as-is GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
RESTRICT="installsources"

@ -1,2 +1,3 @@
DIST sexplib-108.00.01.tar.gz 111102 RMD160 0907d4263d2eae2ec196b47ffbe479a6446b9e2f SHA1 800d240077a5f8353727094c4231eabc06e73396 SHA256 a96779b691d38b5803f5a6a4cbd5d648ff46b8d61538d8bda06bd90e534a2069
DIST sexplib-7.0.4.tar.gz 99611 RMD160 936d3bea829d1f1159687622a43d69a5e5b61ce4 SHA1 f041c024832e24ba9c6c7549a2fea8352bc65842 SHA256 83c6c771f423d91bebc4f57202066358adf3775fb000dd780079f51436045a43
DIST sexplib-7.0.5.tar.gz 100582 RMD160 ef93d415b149a3f0698ac66072e43a74c7663d5c SHA1 b57782b7e2d9f2465da32ac76d5991c7fe96d051 SHA256 b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697

@ -0,0 +1,42 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/sexplib/sexplib-108.00.01.ebuild,v 1.1 2012/06/30 15:03:03 aballier Exp $
EAPI=3
OASIS_BUILD_DOCS=1
OASIS_BUILD_TESTS=1
inherit oasis
DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
SRC_URI="http://bitbucket.org/yminsky/ocaml-core/downloads/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-ml/type-conv-108.00.01"
DEPEND="${RDEPEND}
doc? ( virtual/latex-base dev-texlive/texlive-latexextra )"
DOCS=( "README" "Changelog" )
src_compile() {
oasis_src_compile
if use doc ; then
cd "${S}/doc"
pdflatex README || die
pdflatex README || die
fi
}
src_install() {
oasis_src_install
if use doc; then
dodoc doc/README.pdf || die
fi
}

@ -1,2 +1,3 @@
DIST type-conv-3.0.4.tar.gz 50638 RMD160 2e2abf221cb8606f03737580d59fb9856075c9fc SHA1 ff96519153144502ebcbb3c337990f9b53e06b4b SHA256 63b6f2872d29fb4c0b1448343bb5ec0649365126756128049d45a81238b59f12
DIST type-conv-3.0.5.tar.gz 51268 RMD160 e97e0a2f383ffb94d94ea1d85030d7bf8ec691ad SHA1 6cd36e5b314b6a315db86aa6bd4c823cbcac431a SHA256 90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198
DIST type_conv-108.00.01.tar.gz 51910 RMD160 19cb0b7c9757451b73ef685bdc2698ef7895b599 SHA1 463616dba28dbd97b8bd436a1dbfb67dd693e0c9 SHA256 a3a3a0e4f7b194b3f6f5384a2390b125167d0bdd7ebed84a154cf94c8bc2f4a9

@ -0,0 +1,26 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/type-conv/type-conv-108.00.01.ebuild,v 1.1 2012/06/30 15:02:07 aballier Exp $
EAPI="3"
OASIS_BUILD_DOCS=1
inherit oasis
MY_P=${PN/-/_}-${PV}
DESCRIPTION="Mini library required for some other preprocessing libraries"
HOMEPAGE="http://bitbucket.org/yminsky/ocaml-core/wiki/Home"
SRC_URI="http://bitbucket.org/yminsky/ocaml-core/downloads/${MY_P}.tar.gz"
LICENSE="LGPL-2.1-linking-exception"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
DOCS=( "README.txt" "Changelog" )
S="${WORKDIR}/${MY_P}"

@ -1,2 +1,3 @@
DIST aws-sdk-for-ruby-1.5.3.tar.gz 1217280 RMD160 a8ef9fb59025c21527b39b53f5332aed6a100cdf SHA1 f3fb8ce19639b20bd0d614010a8e96820826d4f7 SHA256 ba07a5cd2f43c82f9490d58170dc5cd94f978ee5c5bf80ad80ed2ba809312674
DIST aws-sdk-for-ruby-1.5.5.tar.gz 1220303 RMD160 ee1418817475fe03635d14a5fa3357876e9dbb36 SHA1 435c6f832520155971098868da906665cede0fcc SHA256 74601b64f767dba9e72247c4b48572f01f1e955cc5a52a176424d96c22a98891
DIST aws-sdk-for-ruby-1.5.6.tar.gz 1220994 RMD160 74d9eef0b6e0a17ffa152b208967b9fdd441f5b9 SHA1 286cd8e216f1da830b60441841ba38d5372a9f2f SHA256 55ae6fb3434e825891a8fd73a5012bb0f31e98a474ba79b765bf1a414b00afc8

@ -0,0 +1,67 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild,v 1.1 2012/06/30 21:12:13 flameeyes Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
GITHUB_USER="amazonwebservices"
GITHUB_PROJECT="${PN}-for-ruby"
RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
RUBY_FAKEGEM_GEMSPEC="${T}/${P}.gemspec"
inherit ruby-fakegem
DESCRIPTION="Official SDK for Amazon Web Services"
HOMEPAGE="http://aws.amazon.com/sdkforruby"
SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
LICENSE="APSL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl
>=dev-ruby/httparty-0.7
>=dev-ruby/json-1.4
>=dev-ruby/nokogiri-1.4.4
>=dev-ruby/uuidtools-2.1"
ruby_add_bdepend "
test? ( dev-ruby/rspec )"
all_ruby_prepare() {
rm Gemfile* || die
epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.patch
}
all_ruby_compile() {
if use doc; then
rdoc || die
fi
}
each_ruby_test() {
${RUBY} -S rspec -Ilib -raws || die
}
each_ruby_install() {
sed -e "s:VERSION:${PV}:" "${FILESDIR}"/${PN}.gemspec > "${RUBY_FAKEGEM_GEMSPEC}"
each_fakegem_install
}
all_ruby_install() {
all_fakegem_install
insinto /usr/share/doc/${PF}
doins -r recipebook samples
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.4.6.ebuild,v 1.2 2012/05/17 10:48:14 tomka Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-0.4.6.ebuild,v 1.3 2012/07/01 07:26:09 graaff Exp $
EAPI="4"
@ -24,7 +24,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/activerecord )"
ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/activerecord[sqlite3] )"
ruby_add_rdepend "dev-ruby/fast_gettext"
all_ruby_prepare() {

@ -1 +1,2 @@
DIST coccinelle-1.0.0-rc11.tgz 2356524 RMD160 eac8bf5e92dd5b204736ffa65a211f03c8e892e5 SHA1 a48dfb9ad10769da9676c9d38704397a0866ff42 SHA256 275d0beee5a165ed6edfd4da70b98f9f802e6de5d59ebc075041ff8c126d03df
DIST coccinelle-1.0.0-rc12.tgz 3197967 RMD160 1e3a9d4d13be2f15d6a0ac6e11744d266252ee6c SHA1 42f418ff9c90a568e743619f127b9d6b041fe431 SHA256 03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d

@ -0,0 +1,127 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc12.ebuild,v 1.1 2012/06/30 16:09:07 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
inherit multilib eutils python bash-completion-r1 elisp-common
MY_P="${P/_/-}"
DESCRIPTION="Program matching and transformation engine"
HOMEPAGE="http://coccinelle.lip6.fr/"
SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
# ocaml enables ocaml scripting (uses findlib)
CDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
dev-ml/sexplib
emacs? ( virtual/emacs )
ocaml? ( dev-ml/findlib )
pcre? ( dev-ml/pcre-ocaml )"
RDEPEND="${CDEPEND}
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? (
virtual/latex-base
dev-texlive/texlive-latexextra
dev-texlive/texlive-fontsextra
)"
REQUIRED_USE="test? ( ocaml python )"
DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
S=${WORKDIR}/${MY_P}
SITEFILE=50coccinelle-gentoo.el
pkg_setup() {
if use python ; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
if use python ; then
# Fix python install location
sed -i -e "s:\$(SHAREDIR)/python:$(python_get_sitedir):" \
-e "s:PYTHON_TARGET:PYTHON_INSTALL_TARGET:" Makefile || die
sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \
scripts/spatch.sh.in || die
fi
}
src_configure() {
econf \
$(use_enable python) \
$(use_enable ocaml) \
$(use_enable pcre) \
$(use_enable pcre pcre-syntax)
sed -i -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
-e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
Makefile.config || die
}
src_compile() {
emake depend
emake
use ocamlopt && emake opt
if use doc ; then
VARTEXFONTS="${T}"/fonts emake docs
fi
if use emacs ; then
elisp-compile editors/emacs/cocci.el || die
fi
}
src_test() {
source env.sh # needed for built in-place python plugin
./spatch standard.h -parse_c -dir tests/ || die
yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
if use ocamlopt ; then
./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall || die
fi
}
src_install() {
default
use doc && dodoc docs/manual/*.pdf
newbashcomp scripts/spatch.bash_completion spatch
if use emacs ; then
elisp-install ${PN} editors/emacs/*
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
fi
if use vim-syntax ; then
newdoc editors/vim/README README-vim
rm editors/vim/README || die
insinto /usr/share/vim/vimfiles
doins -r editors/vim/*
fi
export STRIP_MASK='*/coccinelle/spatch'
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

@ -1,3 +1,4 @@
DIST makepp-1.18.tar.gz 236990 RMD160 9251d4ad144fbac7a989c3aa91944a86eb78695f SHA1 bddd840a713bc99ea457b8d842d059ea45fa907c SHA256 0a1ee878452d44ecdf52dae928418ed2c426b5bbb95bc223b787329f9f5cc2be
DIST makepp-1.40.1a.tar.gz 278170 RMD160 086880c656391c37ad6cd5ccf6ecd9ea613230b5 SHA1 fe2f6e34d2e17517dd13b10a1d56ffd50f945dda SHA256 eb9991e9c726836e9b214377976dc15f66f4f6045f9713cd36c8c6b73c1f8e83
DIST makepp-1.50-110621.txz 496296 RMD160 e5373e88bfdab1e3da8b90b34b432d38b30905c9 SHA1 c94fa474fc96fecd65e7543176fded5ea18c4902 SHA256 70d6af24020bcdc1ad4607817163e18c952792a39f67674ee60562545c940330
DIST makepp-2.0.txz 534708 RMD160 97ed96756d1b8becb1b59f958cb9aa3edd306594 SHA1 231bafb43290657c79d2937029a68ebe08f1922b SHA256 0c617b1c23b537070d43ace2501ac1b30503b126a729206a7853933485d2bc78

@ -0,0 +1,47 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/makepp/makepp-2.0.ebuild,v 1.1 2012/06/30 15:56:05 vapier Exp $
EAPI="4"
MY_PV=${PV/_}
MY_P="${PN}-${MY_PV}"
DESCRIPTION="GNU make replacement"
HOMEPAGE="http://makepp.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~ppc ~sparc ~x86"
IUSE=""
DEPEND=">=dev-lang/perl-5.6.0"
S=${WORKDIR}/${MY_P}
src_unpack() {
ln -s "${DISTDIR}/${A}" ${P}.tar.xz
unpack ./${P}.tar.xz
}
src_prepare() {
# default "all" rule is to run tests :x
sed -i '/^all:/s:test::' config.pl || die
}
src_configure() {
# not an autoconf configure script
./configure \
--prefix=/usr \
--bindir=/usr/bin \
--htmldir=/usr/share/doc/${PF}/html \
--mandir=/usr/share/man \
--datadir=/usr/share/makepp \
|| die "configure failed"
}
src_test() {
# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
export CCACHE_UNIFY=1
ROOT= default
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild,v 1.1 2012/03/17 10:57:05 fauli Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild,v 1.2 2012/07/01 06:09:57 fauli Exp $
EAPI="3"
PYTHON_DEPEND="2"
@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
IUSE=""
DEPEND=">=dev-vcs/bzr-1.14
DEPEND=">=dev-vcs/bzr-2.5.0
!dev-vcs/bzr-rebase"
RDEPEND="${DEPEND}
!<dev-vcs/bzr-svn-0.6"

@ -1,3 +1,4 @@
DIST bzr-2.4.1.tar.gz 7279631 RMD160 539c5205fe9c1c6820ad6a87caddbdbe900f834c SHA1 5a9da32fe6dfdbd13826b293c007683c9858fcab SHA256 548bd4849e9e7fb3938277249fa026455e60054c78912d665694384af1f07fe6
DIST bzr-2.4.2.tar.gz 7528721 RMD160 47ecfd1651d10aeea28c0dff3124c637dbbb93ab SHA1 3663b862dc8fb9729f9aae2427cbab2af9c901ad SHA256 a5b8db77c61e54450680befdbb4795f8a972fa5a167123786360d898b752656f
DIST bzr-2.5.0.tar.gz 9910498 RMD160 3581accba3317b6f8b4ae889b0599d9546bb6877 SHA1 2eaf6340ffa35db425832419bbd88bb470d22af3 SHA256 cb657fca640d3c36794a20e5a1d7398404189541b1290fa1bf19a5eb4e903133
DIST bzr-2.5.1.tar.gz 10451513 RMD160 c577d1aff17782774f0335d317d776a03a464d26 SHA1 7e2776e3aaf8fb48828026d3fc2a3047465eea5e SHA256 967346fa6cc52971a8dfd5171ec22e1928cf455fb4317013b05b0915ff927982

@ -0,0 +1,86 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1.ebuild,v 1.1 2012/07/01 06:07:58 fauli Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
PYTHON_USE_WITH="threads ssl"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
inherit bash-completion-r1 distutils eutils versionator
MY_P=${PN}-${PV}
SERIES=$(get_version_component_range 1-2)
DESCRIPTION="Bazaar is a next generation distributed version control system."
HOMEPAGE="http://bazaar-vcs.org/"
#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
SRC_URI="http://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="curl doc +sftp test"
RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
curl? ( dev-python/pycurl )
sftp? ( dev-python/paramiko )"
DEPEND="test? (
${RDEPEND}
|| ( dev-python/pyftpdlib dev-python/medusa )
dev-python/subunit
>=dev-python/testtools-0.9.5
)"
S="${WORKDIR}/${MY_P}"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
DOCS="doc/*.txt"
PYTHON_MODNAME="bzrlib"
src_prepare() {
distutils_src_prepare
# Don't regenerate .c files from .pyx when pyrex is found.
epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
}
src_test() {
# Some tests expect the usual pyc compiling behaviour.
python_enable_pyc
# Define tests which are known to fail below.
local skip_tests="("
# https://bugs.launchpad.net/bzr/+bug/850676
skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
skip_tests+=")"
if [[ -n ${skip_tests} ]]; then
einfo "Skipping tests known to fail: ${skip_tests}"
fi
testing() {
LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
}
python_execute_function testing
# Just to make sure we don't hit any errors on later stages.
python_disable_pyc
}
src_install() {
distutils_src_install --install-data "${EPREFIX}/usr/share"
if use doc; then
docinto developers
dodoc doc/developers/* || die
for doc in mini-tutorial tutorials user-{guide,reference}; do
docinto $doc
dodoc doc/en/$doc/* || die
done
fi
dobashcomp contrib/bash/bzr || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.8.1-r1.ebuild,v 1.3 2012/05/04 04:22:29 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/games-arcade/monster-masher/monster-masher-1.8.1-r1.ebuild,v 1.4 2012/06/30 22:17:34 mr_bones_ Exp $
EAPI=3
GCONF_DEBUG="no"
@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
src_prepare() {
# Port to libcanberra, bug #348605
epatch "${FILESDIR}"/${P}-libcanberra.patch
# build with newer glib - bug #424313
sed -i -e 's:glib/gtypes:glib:' src/pixbuf-drawing.hpp || die
intltoolize --force --copy --automake || die
eautoreconf

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-14.1.ebuild,v 1.1 2012/05/30 15:53:23 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-14.1.ebuild,v 1.2 2012/06/30 21:57:49 jdhore Exp $
EAPI=2
inherit eutils gnome2
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="~amd64 ~ppc x86"
IUSE="nls"
RDEPEND=">=dev-libs/glib-2.6:2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-board/pychess/pychess-0.10.1.ebuild,v 1.1 2012/05/31 11:59:04 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/games-board/pychess/pychess-0.10.1.ebuild,v 1.2 2012/06/30 21:57:54 jdhore Exp $
EAPI=4
PYTHON_DEPEND="2"
@ -12,7 +12,7 @@ SRC_URI="http://pychess.googlecode.com/files/${P/_/}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 x86"
IUSE="gstreamer"
DEPEND="dev-python/librsvg-python

@ -1,11 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21.ebuild,v 1.1 2012/06/29 21:48:09 hasufell Exp $
# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r1.ebuild,v 1.1 2012/06/30 15:17:15 hasufell Exp $
EAPI=4
CDROM_OPTIONAL="yes"
inherit eutils cdrom check-reqs games
DESCRIPTION="Arx Fatalis data files"
@ -22,28 +20,51 @@ RDEPEND="games-rpg/arx-libertatis"
DEPEND="app-arch/cabextract
app-arch/innoextract"
LANGS="linguas_de +linguas_en linguas_es linguas_fr linguas_it linguas_ru"
IUSE="$IUSE $LANGS"
REQUIRED_USE="^^ ( ${LANGS//+/} )"
CHECKREQS_DISK_BUILD="621M"
CHECKREQS_DISK_USR="617M"
S=${WORKDIR}
src_unpack() {
cdrom_get_cds bin/data2.pak
cdrom_get_cds bin/Arx.ttf
local mylang
case ${LINGUAS} in
de) mylang="german" ;;
en) mylang="english" ;;
es) mylang="spanish" ;;
fr) mylang="french" ;;
it) mylang="italian" ;;
ru) mylang="russian" ;;
esac
elog "Chosen language is ${mylang}"
find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
innoextract --lowercase --language=multilang \
innoextract --lowercase --language=${mylang} \
"${DISTDIR}"/ArxFatalis_1.21_MULTILANG.exe || die
}
src_install() {
insinto "${GAMES_DATADIR}"/arx
doins -r app/{graph,misc,data2.pak} *.pak "${CDROM_ROOT}"/bin/LOC.pak
doins -r app/{graph,misc}
find . -iname "*.pak" -exec doins '{}' \;
dodoc app/{manual,map}.pdf
# convert to lowercase
find "${D}" -type f -exec sh -c 'echo "${1}"
cd "${D}"
find . -type f -exec sh -c 'echo "${1}"
lower="`echo "${1}" | tr [:upper:] [:lower:]`"
[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
prepgamesdirs
}
pkg_postinst() {
elog "You need Arx Fatalis in the chosen language, otherwise set it in package.use!"
games_pkg_postinst
}

@ -5,6 +5,12 @@
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
<maintainer>
<email>daniel@constexpr.org</email>
<name>Daniel Scharrer</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild,v 1.1 2012/06/29 21:48:35 hasufell Exp $
# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild,v 1.2 2012/06/30 15:09:54 hasufell Exp $
EAPI=4
@ -42,7 +42,8 @@ src_install() {
doins bin/Logo.bmp bin/Arx.ttf
# convert to lowercase
find "${D}" -type f -exec sh -c 'echo "${1}"
cd "${D}"
find . -type f -exec sh -c 'echo "${1}"
lower="`echo "${1}" | tr [:upper:] [:lower:]`"
[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;

@ -5,6 +5,12 @@
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
<maintainer>
<email>daniel@constexpr.org</email>
<name>Daniel Scharrer</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
</pkgmetadata>

@ -1,2 +1,3 @@
DIST mana-0.5.3.tar.gz 2473239 RMD160 e296a0c961805a7b764736cc37e9602a292740b9 SHA1 cdf51109efd0bed72c87596f4b11e63a22540371 SHA256 3b9781cc2aa89fb0723d76df7407f4b89d1305e42166b2f4c850f3acd61022d5
DIST mana-0.6.0.tar.gz 4621532 RMD160 3a3ba1497751bf6e15b6cebdd8a2caf0b7a1abe1 SHA1 00dab9ab6fd61a6e2347fd03e2764676a0c2fc5e SHA256 d83d6c3ee7f527175a5db3ed25c95b8417006c3fef273c68d13352ec57d93474
DIST mana-0.6.1.tar.gz 4651447 RMD160 f8ba2b39ea9f3a5be768e852dca7154f5ec10a9c SHA1 712d1212042ace70103ccf38a32578bec05e8b63 SHA256 b945cd3e32489dfa5b8e82d571cc11e0e5308576307fca4d8dd7cf3cf6ed8c55

@ -0,0 +1,71 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Sat Jun 30 20:48:23 UTC 2012
Subject: build system
use system fonts
make datadir and bindir paths modifiable
https://github.com/mana/mana/commit/02a7b2aa739cd0cf5a855f0a78b91d9fd5ad4385
don't overwrite system/environment CXXFLAGS
https://github.com/mana/mana/commit/2305ca095bee6b32c930f71b99d4c1205ceb561b
add option to use system enet headers
https://github.com/mana/mana/commit/d754a64e3839b3888d489046546195792e4ecc34
--- data/CMakeLists.txt.old 2011-08-02 12:15:38.520030381 +0200
+++ data/CMakeLists.txt 2011-08-02 12:15:44.971029615 +0200
@@ -1,6 +1,5 @@
SET(DATA_DIR ${PKG_DATADIR}/data)
-ADD_SUBDIRECTORY(fonts)
ADD_SUBDIRECTORY(graphics)
ADD_SUBDIRECTORY(help)
ADD_SUBDIRECTORY(icons)
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -42,9 +42,9 @@
IF (NOT OSX AND NOT BEOS)
OPTION(USE_X11 "Use X11 Clipboard functionality" ON)
ENDIF ()
- SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana)
+ SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana CACHE PATH "Mana datadir")
SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
- SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
+ SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Mana bindir")
ENDIF (WIN32)
ADD_SUBDIRECTORY(data)
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -12,7 +12,7 @@
IF (CMAKE_COMPILER_IS_GNUCXX)
# Help getting compilation warnings
- SET(CMAKE_CXX_FLAGS "-Wall")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
IF (WIN32)
# This includes enough debug information to get something useful
# from Dr. Mingw while keeping binary size down. Almost useless
--- libs/enet/CMakeLists.txt
+++ libs/enet/CMakeLists.txt
@@ -1,3 +1,7 @@
+INCLUDE(FindPkgConfig)
+
+OPTION(WITH_BUNDLEDHEADERS "Use bundled enet headers" ON)
+
INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(gethostbyaddr_r HAS_GETHOSTBYNAME_R)
IF(HAS_GETHOSTBYNAME_R EQUAL 1)
@@ -49,7 +53,12 @@
win32.c
)
-INCLUDE_DIRECTORIES("include")
+IF (WITH_BUNDLEDHEADERS)
+ INCLUDE_DIRECTORIES("include")
+ELSE (WITH_BUNDLEDHEADERS)
+ PKG_CHECK_MODULES(ENET REQUIRED libenet)
+ INCLUDE_DIRECTORIES("${ENET_INCLUDEDIR}")
+ENDIF()
ADD_LIBRARY(enet STATIC ${SRCS})
IF (BEOS)

@ -0,0 +1,75 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/mana-0.6.1.ebuild,v 1.1 2012/06/30 20:57:14 hasufell Exp $
EAPI=2
inherit eutils cmake-utils games
DESCRIPTION="A fully free and open source MMORPG game client"
HOMEPAGE="http://manasource.org/"
SRC_URI="http://manasource.org/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="nls opengl server"
RDEPEND="!=games-rpg/tmw-0.5.2
>=dev-games/physfs-1.0.0
dev-libs/libxml2
media-libs/sdl-mixer[vorbis]
media-libs/sdl-image[png]
media-libs/sdl-net
media-libs/sdl-ttf
net-misc/curl
sys-libs/zlib
media-libs/libpng:0
media-fonts/dejavu
>=dev-games/guichan-0.8.1[sdl]
media-libs/libsdl[X,opengl?,video]
media-libs/sdl-gfx
x11-libs/libX11
nls? ( virtual/libintl )
opengl? ( virtual/opengl )"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )
server? ( net-libs/enet )"
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
base_src_prepare
if [[ ${LINGUAS+set} ]]; then
for lang in $(grep -v ^# po/LINGUAS); do
has $lang $LINGUAS || sed -i "s:^${lang}:#${lang}:" po/LINGUAS
done
fi
}
src_compile() {
cmake-utils_src_compile
}
src_configure() {
mycmakeargs=(
$(cmake-utils_use_with opengl)
$(cmake-utils_use_enable nls)
$(cmake-utils_use_enable server MANASERV)
-DPKG_DATADIR="${GAMES_DATADIR}/${PN}"
-DPKG_BINDIR="${GAMES_BINDIR}"
-DWITH_BUNDLEDHEADERS=OFF
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf
insinto "${GAMES_DATADIR}"/${PN}/data
prepgamesdirs
}

@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
<use>
<flag name="server">Enable Manaserv support</flag>
</use>
</pkgmetadata>

@ -1 +1 @@
DIST openra-20120504.tar.xz 6655756 RMD160 3d334e5ba4dd5e63a6b30c5dc2202f48ea99ca3b SHA1 0e29c3c4eff6b2422b4a449662b5a8d5e0b2faba SHA256 3d210d237d5f9f7cec5f0584cbe6919c946873dd8d3ed14f18f61907d413e75e
DIST openra-20120630.tar.gz 10330304 RMD160 01cc9bceeb8097e44b7f96e29c2be189d12410ae SHA1 9921f7e20aa6721abd1d390c793ab110060031f6 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c

@ -1,23 +0,0 @@
From: hasufell <julian.ospald@googlemail.com>
Date: Sat Mar 31 21:32:07 CEST 2012
workaround for locale/volume bug
https://github.com/OpenRA/OpenRA/issues/2005
--- Makefile
+++ Makefile
@@ -223,10 +223,14 @@
@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
@echo "#!/bin/sh" > openra
+ @echo "LC_ALL=C" >> openra
+ @echo "export LC_ALL" >> openra
@echo "cd "$(datadir)"/openra" >> openra
@echo "exec mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra
@echo "#!/bin/sh" > openra-editor
+ @echo "LC_ALL=C" >> openra-editor
+ @echo "export LC_ALL" >> openra-editor
@echo "cd "$(datadir)"/openra" >> openra-editor
@echo "exec mono "$(datadir)"/openra/OpenRA.Editor.exe \"$$""@\"" >> openra-editor

@ -0,0 +1,18 @@
Date: Sun Jul 1 00:34:03 UTC 2012
Subject: https://github.com/OpenRA/OpenRA/issues/2005
fixed in https://github.com/OpenRA/OpenRA/commit/c068be453a9bcb7bc1fdd5874dc1296b6f4810d0#diff-0
--- OpenRA.FileFormats/FieldLoader.cs
+++ OpenRA.FileFormats/FieldLoader.cs
@@ -325,6 +325,10 @@
((int)c.B).Clamp(0, 255));
}
+ // Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
+ if (t == typeof(float))
+ return ((float)v).ToString(CultureInfo.InvariantCulture);
+
if (t == typeof(Rectangle))
{
var r = (Rectangle)v;

@ -1,14 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20120504.ebuild,v 1.4 2012/06/02 15:56:16 hasufell Exp $
# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20120630.ebuild,v 1.2 2012/07/01 00:49:49 hasufell Exp $
EAPI=4
inherit eutils mono gnome2-utils games
inherit eutils mono gnome2-utils vcs-snapshot games
DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
HOMEPAGE="http://open-ra.org/"
SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
SRC_URI="http://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@ -25,8 +25,12 @@ DEPEND="dev-dotnet/libgdiplus
cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
RDEPEND="${DEPEND}"
src_unpack() {
vcs-snapshot_src_unpack
}
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
epatch "${FILESDIR}"/${P}-sound.patch
# register game-version
sed \

@ -1 +1,2 @@
DIST address_keeper-1.0.5.tar.gz 378657 RMD160 27da40b9c9d3568ab76106f4966bb1fdfac70299 SHA1 5872482e107107288feb98c66aefcdb300149feb SHA256 6c4b45983f1a919087dc616a3aca7e88c41bcdcda198d6a5ae9429dfc41ed2be
DIST address_keeper-1.0.6.tar.gz 381376 RMD160 e9f377ed26370f15c529c360aab9c079aa417da7 SHA1 7ce770ce77851570e36b924df482824e52111d52 SHA256 ae0f7154a607a0ee2fbdd3e0e052160bcb2d1fa66975ba4e1caf16cc955f5ff9

@ -0,0 +1,28 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.6.ebuild,v 1.1 2012/06/30 15:24:42 fauli Exp $
inherit eutils
MY_P="${P#claws-mail-}"
DESCRIPTION="Plugin for Claws to collect all recipients in an address book folder"
HOMEPAGE="http://www.claws-mail.org/"
SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=mail-client/claws-mail-3.8.1"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog README
# kill useless files
rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save