diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
index 5574f69de966..42b55093836d 100644
--- a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.1-r2.ebuild,v 1.2 2012/02/02 17:00:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/freetts/freetts-1.2.1-r2.ebuild,v 1.1 2011/03/23 17:15:06 cbrannon Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.4
LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc jsapi mbrola"
src_unpack() {
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
index 679eda8d0682..8f2d1d458a39 100644
--- a/app-admin/ccze/ccze-0.2.1-r3.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.6 2012/02/04 20:54:59 ranger Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.3 2010/10/31 22:23:39 joker Exp $
inherit fixheadtails autotools eutils toolchain-funcs
@@ -14,31 +12,38 @@ RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
-DEPEND="dev-libs/libpcre
- sys-libs/ncurses"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+DEPEND="dev-libs/libpcre"
-src_prepare() {
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
- epatch "${FILESDIR}"/ccze-fbsd.patch
- epatch "${FILESDIR}"/ccze-segfault.patch
- epatch "${FILESDIR}"/ccze-ldflags.patch
+ epatch "${FILESDIR}"/ccze-fbsd.patch || die "epatch ccze-fbsd.patch failed"
+ epatch "${FILESDIR}"/ccze-segfault.patch || die "epatch ccze-segfault.patch"
+ epatch "${FILESDIR}"/ccze-ldflags.patch || die "epatch ccze-ldflags.patch"
# GCC 4.x fixes
sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
- -i src/Makefile.in || die
+ -i src/Makefile.in
sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
- -i configure.ac || die
+ -i configure.ac
eautoreconf
ht_fix_file Rules.mk.in
+}
+src_compile() {
+ # Bug #243314
tc-export CC
+ econf || die
+ emake || die
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ
}
diff --git a/app-admin/conky/conky-1.8.1-r6.ebuild b/app-admin/conky/conky-1.8.1-r6.ebuild
deleted file mode 100644
index 13fa849944e8..000000000000
--- a/app-admin/conky/conky-1.8.1-r6.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.4 2012/02/01 17:01:09 ranger Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
-IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
-
-DEPEND_COMMON="
- X? (
- imlib? ( media-libs/imlib2 )
- lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
- lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 )
- nvidia? ( media-video/nvidia-settings )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
- xmms2? ( media-sound/xmms2 )
- )
- curl? ( net-misc/curl )
- eve? ( net-misc/curl dev-libs/libxml2 )
- portmon? ( dev-libs/glib )
- lua? ( >=dev-lang/lua-5.1 )
- ncurses? ( sys-libs/ncurses )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- weather-xoap? ( dev-libs/libxml2 net-misc/curl )
- virtual/libiconv
- "
-RDEPEND="
- ${DEPEND_COMMON}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- "
-DEPEND="
- ${DEPEND_COMMON}
- dev-util/pkgconfig
- "
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-nvidia-x.patch" \
- "${FILESDIR}/${P}-xmms2.patch" \
- "${FILESDIR}/${P}-secunia-SA43225.patch" \
- "${FILESDIR}/${P}-acpitemp.patch" \
- "${FILESDIR}/${P}-curl-headers.patch" \
- "${FILESDIR}/${P}-maxinterfaces.patch" \
- "${FILESDIR}/${P}-utf8-scroll.patch" \
- "${FILESDIR}/${P}-battery-time.patch"
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use X; then
- myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
- myconf="${myconf} --enable-argb --enable-own-window"
- myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
- myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
- myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
- myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
- else
- myconf="--disable-x11 --disable-own-window --disable-argb"
- myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
- myconf="${myconf} --disable-audacious --disable-xmms2"
- fi
-
- econf \
- ${myconf} \
- $(use_enable apcupsd) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable eve) \
- $(use_enable hddtemp) \
- $(use_enable iostats) \
- $(use_enable lua) \
- $(use_enable thinkpad ibm) \
- $(use_enable math) \
- $(use_enable moc) \
- $(use_enable mpd) \
- $(use_enable ncurses) \
- $(use_enable portmon) \
- $(use_enable rss) \
- $(use_enable weather-metar) \
- $(use_enable weather-xoap) \
- $(use_enable wifi wlan)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog AUTHORS TODO || die
- dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim || die
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc || die
- fi
-}
-
-pkg_postinst() {
- elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
- elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
- elog
- elog "For more info on Conky's features please look at the Changelog in"
- elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
- elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
- elog
- elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
- elog
-}
diff --git a/app-admin/conky/files/conky-1.8.1-battery-time.patch b/app-admin/conky/files/conky-1.8.1-battery-time.patch
deleted file mode 100644
index 66e37958a075..000000000000
--- a/app-admin/conky/files/conky-1.8.1-battery-time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/linux.c.old 2012-01-12 08:18:58.525502553 -0500
-+++ b/src/linux.c 2012-01-12 08:19:29.786069277 -0500
-@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns
- the tradition! */
- else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
- sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
-+ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
-+ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
- else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
- sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
- else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
deleted file mode 100644
index 9137029fbcef..000000000000
--- a/app-admin/elektra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST elektra-0.7.1.tar.gz 1347524 RMD160 2b9153b508a535c80fef2795955eb98a8dfeb968 SHA1 bcc733cab0b391e5790c05635ab7161d9bdcaffa SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c
diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild
deleted file mode 100644
index d147d82146f8..000000000000
--- a/app-admin/elektra/elektra-0.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.1 2012/02/05 17:23:58 xmw Exp $
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
-HOMEPAGE="http://sourceforge.net/projects/elektra/"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="iconv static-libs"
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
- sys-devel/libtool
- iconv? ( virtual/libiconv )"
-
-src_prepare() {
- einfo 'Removing bundled libltdl'
- rm -rf libltdl || die
- sed -i -e '/^SUBDIRS/s:libltdl::' Makefile.am || die
- sed -i -e '1adeveldocDATA_INSTALL = install' doc/Makefile.am || die
-
- touch config.rpath
- eautoreconf
-}
-
-src_configure() {
- # berkeleydb, daemon, fstab, gconf, python do not work
- econf \
- --enable-filesys \
- --enable-hosts \
- --enable-ini \
- --enable-passwd \
- --disable-berkeleydb \
- --disable-fstab \
- --disable-gconf \
- --disable-daemon \
- --enable-cpp \
- --disable-python \
- --enable-gcov \
- $(use_enable iconv) \
- $(use_enable static-libs static) \
- --with-docdir=/usr/share/doc/${PF} \
- --with-develdocdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if ! use static-libs; then
- find "${D}" -name "*.a" -delete || die
- fi
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
deleted file mode 100644
index 59acc2cc580e..000000000000
--- a/app-admin/elektra/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-xmw@gentoo.org
-Michael Weber
-
-
-
diff --git a/app-admin/emacs-updater/emacs-updater-1.9.ebuild b/app-admin/emacs-updater/emacs-updater-1.9.ebuild
index 8394b9291c52..eda004330dd5 100644
--- a/app-admin/emacs-updater/emacs-updater-1.9.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.9.ebuild,v 1.5 2012/02/01 17:32:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.9.ebuild,v 1.1 2011/08/24 18:43:11 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="!<=app-admin/eselect-emacs-1.5
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild
index 7e6b3a048d85..96e31cb0f27e 100644
--- a/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild
+++ b/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild,v 1.3 2012/01/15 15:44:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.7.ebuild,v 1.2 2011/12/31 11:04:15 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3"
diff --git a/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild b/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild
index 42a91217891d..c8ee0abeba05 100644
--- a/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild
+++ b/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild,v 1.9 2012/02/05 18:38:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20061117.ebuild,v 1.8 2009/10/11 23:24:18 halcy0n Exp $
DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org."
HOMEPAGE="http://www.gentoo.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild b/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
index d93f89411293..a98997829817 100644
--- a/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.3 2012/01/16 14:50:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-oodict/eselect-oodict-20100228.ebuild,v 1.1 2010/03/01 00:03:03 abcd Exp $
DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org."
HOMEPAGE="http://www.gentoo.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2"
diff --git a/app-admin/eselect-opencl/Manifest b/app-admin/eselect-opencl/Manifest
deleted file mode 100644
index 80068e623688..000000000000
--- a/app-admin/eselect-opencl/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST cl.h.1.1.xz 6940 RMD160 697d52b04bba416c233433ff5b9cba47d7327631 SHA1 2092a622e1494f0a31c1371147bc87478226b44b SHA256 11b0249ec6c35000686cfe775b1789fa010b6d058e123b00c720e8408881f13f
-DIST cl.hpp.1.1.xz 14764 RMD160 009ff35d03da82b8271785077d94f046193f91d6 SHA1 096b0e0fd42d841effa24c6323cf109aa2f6ecce SHA256 5d90ef4d964a6365d8e9305913c85dd0ffe6916df0a151a116b1b58b0e6c7ef4
-DIST cl_ext.h.1.1.xz 2740 RMD160 f2debb481b3f3c94cbca5a50bb77fb571c9538dd SHA1 f7c759f6d8077e6d1eb222d1acb4a9638bee4741 SHA256 aeb729345004bf67d2564e1dc55feb326ff017f3b291ffb8e1391de353e09620
-DIST cl_gl.h.1.1.xz 1856 RMD160 e92b5e843322c9e78f3fe72da43c1502109dc1f5 SHA1 3c4ad063ea5e4ee232b273cecbb85abf17dbf112 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d402fad5d78b29f925a
-DIST cl_gl_ext.h.1.1.xz 1356 RMD160 0ba4c5d6f3c1d119d7a8844abd43b83db987b565 SHA1 829ae549cdd0de3878626858fb041d5a424ebd96 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02
-DIST cl_platform.h.1.1.xz 5584 RMD160 034d4be552aa3ddb6cc45718c5aa7a195d7f3f59 SHA1 bdc027789de959d1aa33e70de8af90dd103780d3 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53
-DIST eselect-opencl-1.1.0.tar.xz 3272 RMD160 e6538d2207823487288dabce18e1baf8bd59ddf3 SHA1 fef7bf2949fb9b9f9f73a8fd30fca2f063abeb51 SHA256 0b49d847d4475119f969fc7bbcdc4ceb1905e37e102b10d0bdad4f8e6010bbbe
-DIST opencl.h.1.1.xz 944 RMD160 d9c8ee867a0068fbb05624d48d9e236d0f43acd3 SHA1 2b94aff101b7a3ee4261957b6d46edd6b81faf24 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096
diff --git a/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild b/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild
deleted file mode 100644
index 7238d53ae287..000000000000
--- a/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild,v 1.1 2012/01/21 09:23:17 xarthisius Exp $
-
-EAPI=4
-CL_ABI=1.1
-
-inherit multilib
-
-DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
-
-MIRROR="http://dev.gentoo.org/~xarthisius/distfiles/"
-SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz
- ${MIRROR}/cl_platform.h.${CL_ABI}.xz
- ${MIRROR}/cl.h.${CL_ABI}.xz
- ${MIRROR}/cl_ext.h.${CL_ABI}.xz
- ${MIRROR}/cl_gl.h.${CL_ABI}.xz
- ${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz
- ${MIRROR}/cl.hpp.${CL_ABI}.xz
- ${MIRROR}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-pkg_postinst() {
- local impl="$(eselect opencl show)"
- if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
- eselect opencl set "${impl}"
- fi
-}
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins opencl.eselect
- #doman opencl.eselect.5
-
- local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
- insinto /usr/$(get_libdir)/OpenCL/global/include/CL
- cd "${WORKDIR}"
- for f in ${headers[@]}; do
- newins ${f}.${CL_ABI} ${f}
- done
-}
diff --git a/app-admin/eselect-opencl/metadata.xml b/app-admin/eselect-opencl/metadata.xml
deleted file mode 100644
index 0d69e85848ac..000000000000
--- a/app-admin/eselect-opencl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- xarthisius@gentoo.org
- Kacper Kowalik
-
-
- Utility to switch OpenCL implementations between various providers.
-
-
diff --git a/app-admin/eselect-qtgraphicssystem/Manifest b/app-admin/eselect-qtgraphicssystem/Manifest
deleted file mode 100644
index dcb0c8758a6f..000000000000
--- a/app-admin/eselect-qtgraphicssystem/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST eselect-qtgraphicssystem-1.0.tar.bz2 1296 RMD160 4095cfd2a3c42fe80fb5d16e2cca469413a7afb4 SHA1 62f51796e58da15ac00d43dc5db77a69cc6c415b SHA256 e0e903813927da3065f75c2f8ecb8c87f92cbc044ed427c7424d4eb88f478af8
-DIST eselect-qtgraphicssystem-1.1.1.tar.bz2 1621 RMD160 2242743a21739ad44b04ba319a23c75ff6303e0d SHA1 9d587c8ea001ad8f886b54c82fe2b5bd143eb351 SHA256 00195d3dc0959b1f396cceaa5320d945fd9bf28680b7b7ce6317915288a627cf
diff --git a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild b/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild
deleted file mode 100644
index 1ca91fc421b7..000000000000
--- a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.0.ebuild,v 1.1 2012/01/29 16:19:55 wired Exp $
-
-EAPI=4
-
-DESCRIPTION="Utility to change the active Qt Graphics System"
-HOMEPAGE="https://gitorious.org/gentoo-qt/eselect-qtgraphicssystem"
-SRC_URI="http://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-src_install() {
- insinto "/usr/share/eselect/modules"
- doins qtgraphicssystem.eselect
-}
diff --git a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild b/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
deleted file mode 100644
index 06583e7cb7ae..000000000000
--- a/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild,v 1.1 2012/02/05 12:58:19 wired Exp $
-
-EAPI=4
-
-DESCRIPTION="Utility to change the active Qt Graphics System"
-HOMEPAGE="https://gitorious.org/gentoo-qt/eselect-qtgraphicssystem"
-SRC_URI="http://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-src_install() {
- insinto "/usr/share/eselect/modules"
- doins qtgraphicssystem.eselect
-}
diff --git a/app-admin/eselect-qtgraphicssystem/metadata.xml b/app-admin/eselect-qtgraphicssystem/metadata.xml
deleted file mode 100644
index c4db62280a40..000000000000
--- a/app-admin/eselect-qtgraphicssystem/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- qt
-
-
diff --git a/app-admin/eselect-ruby/Manifest b/app-admin/eselect-ruby/Manifest
index faa815b05fe6..245313ca10de 100644
--- a/app-admin/eselect-ruby/Manifest
+++ b/app-admin/eselect-ruby/Manifest
@@ -1,2 +1 @@
DIST ruby.eselect-20100603.bz2 1869 RMD160 d21882dda42657d14224ff4d58ca838123a62e03 SHA1 5db469b52b095ff288780f9eff6a144f07554a5f SHA256 043313957e9bf489b7db8fcfe198ea7851e421f1021f7d4b3758fc90efb5a69f
-DIST ruby.eselect-20120106.bz2 1898 RMD160 e65684dd3d308e25dc93dda5fea77f1fb6c29800 SHA1 35a637dd62fdd66896dc5b1fc8869239c2acc69e SHA256 439875e9cd632aecce973ecb579c6f3f7b2554e303e12515286eb96ae47e28e9
diff --git a/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild b/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
deleted file mode 100644
index 51e32e27b9e8..000000000000
--- a/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild,v 1.1 2012/01/06 22:02:43 a3li Exp $
-
-DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI="http://dev.a3li.li/gentoo/distfiles/ruby.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.2"
-
-src_install() {
- insinto /usr/share/eselect/modules
- newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
-}
diff --git a/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild b/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild
index e110f95a5a1d..0d2ae3cfd642 100644
--- a/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild,v 1.6 2012/02/05 17:43:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-timidity/eselect-timidity-20110513.ebuild,v 1.2 2011/12/16 14:54:13 ago Exp $
DESCRIPTION="Manages configuration of TiMidity++ patchsets"
HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3"
diff --git a/app-admin/eselect-unison/eselect-unison-0.1.ebuild b/app-admin/eselect-unison/eselect-unison-0.1.ebuild
index 710c061a43f8..6fd3728bee97 100644
--- a/app-admin/eselect-unison/eselect-unison-0.1.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.1.ebuild,v 1.9 2012/02/05 18:46:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.1.ebuild,v 1.8 2008/06/30 20:37:46 armin76 Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/eselect-unison/eselect-unison-0.2.ebuild b/app-admin/eselect-unison/eselect-unison-0.2.ebuild
index 075e52923ace..5e63073cafc0 100644
--- a/app-admin/eselect-unison/eselect-unison-0.2.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.2.ebuild,v 1.2 2012/02/05 18:46:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.2.ebuild,v 1.1 2009/11/22 17:39:04 ulm Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/eselect-unison/eselect-unison-0.3.ebuild b/app-admin/eselect-unison/eselect-unison-0.3.ebuild
index bbd41c4a2a20..83c1742ef92a 100644
--- a/app-admin/eselect-unison/eselect-unison-0.3.ebuild
+++ b/app-admin/eselect-unison/eselect-unison-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.3.ebuild,v 1.5 2012/02/06 17:14:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.3.ebuild,v 1.3 2011/11/28 11:48:28 phajdan.jr Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 6b4cd659b2ab..43d5e2b18d19 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,4 +1,3 @@
DIST eselect-1.2.15.tar.bz2 169358 RMD160 9b5c2174786466f6a32e8b823eb4140e2581f945 SHA1 4875545e001904ab6f9a5a8c96150739ee1cff29 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7
DIST eselect-1.2.17.tar.bz2 169990 RMD160 c97c8a147f3d737de12c4aa4993a17734464d85d SHA1 fd5721e49eb4705b66bda387eb70fe45ca3b72ba SHA256 37724f875bb13b8998f699bf56a59c55a0d9987943216ab784926a550aa8d138
DIST eselect-1.2.18.tar.bz2 170120 RMD160 0a2dc01f0c50c03f81b6079b91190859d820ff61 SHA1 5ac5a5049e99d09063da9d99096a146cb22953cd SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c
-DIST eselect-1.3.tar.xz 163724 RMD160 45e30b66e4258ce607a57230956b057dc32c1ba5 SHA1 c63330bede6b6e5f86fa3392feb3abd9f7f23d8d SHA256 1700cc381eb7acbb49204157038be16fb63d9291b7b23612db32897566be506e
diff --git a/app-admin/eselect/eselect-1.2.17.ebuild b/app-admin/eselect/eselect-1.2.17.ebuild
deleted file mode 100644
index 230b574f0655..000000000000
--- a/app-admin/eselect/eselect-1.2.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.17.ebuild,v 1.2 2011/09/09 10:43:05 ulm Exp $
-
-EAPI=2
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/sed
- || (
- sys-apps/coreutils
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )"
-DEPEND="${RDEPEND}
- doc? ( dev-python/docutils )"
-RDEPEND="!app-admin/eselect-news
- ${RDEPEND}
- sys-apps/file
- sys-libs/ncurses"
-
-# Commented out: only few users of eselect will edit its source
-#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
-# vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
- emake || die
-
- if use doc; then
- emake html || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- newbashcomp misc/${PN}.bashcomp ${PN} || die
- dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
-
- if use doc; then
- dohtml *.html doc/* || die
- fi
-
- # needed by news module
- keepdir /var/lib/gentoo/news
-}
-
-pkg_postinst() {
- # fowners in src_install doesn't work for the portage group:
- # merging changes the group back to root
- [[ -z ${EROOT} ]] && local EROOT=${ROOT}
- chgrp portage "${EROOT}/var/lib/gentoo/news" \
- && chmod g+w "${EROOT}/var/lib/gentoo/news"
-}
diff --git a/app-admin/eselect/eselect-1.2.18.ebuild b/app-admin/eselect/eselect-1.2.18.ebuild
index 26d7f404b582..acd7459a8a04 100644
--- a/app-admin/eselect/eselect-1.2.18.ebuild
+++ b/app-admin/eselect/eselect-1.2.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.18.ebuild,v 1.5 2012/01/31 16:06:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.18.ebuild,v 1.1 2011/09/25 16:24:18 ulm Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="sys-apps/sed
@@ -51,8 +51,6 @@ src_install() {
# needed by news module
keepdir /var/lib/gentoo/news
- fowners root:portage /var/lib/gentoo/news || die
- fperms g+w /var/lib/gentoo/news || die
}
pkg_postinst() {
diff --git a/app-admin/eselect/eselect-1.3.ebuild b/app-admin/eselect/eselect-1.3.ebuild
deleted file mode 100644
index 26376abec4b7..000000000000
--- a/app-admin/eselect/eselect-1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.ebuild,v 1.1 2012/01/21 19:02:55 ulm Exp $
-
-EAPI=3
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/sed
- || (
- sys-apps/coreutils
- sys-freebsd/freebsd-bin
- app-misc/realpath
- )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- doc? ( dev-python/docutils )"
-RDEPEND="!app-admin/eselect-news
- ${RDEPEND}
- sys-apps/file
- sys-libs/ncurses"
-
-# Commented out: only few users of eselect will edit its source
-#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
-# vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
- emake || die
-
- if use doc; then
- emake html || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- newbashcomp misc/${PN}.bashcomp ${PN} || die
- dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
-
- if use doc; then
- dohtml *.html doc/* || die
- fi
-
- # needed by news module
- keepdir /var/lib/gentoo/news
- fowners root:portage /var/lib/gentoo/news || die
- fperms g+w /var/lib/gentoo/news || die
-}
-
-pkg_postinst() {
- # fowners in src_install doesn't work for the portage group:
- # merging changes the group back to root
- [[ -z ${EROOT} ]] && local EROOT=${ROOT}
- chgrp portage "${EROOT}/var/lib/gentoo/news" \
- && chmod g+w "${EROOT}/var/lib/gentoo/news"
-}
diff --git a/app-admin/evtxtools/metadata.xml b/app-admin/evtxtools/metadata.xml
index 3c86df53987d..c0e52e1baa3d 100644
--- a/app-admin/evtxtools/metadata.xml
+++ b/app-admin/evtxtools/metadata.xml
@@ -3,7 +3,7 @@
proxy-maintainers
- andreis.vinogradovs@gmail.com
+ spamslepnoga@inbox.ru
maksbotan@gentoo.org
diff --git a/app-admin/fam/fam-2.7.0-r6.ebuild b/app-admin/fam/fam-2.7.0-r6.ebuild
index 3ac6063c51b4..32b51b6f94c5 100644
--- a/app-admin/fam/fam-2.7.0-r6.ebuild
+++ b/app-admin/fam/fam-2.7.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.9 2012/01/22 15:15:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.2 2011/01/06 11:03:49 ssuominen Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="static-libs"
DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
@@ -35,9 +35,6 @@ src_configure() {
src_install() {
emake install DESTDIR="${D}" || die
- if ! use static-libs; then
- rm -f "${D}"/usr/lib*/libfam.la
- fi
sed -i "${D}"/etc/fam.conf \
-e "s:local_only = false:local_only = true:g" \
diff --git a/app-admin/fam/files/famd b/app-admin/fam/files/famd
old mode 100644
new mode 100755
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
index d34e9dd2b52a..524dc389e3a3 100644
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.4 2012/01/14 15:57:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r2.ebuild,v 1.2 2011/11/18 22:21:59 ssuominen Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/gst/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
IUSE="nfs policykit samba"
RDEPEND="
diff --git a/app-admin/grubconfig/grubconfig-1.28-r1.ebuild b/app-admin/grubconfig/grubconfig-1.28-r1.ebuild
index ec1d49e8ec4b..5bb4700f6d5c 100644
--- a/app-admin/grubconfig/grubconfig-1.28-r1.ebuild
+++ b/app-admin/grubconfig/grubconfig-1.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconfig/grubconfig-1.28-r1.ebuild,v 1.3 2012/01/15 15:31:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconfig/grubconfig-1.28-r1.ebuild,v 1.1 2008/04/07 05:34:55 vapier Exp $
inherit multilib
@@ -10,7 +10,7 @@ SRC_URI="http://www.tux.org/pub/people/kent-robotti/looplinux/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
IUSE=""
DEPEND=">=dev-util/dialog-0.7"
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 84dec13ca739..9d8cef81e252 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -3,4 +3,3 @@ DIST haskell-updater-1.1.0.0.tar.gz 22691 RMD160 8db8459cdb5fbbc87920b42900c6b07
DIST haskell-updater-1.1.3.0.tar.gz 22981 RMD160 07f18a193ae11c069f11d10408fd4cb81af6a5a6 SHA1 4ef474a9460917348bb2fff02b52540f50206ee6 SHA256 5bd2f931c490c114f655204d671feb677a9abdc472bbfe554cbf448cc216fd3a
DIST haskell-updater-1.2.0.0.tar.gz 22813 RMD160 2967cf410a37124501f26ea9efdd580678dfb9fd SHA1 d9ff5a8ee38004d84ec76e40ac69fa0a1b79741d SHA256 18da33a9de5f424a557d513dd2888773a55cdea578526428906897a96bb77a08
DIST haskell-updater-1.2.0.1.tar.gz 22974 RMD160 2a416e517e917cc23b3e52a2f4d83a6e419e7308 SHA1 511fa8f9fe94599eb05703e1313efd42ea670f78 SHA256 aa7f5e2965db2f6f2464650289bcd9bd0f72e1762bcc6e2e90d53fe517dfd0e5
-DIST haskell-updater-1.2.0.3.tar.gz 23338 RMD160 455630ce4068e9a95b89fa099038440c0e559d2a SHA1 b58ed0d4f2a9ce72a37cb339924b3ca3454a7fc2 SHA256 9142daaf1e8dff5ff060f95abe0f82189e04c8ee94753afb9fa00102391dc244
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild
deleted file mode 100644
index 7df937a9e41c..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.3.ebuild,v 1.1 2012/01/02 15:50:42 slyfox Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="bin nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore
- sys-apps/paludis )"
-
-src_prepare() {
- if use prefix; then
- sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
- "${S}/Distribution/Gentoo/Packages.hs" || die
-
- sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
- "${S}/Distribution/Gentoo/GHC.hs" || die
- fi
-}
-
-src_configure() {
- cabal_src_configure --bindir="${EPREFIX}/usr/sbin"
-}
-
-src_install() {
- cabal_src_install
-
- dodoc TODO
-}
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 5d57d27146f0..01eed2333a5f 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -66,24 +66,3 @@
"WDC WD10EADS-00M2B0" 194 C "Western Digital Caviar Green 1TB SATA2 5400RPM 32MB"
"WDC WD20EARS-00S8B1" 194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
"WDC WD3200BEKT-00F3T0" 194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
-"WDC WD5000AADS" 194 C "Western Digital Caviar Green 500GB SATA2 IntelliPower 32MB"
-"WDC WD7500AARX" 194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
-"WDC WD3200AZDX" 194 C "Western Digital Caviar Green 320GB SATA3 IntelliPower 32MB"
-"WDC WD5000AZDX" 194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 32MB"
-"WDC WD7500AZRX" 194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
-"WDC WD10EARS" 194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
-"WDC WD20EARS" 194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
-"WDC WD10EZRX" 194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
-"WDC WD25EZRX" 194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
-"WDC WD30EZRX" 194 C "Western Digital Caviar Green 3TB SATA3 IntelliPower 64MB"
-"WDC WD10EARX" 194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
-"WDC WD15EARX" 194 C "Western Digital Caviar Green 1.5TB SATA3 IntelliPower 64MB"
-"WDC WD20EARX" 194 C "Western Digital Caviar Green 2TB SATA3 IntelliPower 64MB"
-"ST250DM000" 194 C "Seagate Barracuda 7200.14 250GB SATA3 7200RPM 16MB"
-"ST320DM000" 194 C "Seagate Barracuda 7200.14 320GB SATA3 7200RPM 16MB"
-"ST500DM002" 194 C "Seagate Barracuda 7200.14 500GB SATA3 7200RPM 16MB"
-"ST750DM003" 194 C "Seagate Barracuda 7200.14 750GB SATA3 7200RPM 64MB"
-"ST1000DM003" 194 C "Seagate Barracuda 7200.14 1TB SATA3 7200RPM 64MB"
-"ST1500DM003" 194 C "Seagate Barracuda 7200.14 1.5TB SATA3 7200RPM 64MB"
-"ST2000DM001" 194 C "Seagate Barracuda 7200.14 2TB SATA3 7200RPM 64MB"
-"ST3000DM001" 194 C "Seagate Barracuda 7200.14 3TB SATA3 7200RPM 64MB"
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
index f1494191fd75..fa01d4745fd0 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4-r1.ebuild,v 1.5 2012/01/05 22:12:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4-r1.ebuild,v 1.4 2011/03/20 18:23:14 armin76 Exp $
inherit toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
IUSE=""
src_compile() {
diff --git a/app-admin/killproc/killproc-2.13.ebuild b/app-admin/killproc/killproc-2.13.ebuild
index 2ecda384c488..a02728e7b61a 100644
--- a/app-admin/killproc/killproc-2.13.ebuild
+++ b/app-admin/killproc/killproc-2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13.ebuild,v 1.4 2012/02/05 13:44:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13.ebuild,v 1.2 2009/09/04 18:02:57 mr_bones_ Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
src_prepare() {
diff --git a/app-admin/logcheck/logcheck-1.3.13.ebuild b/app-admin/logcheck/logcheck-1.3.13.ebuild
index 0102476ebb0e..c63ad6b2b7b3 100644
--- a/app-admin/logcheck/logcheck-1.3.13.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.13.ebuild,v 1.4 2011/12/18 17:49:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.13.ebuild,v 1.3 2010/10/14 15:17:12 fauli Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/logcheck/logcheck-1.3.14.ebuild b/app-admin/logcheck/logcheck-1.3.14.ebuild
index 22885b72f013..53370967c263 100644
--- a/app-admin/logcheck/logcheck-1.3.14.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.3 2012/01/25 23:04:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logcheck/logcheck-1.3.14.ebuild,v 1.1 2011/09/14 19:06:24 phajdan.jr Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/logrotate/logrotate-3.8.1.ebuild b/app-admin/logrotate/logrotate-3.8.1.ebuild
index a33bae146af7..290f4a919a3c 100644
--- a/app-admin/logrotate/logrotate-3.8.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.1.ebuild,v 1.6 2012/01/31 18:49:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.1.ebuild,v 1.1 2011/10/12 16:29:05 dang Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="acl selinux"
RDEPEND="
diff --git a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
index 0ef31a6d2d83..a1de08b6c77a 100644
--- a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
+++ b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.7.1-r1.ebuild,v 1.3 2012/02/05 21:36:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsat/lsat-0.9.7.1-r1.ebuild,v 1.1 2010/08/27 05:35:30 jer Exp $
inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="minimal"
DEPEND="dev-lang/perl" # pod2man
diff --git a/app-admin/lsyncd/lsyncd-2.0.5.ebuild b/app-admin/lsyncd/lsyncd-2.0.5.ebuild
index 777310fc3ceb..a1e4e21eca7c 100644
--- a/app-admin/lsyncd/lsyncd-2.0.5.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.5.ebuild,v 1.2 2012/01/27 19:12:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.5.ebuild,v 1.1 2011/11/14 21:23:35 darkside Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://lsyncd.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-lang/lua"
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 9a9000384696..1e5125d6fd29 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,3 +1,6 @@
+DIST monit-4.10.1.tar.gz 606273 RMD160 6c517b19bc43f4023dfca4de1df09272b41af02d SHA1 c87aa0c6e0b1d13f46b7e9d84937191e25a907a6 SHA256 f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
DIST monit-5.1.1.tar.gz 615924 RMD160 1b4fed4e039adfd626f3c49436702c0272948327 SHA1 cad2ff02a2f6dbfb5773d13e42506adb2165d15c SHA256 bf789e0660410e8c63f4b3dc2eeab9889347e6494a6dc1c0e764343cae0dc1ba
+DIST monit-5.2.1.tar.gz 619180 RMD160 9bb4fdb25b2cb1769b95574ee41a463c876518e1 SHA1 15bc783014b1ee8886e5d8f0c28f953b581d05ec SHA256 31b37dd4a6f6b48e6d6926d97bfe5ad998a2a0611af0586525a5dd1b5847e41e
+DIST monit-5.2.2.tar.gz 610419 RMD160 f94c3811d2ecd4ac4693c64463d63a9625ae2b35 SHA1 7838fc4b0dffa052bf3e4f892b280b9c2b7336fd SHA256 addfa9131ca6b0a3a6073aeb9290d34e5fec203ee7c2fff934db54a06b699268
DIST monit-5.2.3.tar.gz 618139 RMD160 6e82619df575c1bc372edc76db92a211adff9634 SHA1 dae1a63fca9a44cf1bda53691711b8273efe3935 SHA256 920f50e752cbdc8e2c7f009e1c54bfd46f5646ea22bbab96c58eb5d1a19a0d8c
DIST monit-5.2.5.tar.gz 608861 RMD160 68cc1ce013626da10e421303840c9c768128f015 SHA1 41954b62a08663527d497084bd16d08b9a7b21bc SHA256 3c2496e9f653ff8a46b75b61126a86cb3861ad35e4eeb7379d64a0fc55c1fd8d
diff --git a/app-admin/monit/files/monit.initd-5.0 b/app-admin/monit/files/monit.initd-5.0
index aad734b65bc4..476ade4f935d 100644
--- a/app-admin/monit/files/monit.initd-5.0
+++ b/app-admin/monit/files/monit.initd-5.0
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.2 2011/12/31 16:28:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0,v 1.1 2008/08/29 20:13:37 caleb Exp $
-extra_started_commands="reload"
+opts="${opts} reload"
depend() {
use net
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
index 4163c988b805..14e03131aa89 100644
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -1,10 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.1 2011/04/13 15:40:32 patrick Exp $
+
+opts="${opts} reload configtest"
-extra_commands="configtest"
-extra_started_commands="reload"
depend() {
use net
@@ -19,7 +19,6 @@ configtest() {
fi
return $ret
}
-
start() {
ebegin "Starting monit"
start-stop-daemon --start --quiet --exec /usr/bin/monit >/dev/null 2>&1
diff --git a/app-admin/monit/monit-5.1.1-r1.ebuild b/app-admin/monit/monit-5.1.1-r1.ebuild
deleted file mode 100644
index a3b70906d40a..000000000000
--- a/app-admin/monit/monit-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.1.1-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
-
-EAPI="2"
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-src_prepare() {
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
- econf $(use_with ssl) || die "econf failed"
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc CHANGES.txt README*
- dohtml -r doc/*
-
- insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
- newinitd "${FILESDIR}"/monit.initd-5.0 monit || die "newinitd failed"
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.2.3-r2.ebuild b/app-admin/monit/monit-5.2.3-r2.ebuild
deleted file mode 100644
index 61c50565875f..000000000000
--- a/app-admin/monit/monit-5.2.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.3-r2.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
-
-EAPI="2"
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-src_prepare() {
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
- econf $(use_with ssl) || die "econf failed"
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc CHANGES.txt README*
- dohtml -r doc/*
-
- insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.2.5-r1.ebuild b/app-admin/monit/monit-5.2.5-r1.ebuild
deleted file mode 100644
index bf4bf6c3e88d..000000000000
--- a/app-admin/monit/monit-5.2.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.2.5-r1.ebuild,v 1.1 2011/12/31 16:28:50 idl0r Exp $
-
-EAPI="2"
-
-DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system."
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
-
-src_prepare() {
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
- econf $(use_with ssl) || die "econf failed"
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc CHANGES.txt README*
- dohtml -r doc/*
-
- insinto /etc; insopts -m700; doins monitrc || die "doins monitrc failed"
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit || die "newinitd failed"
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/moodss/Manifest b/app-admin/moodss/Manifest
index 902469265d5f..3bee26374034 100644
--- a/app-admin/moodss/Manifest
+++ b/app-admin/moodss/Manifest
@@ -1 +1,3 @@
+DIST moodss-20.0.tar.bz2 1693533 RMD160 8e6337773f6ed663f527a6d04d81af9ab971a530 SHA1 c0d8995465ab72f6143a4dc44063341f44e0d676 SHA256 5b4d2517b36bf5c6c465786c6fd90d4b6bd825e76c47c2e024a5958fd659588d
+DIST moodss-20.2.tar.bz2 1697188 RMD160 7a525dbcfe2850e439a54cf00a6da1ffbd2988af SHA1 c052590997d6a6f67f8773f19aba959475f413b7 SHA256 aab0a71cc372ad50b15bf2f03db12a889a9d370316be8d55a069e292225405d8
DIST moodss-21.5.tar.bz2 1963647 RMD160 d9478c6bbc3fd509fe898cf44f1efba62e7b51ba SHA1 debde88696c53ea79f2edfa8461de6951052906d SHA256 f44799ff6d485b332bb5b2c72413e3e8e8b79797eed4e5ffb9a1f3bcc436c6c7
diff --git a/app-admin/moodss/metadata.xml b/app-admin/moodss/metadata.xml
index 815cc916f2b6..d9408d8ab078 100644
--- a/app-admin/moodss/metadata.xml
+++ b/app-admin/moodss/metadata.xml
@@ -1,5 +1,5 @@
- tcltk
+tcltk
diff --git a/app-admin/moodss/moodss-21.5.ebuild b/app-admin/moodss/moodss-21.5.ebuild
index 68e4b332887f..3fd8b7140c54 100644
--- a/app-admin/moodss/moodss-21.5.ebuild
+++ b/app-admin/moodss/moodss-21.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.6 2012/01/07 21:06:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/moodss/moodss-21.5.ebuild,v 1.5 2011/05/23 07:19:23 tomka Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/moodss/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="mysql perl python"
DEPEND=">=dev-lang/tcl-8.4[threads]"
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild
index 1f0bb0e99bad..e2c506fb1a3c 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.17.ebuild,v 1.1 2011/08/02 05:45:11 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/dbus-glib
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild
index 3ac30da21fe7..592ffee3fc72 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.18.ebuild,v 1.1 2011/09/05 15:01:03 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/dbus-glib
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild
index 55cd4c4839e4..d45df82f3c34 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.19.ebuild,v 1.1 2011/10/06 19:25:27 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/dbus-glib
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild
index 049f07841679..bc1d19d0eaa3 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild,v 1.2 2012/01/28 17:11:18 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.20.ebuild,v 1.1 2011/11/07 13:28:20 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/dbus-glib
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild
index afc63758ca30..52da5a685915 100644
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild,v 1.3 2012/01/28 17:13:20 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.17.ebuild,v 1.2 2011/09/05 20:05:15 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=x11-libs/qt-core-4.4.0
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
index 153896bd9f26..273765ea5e8b 100644
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.5 2012/01/28 17:13:20 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.18.ebuild,v 1.4 2011/09/06 10:31:52 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=x11-libs/qt-core-4.4.0
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild
index 1fd5f267bf53..9b64a13c34c6 100644
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild,v 1.2 2012/01/28 17:13:20 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.19.ebuild,v 1.1 2011/10/06 19:25:40 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=x11-libs/qt-core-4.4.0
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild
index e0241cbdd382..7f3d3a2a57b4 100644
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild,v 1.2 2012/01/28 17:16:08 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.20.ebuild,v 1.1 2011/11/07 13:28:43 lxnay Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=x11-libs/qt-core-4.4.0
diff --git a/app-admin/packagekit/packagekit-0.6.17.ebuild b/app-admin/packagekit/packagekit-0.6.17.ebuild
index 4df3937d3dea..f4ddf63a08b8 100644
--- a/app-admin/packagekit/packagekit-0.6.17.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.17.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.17.ebuild,v 1.1 2011/08/02 05:45:49 lxnay Exp $
EAPI="3"
@@ -13,7 +13,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk qt4"
RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
diff --git a/app-admin/packagekit/packagekit-0.6.18.ebuild b/app-admin/packagekit/packagekit-0.6.18.ebuild
index 2d2e3b476616..c187f97264c4 100644
--- a/app-admin/packagekit/packagekit-0.6.18.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.18.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.18.ebuild,v 1.1 2011/09/05 15:03:24 lxnay Exp $
EAPI="3"
@@ -13,7 +13,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk qt4"
RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
diff --git a/app-admin/packagekit/packagekit-0.6.19.ebuild b/app-admin/packagekit/packagekit-0.6.19.ebuild
index 406e8ffb9b16..61646c7911b1 100644
--- a/app-admin/packagekit/packagekit-0.6.19.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.19.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.19.ebuild,v 1.1 2011/10/06 19:26:39 lxnay Exp $
EAPI="3"
@@ -13,7 +13,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk qt4"
RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
diff --git a/app-admin/packagekit/packagekit-0.6.20.ebuild b/app-admin/packagekit/packagekit-0.6.20.ebuild
index 6d2f9c1ec876..19855fb403dc 100644
--- a/app-admin/packagekit/packagekit-0.6.20.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.20.ebuild,v 1.2 2012/01/28 17:17:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.20.ebuild,v 1.1 2011/11/07 13:29:17 lxnay Exp $
EAPI="3"
@@ -13,7 +13,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk qt4"
RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild
index 5d79823e0179..175f531d83dd 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild,v 1.3 2012/01/06 23:02:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.10.ebuild,v 1.2 2011/08/06 15:09:29 tove Exp $
DESCRIPTION="User land tool for cleaning up old perl installs"
HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
@@ -14,7 +14,7 @@ IUSE=""
DEPEND="app-shells/bash"
RDEPEND="${DEPEND}
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+ || ( app-misc/realpath sys-freebsd/freebsd-bin )
dev-lang/perl"
src_install() {
diff --git a/app-admin/prelude-lml/files/gentoo.init b/app-admin/prelude-lml/files/gentoo.init
old mode 100644
new mode 100755
diff --git a/app-admin/psmon/psmon-1.39.ebuild b/app-admin/psmon/psmon-1.39.ebuild
index 7dcf2033eb17..aa6d581ab1c2 100644
--- a/app-admin/psmon/psmon-1.39.ebuild
+++ b/app-admin/psmon/psmon-1.39.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/psmon/psmon-1.39.ebuild,v 1.3 2011/12/18 20:02:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/psmon/psmon-1.39.ebuild,v 1.2 2011/12/18 11:47:16 ago Exp $
inherit perl-app
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.psmon.com/"
SRC_URI="http://www.psmon.com/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND=">=dev-lang/perl-5.6.0
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index 64698adff15f..3f9101ef6c46 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -1,2 +1 @@
-DIST python-updater-0.10.tar.bz2 9245 RMD160 664a6e0ceecb3cd8f5bbcf1fd3774b87791bf2af SHA1 bd62b25d58fc16f640be92aaf9843644360fb767 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520
DIST python-updater-0.9.tar.bz2 7789 RMD160 5da6945368186fd7eb9efb37b6b81ebe7660fc58 SHA1 f64e11d4f106088c7a4bf866ba0be1a2b831cd9f SHA256 a4b065c264e1909e1d6a7f9a0d5dacce224f946468313e34e8775df0b6689384
diff --git a/app-admin/python-updater/python-updater-0.10.ebuild b/app-admin/python-updater/python-updater-0.10.ebuild
deleted file mode 100644
index 4be1b6a94754..000000000000
--- a/app-admin/python-updater/python-updater-0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10.ebuild,v 1.5 2012/02/01 22:21:40 ranger Exp $
-
-if [[ "${PV}" == "9999" ]]; then
- inherit subversion
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
- ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
- SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
- || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_compile() {
- if [[ "${PV}" == "9999" ]]; then
- emake ${PN}.1 || die "Generation of man page failed"
- fi
-}
-
-src_install() {
- dosbin ${PN} || die "dosbin failed"
- doman ${PN}.1 || die "doman failed"
- dodoc AUTHORS || die "dodoc failed"
-}
diff --git a/app-admin/python-updater/python-updater-9999.ebuild b/app-admin/python-updater/python-updater-9999.ebuild
index 7580f74c3132..0caeb1f89bbc 100644
--- a/app-admin/python-updater/python-updater-9999.ebuild
+++ b/app-admin/python-updater/python-updater-9999.ebuild
@@ -1,33 +1,25 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.8 2011/12/30 17:41:45 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.7 2011/08/06 16:59:42 hwoarang Exp $
-if [[ "${PV}" == "9999" ]]; then
- inherit subversion
-fi
+inherit subversion
DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
- ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
- SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
+SRC_URI=""
+ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/${PN}/trunk"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE=""
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
+DEPEND="sys-apps/help2man"
RDEPEND="dev-lang/python
|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
src_compile() {
- if [[ "${PV}" == "9999" ]]; then
- emake ${PN}.1 || die "Generation of man page failed"
- fi
+ emake ${PN}.1 || die "Generation of man page failed"
}
src_install() {
diff --git a/app-admin/radmind/radmind-1.14.1.ebuild b/app-admin/radmind/radmind-1.14.1.ebuild
index e06f5c8e799d..825dccce4a3b 100644
--- a/app-admin/radmind/radmind-1.14.1.ebuild
+++ b/app-admin/radmind/radmind-1.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.14.1.ebuild,v 1.2 2012/01/28 14:45:49 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.14.1.ebuild,v 1.1 2011/08/16 21:03:44 jer Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-libs/openssl"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index fda00b0a8c5a..7952a6da4837 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,3 +1,2 @@
DIST rsyslog-5.8.5.tar.gz 2364874 RMD160 46b20433e0e5feb807b4777bb8141221fe5dd65b SHA1 a5dc735714b573f577db2892f596dcb0ef35c747 SHA256 a519704c06de1026847f69d99f31a2a32783e9547f5249dddefe805bfbc3ea50
-DIST rsyslog-5.8.6.tar.gz 2373078 RMD160 96beddd94eea0c635c41409f92c897d3620182c0 SHA1 1afe39077253dc9f636f676e8374d09a101a9c94 SHA256 c51206e3b11c7b4cddf92607b9d6ddd07430ff7dd8d06849804c9ea1c9191825
DIST rsyslog-zeromq.tar.gz 22223 RMD160 632a1888d3972da4ce623c8f6973c72b026b035c SHA1 e6f02c25af19022d0cc9d4782f58db3fc27a9f0f SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 0794d5cb56d3..98dee94b5fb8 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.2 2011/09/05 09:25:41 ultrabug Exp $
-extra_started_commands="reload"
+opts="reload"
depend() {
provide logger
diff --git a/app-admin/rsyslog/rsyslog-5.8.6.ebuild b/app-admin/rsyslog/rsyslog-5.8.6.ebuild
deleted file mode 100644
index 6b2bc8166e5d..000000000000
--- a/app-admin/rsyslog/rsyslog-5.8.6.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.6.ebuild,v 1.3 2012/01/24 20:32:58 jlec Exp $
-
-EAPI=4
-
-inherit autotools-utils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- zeromq? ( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="dbi? ( dev-db/libdbi )
- extras? ( net-libs/libnet )
- kerberos? ( virtual/krb5 )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- oracle? ( dev-db/oracle-instantclient-basic )
- relp? ( >=dev-libs/librelp-0.1.3 )
- snmp? ( net-analyzer/net-snmp )
- ssl? ( net-libs/gnutls )
- zeromq? ( net-libs/zeromq )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-BRANCH="5-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
- # Maintainer notes:
- # ZeroMQ support, for now it is done by hand until upstream process bug.
- # Bugzilla : http://bugzilla.adiscon.com/show_bug.cgi?id=277
- if use zeromq; then
- local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
- epatch ${ZEROPATH}/rsyslog-zeromq.patch
- cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
- fi
-
- # Don't force '-g' CFLAG
- sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- # Maintainer notes:
- # * rfc3195 needs a library and development of that library
- # is suspended, so we disable it
- # * About the java GUI:
- # The maintainer says there is no real installation support
- # for the java GUI, so we disable it for now.
- local myeconfargs=(
- --disable-gui
- --disable-rfc3195
- --enable-largefile
- --enable-unlimited-select
- --enable-imdiag
- --enable-imfile
- --enable-impstats
- --enable-imtemplate
- --enable-imptcp
- --enable-mail
- --enable-omprog
- --enable-omstdout
- --enable-omtemplate
- --enable-omdbalerting
- --enable-omuxsock
- --enable-pmlastmsg
- --enable-pmrfc3164sd
- --enable-pmcisconames
- --enable-pmaixforwardedfrom
- --enable-pmsnare
- $(use_enable extras omudpspoof)
- $(use_enable zlib)
- $(use_enable mysql)
- $(use_enable dbi libdbi)
- $(use_enable postgres pgsql)
- $(use_enable oracle oracle)
- $(use_enable ssl gnutls)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable relp)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable debug)
- $(use_enable debug rtinst)
- $(use_enable debug diagtools)
- $(use_enable debug memcheck)
- $(use_enable debug valgrind)
- )
-
- use zeromq && myeconfargs=(
- ${myeconfargs[@]-}
- $(use_enable zeromq imzeromq)
- $(use_enable zeromq omzeromq)
- )
-
- systemd_to_myeconfargs
- autotools-utils_src_configure
-}
-
-src_install() {
- use doc && HTML_DOCS=(doc/)
- autotools-utils_src_install
-
- insinto /etc
- newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- use static-libs || find "${D}" -name '*.la' -delete || die
-
- if use mysql; then
- insinto /usr/share/doc/${PF}/scripts/mysql
- doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
- fi
-
- if use postgres; then
- insinto /usr/share/doc/${PF}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
-}
-
-pkg_config() {
- if ! use ssl ; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- # Make sure the certificates directory exists
- CERTDIR="${ROOT}/etc/ssl/${PN}"
- if [ ! -d "${CERTDIR}" ]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<_EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
-_EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<_EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
-_EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<_EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
-_EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index 833352191f45..3f8e4fcc857d 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -2,7 +2,7 @@
- andreis.vinogradovs@gmail.com
+ spamslepnoga@inbox.ru
maksbotan@gentoo.org
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index b9836311ed5c..9af2cfd56121 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -2,7 +2,7 @@
- andreis.vinogradovs@gmail.com
+ spamslepnoga@inbox.ru
maksbotan@gentoo.org
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 2f40306f2dcc..f669340fec01 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1 +1,5 @@
+DIST sshguard-1.0.tar.bz2 118988 RMD160 436516e14a72845e7eb5325d6f55496eec9d1762 SHA1 968275288a1aec06737e70cde61fe99063081adc SHA256 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08
+DIST sshguard-1.1.tar.bz2 233308 RMD160 e6e7d6e54b32d67583b0f4140ef8905ef5f5567f SHA1 912c151232bc6b23ce400ef92270c9a7f87a60d1 SHA256 c1b2fcd7c402725958e62808829c82bb4445dcf6a9b27ee07e2ab8a3417bb96f
+DIST sshguard-1.3.tar.bz2 140745 RMD160 792431d6d1c7437734bccca4ec6e1ae1b9c4891c SHA1 4c073086406901bbd55ab669b295a3f12f67994e SHA256 1ff0ea3349c67fdab8f8046eeae6a96046a752ae7458c2259cb31b78c2de08ac
+DIST sshguard-1.4.tar.bz2 152303 RMD160 1a34d29d8849ea279049a8eb24ddef839dafdbf7 SHA1 afd1134199ba41721b3d4032239529040e5dd367 SHA256 d9228c9399c0fffa847ea25d3b4b59c0f23dd72c7cf89b52380fee46e92a0ecf
DIST sshguard-1.5.tar.bz2 303767 RMD160 7b4625b3b2e0cf974bc935d868b89bd0d8c189e8 SHA1 f8f713bfb3f5c9877b34f6821426a22a7eec8df3 SHA256 b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19
diff --git a/app-admin/sshguard/sshguard-1.5-r1.ebuild b/app-admin/sshguard/sshguard-1.5-r1.ebuild
index c13e45376e39..c1b576a27e7b 100644
--- a/app-admin/sshguard/sshguard-1.5-r1.ebuild
+++ b/app-admin/sshguard/sshguard-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.5-r1.ebuild,v 1.3 2012/01/15 15:41:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.5-r1.ebuild,v 1.1 2011/04/25 04:59:42 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE="ipfilter kernel_FreeBSD kernel_linux"
CDEPEND="kernel_linux? ( net-firewall/iptables )
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index cd9dafb0f22d..85da23a91e7d 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,3 +1,2 @@
DIST stow-1.3.3.tar.gz 139417 RMD160 ab192c3c709c11e0a7d39ec8de268ee6be3265f3 SHA1 570c501f8663feb26360db25df0be342278b7b99 SHA256 0cdc7fb7861e83785edd2de127268f8a72ed9ae524ddc4beca236cfd63d1f8b0
DIST stow-2.1.1.tar.gz 458329 RMD160 1665e6f24b1c1e926e5afe8c80c65f22055dd739 SHA1 9db6f3ad6a181509db3f599adf52dbfaeafe210f SHA256 d88e1b022383ea58147f05587561b3052cadd6dc369f806c16492c159cc06c8e
-DIST stow-2.1.2.tar.gz 460706 RMD160 b1eb20b3c5a8e45e70cdd74686b2a98a963ead0d SHA1 fa59c8a4701cd7fa2842c2ae72cbd99601440e02 SHA256 d523afab21eed8c0a96f1e865439cd42194e9ed42c1adc9c22cf9a50f78a24a6
diff --git a/app-admin/stow/stow-2.1.2.ebuild b/app-admin/stow/stow-2.1.2.ebuild
deleted file mode 100644
index 90aff86b46c8..000000000000
--- a/app-admin/stow/stow-2.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-2.1.2.ebuild,v 1.1 2011/12/19 13:43:12 maksbotan Exp $
-
-EAPI="2"
-
-DESCRIPTION="Manage installation of software in /var/lib/"
-HOMEPAGE="http://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
-
- # create new STOWDIR
- dodir /var/lib/stow
-
- # install env.d file to add STOWDIR to PATH and LDPATH
- doenvd "${FILESDIR}"/99stow || die "doenvd failed"
-}
-
-pkg_postinst() {
- elog "We now recommend that you use /var/lib/stow as your STOWDIR"
- elog "instead of /usr/local in order to avoid conflicts with the"
- elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264 for"
- elog "more details on this change."
- elog "For your convenience, PATH has been updated to include"
- elog "/var/lib/stow/bin."
-}
diff --git a/app-admin/sud/files/sud.rc6 b/app-admin/sud/files/sud.rc6
index 0596915a994e..18c178a3c59d 100644
--- a/app-admin/sud/files/sud.rc6
+++ b/app-admin/sud/files/sud.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/files/sud.rc6,v 1.2 2011/12/31 18:19:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/files/sud.rc6,v 1.1 2004/10/26 23:49:03 lu_zero Exp $
depend() {
need net
@@ -10,7 +10,7 @@ depend() {
start() {
ebegin "Starting sud"
start-stop-daemon --start --quiet --pidfile /var/run/sud.pid \
- --exec /usr/sbin/sud
+ --startas /usr/sbin/sud
eend $?
}
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
deleted file mode 100644
index f6929ae733ba..000000000000
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sud/sud-1.3-r1.ebuild,v 1.1 2011/12/31 18:19:38 idl0r Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="a daemon to execute processes with special (and customizable) privileges in a nosuid environment."
-HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
-SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-src_prepare() {
- sed -i -e \
- 's/install-data-hook:$/& install-exec/' \
- -e \
- 's:chmod 500 $(sbindir)/ilogin:chmod 500 $(DESTDIR)$(sbindir)/ilogin:' \
- "${S}"/login/Makefile.in || die "sed failed."
- sed -i -e \
- 's/install-data-hook:$/& install-exec/' \
- -e \
- 's:chmod 555 $(bindir)/suz:chmod 500 $(DESTDIR)$(bindir)/suz:' \
- "${S}"/su/Makefile.in || die "sed failed."
- sed -i -e \
- 's/install-data-hook:$/& install-exec/' \
- -e \
- 's:chmod 500 $(sbindir)/sud:chmod 500 $(DESTDIR)$(sbindir)/sud:' \
- "${S}"/sud/Makefile.in || die "sed failed."
-}
-
-src_configure() {
- append-flags -D_GNU_SOURCE
- default_src_configure
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog* README NEWS TODO
- doman ilogin.1 sud.1 suz.1
- insinto /etc
- doins miscs/sud.conf*
- newinitd "${FILESDIR}"/sud.rc6 sud
-}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index e78c3fa0887f..a92010f6d456 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,4 +2,3 @@ DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d
DIST sudo-1.8.1p2.tar.gz 1238804 RMD160 165029d462e737c885b1d32accb9b2b19411a0fb SHA1 b743b3d7bdb06de68ea24eedfe13530e8fbcae09 SHA256 281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb
DIST sudo-1.8.2.tar.gz 1465051 RMD160 daebd7f67fff6429c3cb85260e9b11f0c3e28e3c SHA1 6a9400ba3e40394fd9c913219e3b6bb102bb3906 SHA256 37fe6ee670329bc45937fbe402e847f80b3a0a1c8fc9a66487e92b4b810152b0
DIST sudo-1.8.3p1.tar.gz 1536465 RMD160 7809cbde339220d7dc10ae8da504d5c4e219b55c SHA1 2a7ad912aa8a31706796e5bff8813e4fc7505333 SHA256 1a22635bc5a0a84df273a893c624d45f628c78668317c5bc442dac11db55bb82
-DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
diff --git a/app-admin/sudo/sudo-1.7.4_p5.ebuild b/app-admin/sudo/sudo-1.7.4_p5.ebuild
index 2182da04202d..f68085662398 100644
--- a/app-admin/sudo/sudo-1.7.4_p5.ebuild
+++ b/app-admin/sudo/sudo-1.7.4_p5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p5.ebuild,v 1.9 2011/12/29 21:33:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p5.ebuild,v 1.8 2011/08/11 10:58:35 ulm Exp $
inherit eutils pam
@@ -35,7 +35,7 @@ DEPEND="pam? ( virtual/pam )
dev-libs/cyrus-sasl
)
!pam? ( skey? ( >=sys-auth/skey-1.1.5-r1 ) )
- >=app-misc/editor-wrapper-3
+ app-misc/editor-wrapper
virtual/editor
virtual/mta"
RDEPEND="selinux? ( sec-policy/selinux-sudo )
@@ -168,7 +168,7 @@ src_compile() {
# audit: somebody got to explain me how I can test this before I
# enable it.. — Diego
econf --with-secure-path="${ROOTPATH}" \
- --with-editor=/usr/libexec/editor \
+ --with-editor=/usr/libexec/gentoo-editor \
--with-env-editor \
$(use_with offensive insults) \
$(use_with offensive all-insults) \
diff --git a/app-admin/sudo/sudo-1.8.1_p2.ebuild b/app-admin/sudo/sudo-1.8.1_p2.ebuild
index 466068d9121d..868acc6f3076 100644
--- a/app-admin/sudo/sudo-1.8.1_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p2.ebuild,v 1.10 2011/12/29 20:55:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p2.ebuild,v 1.9 2011/09/03 16:08:05 armin76 Exp $
EAPI=4
@@ -28,7 +28,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
LICENSE="as-is BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="pam offensive ldap selinux skey"
DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/sudo/sudo-1.8.2-r1.ebuild b/app-admin/sudo/sudo-1.8.2-r1.ebuild
index d630b21eb4f8..d117f0d8331a 100644
--- a/app-admin/sudo/sudo-1.8.2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.5 2012/01/22 15:35:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2-r1.ebuild,v 1.1 2011/10/12 18:50:26 slyfox Exp $
EAPI=4
@@ -28,7 +28,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
LICENSE="as-is BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="pam offensive ldap selinux skey"
DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/sudo/sudo-1.8.3_p2.ebuild b/app-admin/sudo/sudo-1.8.3_p2.ebuild
deleted file mode 100644
index bd6dd500fc55..000000000000
--- a/app-admin/sudo/sudo-1.8.3_p2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p2.ebuild,v 1.7 2012/02/04 15:31:59 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils pam multilib libtool
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="as-is BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="pam offensive ldap selinux skey"
-
-DEPEND="pam? ( virtual/pam )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ldap? (
- >=net-nds/openldap-2.1.30-r1
- dev-libs/cyrus-sasl
- )
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- >=app-misc/editor-wrapper-3
- virtual/editor
- virtual/mta"
-DEPEND="${DEPEND}
- sys-devel/bison"
-
-S=${WORKDIR}/${MY_P}
-
-REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.3_p1-linguas.patch
- elibtoolize
-}
-
-set_rootpath() {
- # FIXME: secure_path is a compile time setting. using ROOTPATH
- # is not perfect, env-update may invalidate this, but until it
- # is available as a sudoers setting this will have to do.
- einfo "Setting secure_path ..."
-
- # first extract the default ROOTPATH from build env
- ROOTPATH=$(unset ROOTPATH; . /etc/profile.env; echo "${ROOTPATH}")
- if [[ -z ${ROOTPATH} ]] ; then
- ewarn " Failed to find ROOTPATH, please report this"
- fi
-
- # then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:$thisp
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- ROOTPATH=${newpath#:}
- }
- cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
-
- # finally, strip gcc paths #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${ROOTPATH} ; do
- for e ; do [[ $thisp == $e ]] && continue 2 ; done
- newpath+=:$thisp
- done
- ROOTPATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
- einfo "... done"
-}
-
-src_configure() {
- local ROOTPATH
- set_rootpath
-
- # audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- econf \
- --enable-zlib=system \
- --with-secure-path="${ROOTPATH}" \
- --with-editor=/usr/libexec/editor \
- --with-env-editor \
- $(use_with offensive insults) \
- $(use_with offensive all-insults) \
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with skey) \
- $(use_with selinux) \
- --without-opie \
- --without-linux-audit \
- --with-timedir=/var/db/sudo \
- --with-plugindir=/usr/$(get_libdir)/sudo \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- if use ldap ; then
- dodoc README.LDAP doc/schema.OpenLDAP
- dosbin plugins/sudoers/sudoers2ldif
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
- EOF
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
- fi
-
- pamd_mimic system-auth sudo auth account session
-
- keepdir /var/db/sudo
- fperms 0700 /var/db/sudo
-}
-
-pkg_postinst() {
- if use ldap ; then
- ewarn
- ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in /etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sulfur/Manifest b/app-admin/sulfur/Manifest
index 1acc8ec118eb..09d2119c3d01 100644
--- a/app-admin/sulfur/Manifest
+++ b/app-admin/sulfur/Manifest
@@ -4,4 +4,3 @@ DIST entropy-1.0_rc53.tar.bz2 1675138 RMD160 b4ee06b5a9545e9aebb189f984335dd3213
DIST entropy-1.0_rc59.tar.bz2 1678091 RMD160 ca2c9d7b5b2594ae96a2cb629ae64d97ecee4bde SHA1 c924cfee89464a12e2aa5d66f56164015581c230 SHA256 f41b48bd7ddd4207143c50da244b806e27a7318101f78955e40a054e0fca75ec
DIST entropy-1.0_rc76.tar.bz2 1717076 RMD160 e25035b9ee93bff9a96aee2bf1f3136038b1df28 SHA1 3440adb1394069cf2aa042cdc9b8f4a7cee6437a SHA256 cc86adba32d27a774bf562d849d3e2bccd37dd0cbc9a3e7386dd5d72168d9d67
DIST entropy-1.0_rc77.tar.bz2 1718649 RMD160 88a5ec354dfe6f4d00caa89e6f486ec6b448d075 SHA1 c9816883fa8780c2312b3e93d0896e131af3929b SHA256 87df5e618b6cd22ec340980b773331032c786ae0bd173fea8e54a8b091a0532c
-DIST entropy-1.0_rc80.tar.bz2 1721422 RMD160 4dd440f0f9194316ed7d2e114ae7beada242def6 SHA1 2ff10e4980be0cf70e5378165d3d1a7ca3f2d6ac SHA256 26594aa001d129e6d705fc01dd3076283ce071c094da3a14eed7881daeff436e
diff --git a/app-admin/sulfur/sulfur-1.0_rc80.ebuild b/app-admin/sulfur/sulfur-1.0_rc80.ebuild
deleted file mode 100644
index 4715771b119c..000000000000
--- a/app-admin/sulfur/sulfur-1.0_rc80.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sulfur/sulfur-1.0_rc80.ebuild,v 1.1 2011/12/22 17:52:04 lxnay Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit eutils gnome2-utils fdo-mime python
-
-DESCRIPTION="Sulfur, the Entropy Package Manager Store"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/sulfur"
-
-RDEPEND="dev-python/pygtk:2
- ~sys-apps/entropy-${PV}
- sys-apps/file[python]
- sys-devel/gettext
- x11-libs/vte:0[python]
- x11-misc/xdg-utils"
-DEPEND="sys-devel/gettext"
-
-src_compile() {
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
- dodir /etc/gconf/schemas
- insinto /etc/gconf/schemas
- doins "${S}/misc/entropy-handler.schemas"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
- gnome2_gconf_savelist
- gnome2_gconf_install
- python_mod_optimize "/usr/lib/entropy/${PN}"
-}
-
-pkg_postrm() {
- python_mod_cleanup "/usr/lib/entropy/${PN}"
- gnome2_gconf_savelist
- gnome2_gconf_uninstall
-}
diff --git a/app-admin/swatch/swatch-3.2.3-r1.ebuild b/app-admin/swatch/swatch-3.2.3-r1.ebuild
index 84acb5b0d3cb..144857018a39 100644
--- a/app-admin/swatch/swatch-3.2.3-r1.ebuild
+++ b/app-admin/swatch/swatch-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.2.3-r1.ebuild,v 1.4 2012/02/06 18:58:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.2.3-r1.ebuild,v 1.3 2011/08/22 14:23:28 chainsaw Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index c67252d35a38..30a157f31455 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,3 +1,4 @@
DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a834 SHA1 5541cd6711b7a9d983601d8047b9a27d98ecbe9b SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89
-DIST syslog-ng_3.3.4.tar.gz 2475254 RMD160 234a94e89a47f0520236c8a9a3d586d609a50476 SHA1 3437a50af027f281747087ab47a45aa5fbabbf14 SHA256 a7045694cd079a8efcfd73ca45cb7576f005ba26e6c83ccdfaf3cf81fa4e58aa
+DIST syslog-ng_3.3.1.tar.gz 2405280 RMD160 f337db97ff445d8bb8a087d1894103443d8d2c2c SHA1 f084d66754c7fa1eada56946f77ef3066faa27a1 SHA256 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
+DIST syslog-ng_3.3.3.tar.gz 2417218 RMD160 b585c9aac9e8f279956054ee7894afb0ecd1bcd2 SHA1 e2ec8ba4bde24809630a7675bf5d97f00be467f8 SHA256 eaea7e42829999925d9f628b1b8b09ef47864c58f61d604a9b6b45f8af9e2d4a
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.1-filter.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.1-filter.patch
new file mode 100644
index 000000000000..bc09406b8824
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.1-filter.patch
@@ -0,0 +1,76 @@
+commit 4b438115f6387eb52b6c39c1f751ecf0c4a5ac5f
+Author: Balazs Scheidler
+Date: Sun Oct 23 20:19:58 2011 +0200
+
+ filters: fixed filter() evaluation when embedded as an AND/OR subexpression
+
+ When introducing the "init" method for filters one case was omitted: even
+ though AND and OR expressions don't want to do anything on init, their
+ subexpressions might, so this patch adds an init function to AND and OR
+ which does nothing but calls the same for its "left" and "right"
+ subexpression.
+
+ This patch fixes filter("xxx") expression evaluation when that is
+ not a single expression, but rather included in an AND or OR.
+
+ Reported-By: Leonid Isaev
+ Cc:
+ Signed-off-by: Balazs Scheidler
+
+--- a/lib/filter.c
++++ b/lib/filter.c
+@@ -84,6 +84,17 @@ typedef struct _FilterOp
+ } FilterOp;
+
+ static void
++fop_init(FilterExprNode *s, GlobalConfig *cfg)
++{
++ FilterOp *self = (FilterOp *) s;
++
++ if (self->left && self->left->init)
++ self->left->init(self->left, cfg);
++ if (self->right && self->right->init)
++ self->right->init(self->right, cfg);
++}
++
++static void
+ fop_free(FilterExprNode *s)
+ {
+ FilterOp *self = (FilterOp *) s;
+@@ -92,6 +103,14 @@ fop_free(FilterExprNode *s)
+ filter_expr_unref(self->right);
+ }
+
++static void
++fop_init_instance(FilterOp *self)
++{
++ filter_expr_node_init(&self->super);
++ self->super.init = fop_init;
++ self->super.free_fn = fop_free;
++}
++
+ static gboolean
+ fop_or_eval(FilterExprNode *s, LogMessage *msg)
+ {
+@@ -105,9 +124,8 @@ fop_or_new(FilterExprNode *e1, FilterExprNode *e2)
+ {
+ FilterOp *self = g_new0(FilterOp, 1);
+
+- filter_expr_node_init(&self->super);
++ fop_init_instance(self);
+ self->super.eval = fop_or_eval;
+- self->super.free_fn = fop_free;
+ self->super.modify = e1->modify || e2->modify;
+ self->left = e1;
+ self->right = e2;
+@@ -128,9 +146,8 @@ fop_and_new(FilterExprNode *e1, FilterExprNode *e2)
+ {
+ FilterOp *self = g_new0(FilterOp, 1);
+
+- filter_expr_node_init(&self->super);
++ fop_init_instance(self);
+ self->super.eval = fop_and_eval;
+- self->super.free_fn = fop_free;
+ self->super.modify = e1->modify || e2->modify;
+ self->left = e1;
+ self->right = e2;
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
new file mode 100644
index 000000000000..f269ee254d97
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.3.1-ssl.patch
@@ -0,0 +1,85 @@
+While most places where OpenSSL was used were guarded by ENABLE_SSL
+ifs, some were not. This patch adds those guards to lib/crypto.c,
+modules/afsql/afsql.c and tests/loggen/loggen.c.
+
+It also makes sure that OPENSSL_LIBS gets emptied when enable_ssl is
+set to no.
+
+Signed-off-by: Gergely Nagy
+---
+ configure.in | 4 ++++
+ lib/crypto.c | 4 ++++
+ modules/afsql/afsql.c | 3 +++
+ tests/loggen/loggen.c | 3 +++
+ 4 files changed, 14 insertions(+), 0 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -679,6 +679,10 @@ else
+ enable_ssl="no"
+ fi
+
++if test "x$enable_ssl" = "xno"; then
++ OPENSSL_LIBS=""
++fi
++
+ dnl
+ dnl Right now, openssl is never linked statically as it is only used by the
+ dnl TLS build of the afsocket plugin which is loaded dynamically anyway.
+--- a/lib/crypto.c
++++ b/lib/crypto.c
+@@ -29,6 +29,8 @@
+ #include "crypto.h"
+ #include "apphook.h"
+
++#if ENABLE_SSL
++
+ #include
+ #include
+ #include
+@@ -124,3 +126,5 @@ crypto_init(void)
+ }
+
+ /* the crypto options (seed) are handled in main.c */
++
++#endif
+--- a/modules/afsql/afsql.c
++++ b/modules/afsql/afsql.c
+@@ -35,7 +35,10 @@
+
+ #include
+ #include
++
++#if ENABLE_SSL
+ #include
++#endif
+
+ /* field flags */
+ enum
+--- a/tests/loggen/loggen.c
++++ b/tests/loggen/loggen.c
+@@ -14,11 +14,14 @@
+ #include
+ #include
+
++#if ENABLE_SSL
+ #include
+ #include
+ #include
+ #include
+ #include
++#endif
++
+ #include
+
+ #define MAX_MESSAGE_LENGTH 8192
+--
+1.7.0.4
+
+
+______________________________________________________________________________
+Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
+Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
+FAQ: http://www.balabit.com/wiki/syslog-ng-faq
+
+
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
deleted file mode 100644
index a2ad347722d2..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.4-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/scratch-buffers.c.orig 2012-01-20 17:44:43.871103296 -0500
-+++ ./lib/scratch-buffers.c 2012-01-20 17:44:56.313552034 -0500
-@@ -24,6 +24,7 @@
-
- #include "tls-support.h"
- #include "scratch-buffers.h"
-+#include "misc.h"
-
- TLS_BLOCK_START
- {
diff --git a/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild b/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
index 7f6cb5bbc3db..c24cf204aab7 100644
--- a/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild,v 1.6 2012/02/06 17:19:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild,v 1.4 2011/12/16 15:10:04 jer Exp $
EAPI=2
inherit autotools fixheadtails eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/s
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="caps hardened ipv6 +pcre selinux spoof-source sql ssl tcpd"
RESTRICT="test"
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
new file mode 100644
index 000000000000..8d03f849601a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.6 2011/11/09 17:36:10 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools fixheadtails eutils multilib
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
+RESTRICT="test"
+
+LIBS_DEPEND="
+ spoof-source? ( net-libs/libnet )
+ ssl? ( dev-libs/openssl )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ !static? ( >=dev-libs/eventlog-0.2.12 )
+ >=dev-libs/glib-2.10.1:2
+ json? ( >=dev-libs/json-glib-0.12 )
+ caps? ( sys-libs/libcap )
+ sql? ( >=dev-db/libdbi-0.8.3 )"
+RDEPEND="
+ !static? (
+ pcre? ( dev-libs/libpcre )
+ ${LIBS_DEPEND}
+ )"
+DEPEND="${RDEPEND}
+ ${LIBS_DEPEND}
+ static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
+ dev-util/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-ssl.patch \
+ "${FILESDIR}"/${P}-filter.patch
+ ht_fix_file configure.in
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use static ; then
+ myconf="${myconf} --enable-static-linking"
+ else
+ myconf="${myconf} --enable-dynamic-linking"
+ fi
+ econf \
+ --disable-dependency-tracking \
+ --disable-systemd \
+ --with-ivykis=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/misc \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(use_enable caps linux-caps) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_with json json-glib) \
+ $(use_enable mongodb) \
+ $(use_enable pcre) \
+ $(use_enable spoof-source) \
+ $(use_enable sql) \
+ $(use_enable ssl) \
+ $(use_enable tcpd tcp-wrapper) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc AUTHORS ChangeLog NEWS \
+ contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use hardened || use selinux ; then
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
+ elif use userland_BSD ; then
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
+ else
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
+ fi
+
+ insinto /etc/logrotate.d
+ # Install snippet for logrotate, which may or may not be installed
+ if use hardened || use selinux ; then
+ newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
+ else
+ newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
+ fi
+
+ newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
+ keepdir /etc/syslog-ng/patterndb.d
+ find "${D}" -type f -name '*.la' -exec rm {} + || die
+ rmdir "${D}"/usr/libexec
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.3.ebuild
new file mode 100644
index 000000000000..4713232f576a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.3.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.3.ebuild,v 1.1 2011/11/28 21:24:14 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools fixheadtails eutils multilib
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
+RESTRICT="test"
+
+LIBS_DEPEND="
+ spoof-source? ( net-libs/libnet )
+ ssl? ( dev-libs/openssl )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ !static? ( >=dev-libs/eventlog-0.2.12 )
+ >=dev-libs/glib-2.10.1:2
+ json? ( >=dev-libs/json-glib-0.12 )
+ caps? ( sys-libs/libcap )
+ sql? ( >=dev-db/libdbi-0.8.3 )"
+RDEPEND="
+ !static? (
+ pcre? ( dev-libs/libpcre )
+ ${LIBS_DEPEND}
+ )"
+DEPEND="${RDEPEND}
+ ${LIBS_DEPEND}
+ static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
+ dev-util/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ ht_fix_file configure.in
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use static ; then
+ myconf="${myconf} --enable-static-linking"
+ else
+ myconf="${myconf} --enable-dynamic-linking"
+ fi
+ econf \
+ --disable-dependency-tracking \
+ --disable-systemd \
+ --with-ivykis=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/misc \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(use_enable caps linux-caps) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_with json json-glib) \
+ $(use_enable mongodb) \
+ $(use_enable pcre) \
+ $(use_enable spoof-source) \
+ $(use_enable sql) \
+ $(use_enable ssl) \
+ $(use_enable tcpd tcp-wrapper) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc AUTHORS ChangeLog NEWS \
+ contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use hardened || use selinux ; then
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
+ elif use userland_BSD ; then
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
+ else
+ newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
+ fi
+
+ insinto /etc/logrotate.d
+ # Install snippet for logrotate, which may or may not be installed
+ if use hardened || use selinux ; then
+ newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
+ else
+ newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
+ fi
+
+ newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
+ keepdir /etc/syslog-ng/patterndb.d
+ find "${D}" -type f -name '*.la' -exec rm {} + || die
+ rmdir "${D}"/usr/libexec
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
deleted file mode 100644
index ead900010186..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.1 2012/01/21 21:51:52 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
-RESTRICT="test"
-
-LIBS_DEPEND="
- spoof-source? ( net-libs/libnet )
- ssl? ( dev-libs/openssl )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- !static? ( >=dev-libs/eventlog-0.2.12 )
- >=dev-libs/glib-2.10.1:2
- json? ( >=dev-libs/json-glib-0.12 )
- caps? ( sys-libs/libcap )
- sql? ( >=dev-db/libdbi-0.8.3 )"
-RDEPEND="
- !static? (
- pcre? ( dev-libs/libpcre )
- ${LIBS_DEPEND}
- )"
-DEPEND="${RDEPEND}
- ${LIBS_DEPEND}
- static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
- dev-util/pkgconfig
- sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-compile.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use static ; then
- myconf="${myconf} --enable-static-linking"
- else
- myconf="${myconf} --enable-dynamic-linking"
- fi
- econf \
- --disable-dependency-tracking \
- --disable-systemd \
- --with-ivykis=internal \
- --sysconfdir=/etc/syslog-ng \
- --localstatedir=/var/lib/misc \
- --with-pidfile-dir=/var/run \
- --with-module-dir=/usr/$(get_libdir)/syslog-ng \
- $(use_enable caps linux-caps) \
- $(use_enable ipv6) \
- $(use_enable json) \
- $(use_with json json-glib) \
- $(use_enable mongodb) \
- $(use_enable pcre) \
- $(use_enable spoof-source) \
- $(use_enable sql) \
- $(use_enable ssl) \
- $(use_enable tcpd tcp-wrapper) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS \
- contrib/syslog-ng.conf* \
- contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-
- # Install default configuration
- insinto /etc/syslog-ng
- if use hardened || use selinux ; then
- newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
- elif use userland_BSD ; then
- newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
- else
- newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
- fi
-
- insinto /etc/logrotate.d
- # Install snippet for logrotate, which may or may not be installed
- if use hardened || use selinux ; then
- newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
- else
- newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
- fi
-
- newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
- newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
- keepdir /etc/syslog-ng/patterndb.d
- find "${D}" -type f -name '*.la' -exec rm {} + || die
- rmdir "${D}"/usr/libexec
-}
-
-pkg_postinst() {
- elog "For detailed documentation please see the upstream website:"
- elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
-
- # bug #355257
- if ! has_version app-admin/logrotate ; then
- echo
- elog "It is highly recommended that app-admin/logrotate be emerged to"
- elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
- elog "for logrotate to use."
- echo
- fi
-}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14.ebuild b/app-admin/syslog-summary/syslog-summary-1.14.ebuild
index c586aa22673c..51643ce5bd7a 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14.ebuild,v 1.5 2011/12/18 17:44:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14.ebuild,v 1.4 2011/10/09 17:08:43 maekke Exp $
EAPI=2
PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/sysstat/sysstat-10.0.3.ebuild b/app-admin/sysstat/sysstat-10.0.3.ebuild
index 92b60d7bf595..39ba4f2a29af 100644
--- a/app-admin/sysstat/sysstat-10.0.3.ebuild
+++ b/app-admin/sysstat/sysstat-10.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.3.ebuild,v 1.5 2012/01/21 16:27:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.3.ebuild,v 1.1 2011/11/29 16:20:50 jer Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="cron debug +doc isag nls lm_sensors"
SYSSTAT_LINGUAS="
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index 3bb59f31b5b4..61acac55d6d3 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -1,2 +1,3 @@
+DIST system-config-printer-1.3.3.tar.xz 994588 RMD160 274786bc7805d86229bf7da411cc038a0f15200e SHA1 44f0f199251bf5dcec16cf9c9d5536448e719a51 SHA256 5001a4fc1616cd2b7a578055e6cd8bee0afa3f9ce3b29cc04971385cf4af7ea2
DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
index 238b7c248a78..38056cad368a 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.7 2012/01/18 19:55:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.3 2011/10/23 21:37:20 tetromino Exp $
EAPI="3"
@@ -15,7 +15,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc policykit"
@@ -30,7 +30,7 @@ COMMON_DEPEND="
>=dev-python/pycups-1.9.53
>=dev-python/pygobject-2.21.5:2
>=net-print/cups-1.4.6[dbus]
- >=sys-fs/udev-164-r2
+ sys-fs/udev
virtual/libusb:0
"
DEPEND="${COMMON_DEPEND}
diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 3bb59f31b5b4..61acac55d6d3 100644
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -1,2 +1,3 @@
+DIST system-config-printer-1.3.3.tar.xz 994588 RMD160 274786bc7805d86229bf7da411cc038a0f15200e SHA1 44f0f199251bf5dcec16cf9c9d5536448e719a51 SHA256 5001a4fc1616cd2b7a578055e6cd8bee0afa3f9ce3b29cc04971385cf4af7ea2
DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild
index 8bc398bdfd31..6b7bda7f38f1 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild,v 1.8 2012/01/05 08:01:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild,v 1.7 2011/10/30 14:37:46 armin76 Exp $
EAPI="3"
@@ -26,7 +26,6 @@ RESTRICT="test"
RDEPEND="
~app-admin/system-config-printer-common-${PV}
dev-python/notify-python
- >=dev-python/pycups-1.9.47
>=dev-python/pygtk-2.4
gnome-keyring? ( dev-python/gnome-keyring-python )
"
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild
index 4b58c5c38e73..cdde178ad450 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild,v 1.5 2012/01/18 19:56:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild,v 1.1 2011/10/05 22:55:07 reavertm Exp $
EAPI="3"
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="gnome-keyring"
@@ -26,7 +26,6 @@ RESTRICT="test"
RDEPEND="
~app-admin/system-config-printer-common-${PV}
dev-python/notify-python
- >=dev-python/pycups-1.9.47
>=dev-python/pygtk-2.4
gnome-keyring? ( dev-python/gnome-keyring-python )
"
diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
index 32c01fcad621..6287fc1f14a6 100644
--- a/app-admin/tenshi/tenshi-0.12.ebuild
+++ b/app-admin/tenshi/tenshi-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.3 2012/02/05 13:45:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.1 2011/06/16 17:23:13 jer Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/app-admin/testdisk/testdisk-6.12.ebuild b/app-admin/testdisk/testdisk-6.12.ebuild
index 51dfe627aa3d..65a5217d35e0 100644
--- a/app-admin/testdisk/testdisk-6.12.ebuild
+++ b/app-admin/testdisk/testdisk-6.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.12.ebuild,v 1.5 2012/01/05 22:17:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.12.ebuild,v 1.4 2011/10/16 13:37:31 scarabeus Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="static reiserfs ntfs jpeg"
# WARNING: reiserfs support does NOT work with reiserfsprogs
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
index b56495a6d130..e0dee071654d 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild,v 1.6 2012/02/05 17:41:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild,v 1.2 2011/01/03 01:14:34 xmw Exp $
EAPI="3"
inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild
index 4274f9b6ae33..978cfa4db286 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild,v 1.3 2012/02/05 17:41:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.9-r1.ebuild,v 1.2 2009/03/22 01:29:24 jmbsvicetto Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild
index 57e90e17182f..f581b3b325a4 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild,v 1.7 2012/02/05 17:41:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild,v 1.6 2009/03/22 01:29:24 jmbsvicetto Exp $
inherit eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/ulogd/files/ulogd b/app-admin/ulogd/files/ulogd
index e2f76a1b7842..641ad5e73e81 100644
--- a/app-admin/ulogd/files/ulogd
+++ b/app-admin/ulogd/files/ulogd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.5 2012/01/01 01:01:06 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.4 2011/12/04 10:10:49 swegener Exp $
extra_started_commands="reload"
@@ -21,16 +21,16 @@ start() {
ebegin "Starting ulogd"
start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -u ulogd -d >/dev/null 2>&1
eend $?
-}
+}
stop() {
ebegin "Stopping ulogd"
start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
eend $?
-}
+}
reload() {
ebegin "Reloading ulogd.conf file"
killall -HUP ulogd &>/dev/null
eend $?
-}
+}
diff --git a/app-admin/ulogd/files/ulogd-0.98 b/app-admin/ulogd/files/ulogd-0.98
index 383fb8ccfbbc..9bdcc803e78b 100644
--- a/app-admin/ulogd/files/ulogd-0.98
+++ b/app-admin/ulogd/files/ulogd-0.98
@@ -27,18 +27,18 @@ start() {
ebegin "Starting ulogd"
start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -d >/dev/null 2>&1
eend $?
-}
+}
stop() {
initService
ebegin "Stopping ulogd"
start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
eend $?
-}
+}
reload() {
initService
ebegin "Reloading ulogd.conf file"
killall -HUP ulogd
eend $?
-}
+}
diff --git a/app-admin/webalizer/webalizer-2.21.02.ebuild b/app-admin/webalizer/webalizer-2.21.02.ebuild
index be52e26fbaba..00b44cf7f733 100644
--- a/app-admin/webalizer/webalizer-2.21.02.ebuild
+++ b/app-admin/webalizer/webalizer-2.21.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.4 2012/02/04 14:08:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.3 2010/10/28 03:14:50 sping Exp $
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
mirror://gentoo/${PN}.conf.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="geoip nls"
SLOT="0"
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index d8ea2c0820c1..bee101f41174 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -1,9 +1,8 @@
- web-apps
-
- blueness@gentoo.org
- Anthony G. Basile
-
+web-apps
+
+ web-apps@gentoo.org
+
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 84a38894e69d..b8ca1cd49860 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -2,5 +2,3 @@ DIST webmin-1.560-minimal.tar.gz 1856121 RMD160 83df64d056952fef757ba4e7ef3b4706
DIST webmin-1.560.tar.gz 15152937 RMD160 1ee7c172baffc6e13a213a7bd61fa8ddc7814d54 SHA1 02ae664b0f01a8214aac018c74fd34447336ed5d SHA256 4370abe32f04012328e2afa93e1c00fd1353963a34d8f644604f9e36d00b6e55
DIST webmin-1.570-minimal.tar.gz 1873041 RMD160 95fc2bca6b7132179cbe23c2007e2f0eaa5b67df SHA1 a4c89e452aff56ac7ee4e4ecdd04279d98b33213 SHA256 898c03f136ddc63f6486f287ec38bf2ce8773109e80d1e8a6566fa11381d855e
DIST webmin-1.570.tar.gz 15200156 RMD160 13f61f03c1aa5b2a47aa8bf37ffdb0b754d0002a SHA1 b4728a2c74ca81973064f7801566ba09ef9ff717 SHA256 3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54
-DIST webmin-1.580-minimal.tar.gz 2039422 RMD160 a41df699eaa8123a7141fb012484f073e7874e08 SHA1 03b71b203371498eb60b0d012327ba15023c6005 SHA256 efac413918559d097e82d7f376b741d13d0bb147864c3d8075de1e24d17c3195
-DIST webmin-1.580.tar.gz 16081299 RMD160 45cee87ad6b54403e02eb2f69f270ee45910b092 SHA1 1f300796b9b6a62665dd03cb98b5ed7ce6666615 SHA256 4f767c7e66defb4d1f102692a70752c558c8bf289e4e9980d82b1af86bd764e4
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
index 02ddf6508893..4ab582168fcc 100644
--- a/app-admin/webmin/files/init.d.webmin
+++ b/app-admin/webmin/files/init.d.webmin
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.10 2012/01/24 20:54:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.8 2011/09/18 09:56:11 hwoarang Exp $
# We do not give a choice to user for configuring these 'cause it will mess up
@@ -10,7 +10,7 @@ WEBMIN_EXE="%exe%"
WEBMIN_PID="%pid%"
WEBMIN_CONF="%conf%"
-extra_started_commands="reload"
+opts="${opts} reload"
depend() {
use net logger
diff --git a/app-admin/webmin/webmin-1.560-r1.ebuild b/app-admin/webmin/webmin-1.560-r1.ebuild
deleted file mode 100644
index e7749436f727..000000000000
--- a/app-admin/webmin/webmin-1.560-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postrm() {
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl' and 'ssl_redirect' for tightening security
- export ssl=1
- export ssl_redirect=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.560.ebuild b/app-admin/webmin/webmin-1.560.ebuild
new file mode 100644
index 000000000000..4dcc1329a26a
--- /dev/null
+++ b/app-admin/webmin/webmin-1.560.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560.ebuild,v 1.1 2011/09/18 09:56:11 hwoarang Exp $
+
+EAPI="3"
+
+inherit eutils pam ssl-cert
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+ !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ virtual/perl-Time-Local
+ dev-perl/Authen-Libwrap
+ dev-perl/IO-Tty
+ dev-perl/MD5
+ dev-perl/Net-SSLeay
+ dev-perl/Authen-PAM
+ dev-perl/Sys-Hostname-Long
+ !minimal? (
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ ldap? ( dev-perl/perl-ldap )
+ dev-perl/XML-Generator
+ dev-perl/XML-Parser
+ )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ local perl="$( which perl )"
+
+ # Remove the unnecessary and incompatible files
+ rm -rf acl/Authen-SolarisRBAC-0.1*
+ if ! use minimal ; then
+ rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+ rm -f mount/{free,net,open}bsd-mounts*
+ rm -f mount/macos-mounts*
+ fi
+
+ # For security reasons remove the SSL certificate that comes with Webmin
+ # We will create our own later
+ rm -f miniserv.pem
+
+ # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+ # We will use our own later
+ rm -f setup.{sh,pl}
+
+ # Fix the permissions of the install files
+ chmod -R og-w "${S}"
+
+ # Since we should not modify any files after install
+ # we set the perl path in all cgi and pl files here using Webmin's routines
+ # The pl file is Prefix safe and works only on provided input, no other filesystem files
+ ebegin "Fixing perl path in source files"
+ (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+ eend $?
+}
+
+src_install() {
+ # Create config dir and keep
+ diropts -m0755
+ dodir /etc/webmin
+ keepdir /etc/webmin
+
+ # Create install dir
+ # Third party modules installed through Webmin go here too, so keep
+ dodir /usr/libexec/webmin
+ keepdir /usr/libexec/webmin
+
+ # Copy our own setup script to installation folder
+ insinto /usr/libexec/webmin
+ newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+ fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+ # This is here if we ever want in future ebuilds to add some specific
+ # config values in the /etc/webmin/miniserv.conf
+ # The format of this file should be the same as the one of miniserv.conf:
+ # var=value
+ #
+ # Uncomment it if you use such file. Before that check if upstream
+ # has this file in root dir too.
+ #newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+ # Create the log dir and keep
+ diropts -m0700
+ dodir /var/log/webmin
+ keepdir /var/log/webmin
+
+ # Create the init.d file and put the neccessary variables there
+ newinitd "${FILESDIR}"/init.d.webmin webmin
+ sed -i \
+ -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+ -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+ -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+ "${ED}etc/init.d/webmin" \
+ || die "Failed to patch the webmin init file"
+
+ # Setup pam
+ pamd_mimic system-auth webmin auth account session
+
+ # Copy files to installation folder
+ ebegin "Copying install files to destination"
+ cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+ eend $?
+}
+
+pkg_preinst() {
+ # First stop service if running so Webmin to not messup our config
+ ebegin "Stopping any running Webmin instance prior merging"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+}
+
+pkg_postinst() {
+ # Run pkg_config phase first - non interactively
+ export INTERACTIVE="no"
+ pkg_config
+ # Every next time pkg_config should be interactive
+ INTERACTIVE="yes"
+
+ ewarn
+ ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+ ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+ ewarn "To avoid problems, please before using any module, look at its configuration options first."
+ ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+ ewarn
+ elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+ elog "- The default URL to connect to Webmin is: https://localhost:10000"
+ elog "- The default user that can login is: root"
+ elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+ # First stop service if running - we do not want Webmin to mess up config
+ ebegin "Stopping any running Webmin instance prior unmerging"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+}
+
+pkg_postrm() {
+ ewarn
+ ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+ ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+ ewarn "To fix this just disable them if you intend to use Webmin again,"
+ ewarn "OR delete them if not."
+ ewarn
+}
+
+pkg_config(){
+ # First stop service if running
+ ebegin "Stopping any running Webmin instance"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+
+ # Next set the default reset variable to 'none'
+ # reset/_reset can be:
+ # 'none' - does not reset anything, just upgrades if a conf is present
+ # OR installs new conf if a conf is missing
+ # 'soft' - deletes only $config_dir/config file and thus resetting most
+ # conf values to their defaults. Keeps the specific Webmin cron jobs
+ # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+ # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+ local _reset="none"
+
+ # If in interactive mode ask user what should we do
+ if [[ "${INTERACTIVE}" = "yes" ]]; then
+ einfo
+ einfo "Please enter the number of the action you would like to perform?"
+ einfo
+ einfo "1. Update configuration"
+ einfo " (keeps old config options and adds the new ones)"
+ einfo "2. Soft reset configuration"
+ einfo " (keeps some old config options, the other options are set to default)"
+ ewarn " All Webmin users will be reset"
+ einfo "3. Hard reset configuration"
+ einfo " (all options including module options are set to default)"
+ ewarn " You will lose all Webmin configuration options you have done till now"
+ einfo "4. Exit this configuration utility (default)"
+ while [ "$correct" != "true" ] ; do
+ read answer
+ if [[ "$answer" = "1" ]] ; then
+ _reset="none"
+ correct="true"
+ elif [[ "$answer" = "2" ]] ; then
+ _reset="soft"
+ correct="true"
+ elif [[ "$answer" = "3" ]] ; then
+ _reset="hard"
+ correct="true"
+ elif [ "$answer" = "4" -o "$answer" = "" ] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter a number from 1 to 4"
+ fi
+ done
+
+ if [[ "$_reset" = "hard" ]]; then
+ while [ "$sure" != "true" ] ; do
+ ewarn "You will lose all Webmin configuration options you have done till now."
+ ewarn "Are you sure you want to do this? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ sure="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter 'y' or 'n'"
+ fi
+ done
+ fi
+ fi
+
+ export reset=$_reset
+
+ # Create ssl certificate for Webmin if there is not one in the proper place
+ if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+ install_cert "${EROOT}/etc/ssl/webmin/server"
+ fi
+
+ # Ensure all paths passed to the setup script use EROOT
+ export wadir="${EROOT}usr/libexec/webmin"
+ export config_dir="${EROOT}etc/webmin"
+ export var_dir="${EROOT}var/log/webmin"
+ export tempdir="${T}"
+ export pidfile="${EROOT}var/run/webmin.pid"
+ export perl="$( which perl )"
+ export os_type='gentoo-linux'
+ export os_version='*'
+ export real_os_type='Gentoo Linux'
+ export real_os_version='Any version'
+ # Forcing 'ssl' and 'ssl_redirect' for tightening security
+ export ssl=1
+ export ssl_redirect=1
+ export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+ export port=10000
+
+ export atboot=0
+
+ einfo "Executing Webmin's configure script"
+ $wadir/gentoo-setup.sh
+
+ einfo "Configuration of Webmin done"
+}
diff --git a/app-admin/webmin/webmin-1.570-r1.ebuild b/app-admin/webmin/webmin-1.570-r1.ebuild
deleted file mode 100644
index 4096665eff90..000000000000
--- a/app-admin/webmin/webmin-1.570-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postrm() {
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl' and 'ssl_redirect' for tightening security
- export ssl=1
- export ssl_redirect=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.570.ebuild b/app-admin/webmin/webmin-1.570.ebuild
new file mode 100644
index 000000000000..f9f1e6873632
--- /dev/null
+++ b/app-admin/webmin/webmin-1.570.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570.ebuild,v 1.1 2011/10/12 21:10:27 hwoarang Exp $
+
+EAPI="3"
+
+inherit eutils pam ssl-cert
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+ !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ virtual/perl-Time-Local
+ dev-perl/Authen-Libwrap
+ dev-perl/IO-Tty
+ dev-perl/MD5
+ dev-perl/Net-SSLeay
+ dev-perl/Authen-PAM
+ dev-perl/Sys-Hostname-Long
+ !minimal? (
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ ldap? ( dev-perl/perl-ldap )
+ dev-perl/XML-Generator
+ dev-perl/XML-Parser
+ )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ local perl="$( which perl )"
+
+ # Remove the unnecessary and incompatible files
+ rm -rf acl/Authen-SolarisRBAC-0.1*
+ if ! use minimal ; then
+ rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+ rm -f mount/{free,net,open}bsd-mounts*
+ rm -f mount/macos-mounts*
+ fi
+
+ # For security reasons remove the SSL certificate that comes with Webmin
+ # We will create our own later
+ rm -f miniserv.pem
+
+ # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+ # We will use our own later
+ rm -f setup.{sh,pl}
+
+ # Fix the permissions of the install files
+ chmod -R og-w "${S}"
+
+ # Since we should not modify any files after install
+ # we set the perl path in all cgi and pl files here using Webmin's routines
+ # The pl file is Prefix safe and works only on provided input, no other filesystem files
+ ebegin "Fixing perl path in source files"
+ (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+ eend $?
+}
+
+src_install() {
+ # Create config dir and keep
+ diropts -m0755
+ dodir /etc/webmin
+ keepdir /etc/webmin
+
+ # Create install dir
+ # Third party modules installed through Webmin go here too, so keep
+ dodir /usr/libexec/webmin
+ keepdir /usr/libexec/webmin
+
+ # Copy our own setup script to installation folder
+ insinto /usr/libexec/webmin
+ newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+ fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+ # This is here if we ever want in future ebuilds to add some specific
+ # config values in the /etc/webmin/miniserv.conf
+ # The format of this file should be the same as the one of miniserv.conf:
+ # var=value
+ #
+ # Uncomment it if you use such file. Before that check if upstream
+ # has this file in root dir too.
+ #newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+ # Create the log dir and keep
+ diropts -m0700
+ dodir /var/log/webmin
+ keepdir /var/log/webmin
+
+ # Create the init.d file and put the neccessary variables there
+ newinitd "${FILESDIR}"/init.d.webmin webmin
+ sed -i \
+ -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+ -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+ -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+ "${ED}etc/init.d/webmin" \
+ || die "Failed to patch the webmin init file"
+
+ # Setup pam
+ pamd_mimic system-auth webmin auth account session
+
+ # Copy files to installation folder
+ ebegin "Copying install files to destination"
+ cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+ eend $?
+}
+
+pkg_preinst() {
+ # First stop service if running so Webmin to not messup our config
+ ebegin "Stopping any running Webmin instance prior merging"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+}
+
+pkg_postinst() {
+ # Run pkg_config phase first - non interactively
+ export INTERACTIVE="no"
+ pkg_config
+ # Every next time pkg_config should be interactive
+ INTERACTIVE="yes"
+
+ ewarn
+ ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+ ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+ ewarn "To avoid problems, please before using any module, look at its configuration options first."
+ ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+ ewarn
+ elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+ elog "- The default URL to connect to Webmin is: https://localhost:10000"
+ elog "- The default user that can login is: root"
+ elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+ # First stop service if running - we do not want Webmin to mess up config
+ ebegin "Stopping any running Webmin instance prior unmerging"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+}
+
+pkg_postrm() {
+ ewarn
+ ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+ ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+ ewarn "To fix this just disable them if you intend to use Webmin again,"
+ ewarn "OR delete them if not."
+ ewarn
+}
+
+pkg_config(){
+ # First stop service if running
+ ebegin "Stopping any running Webmin instance"
+ rc-service --ifexists -- webmin --ifstarted stop
+ eend $?
+
+ # Next set the default reset variable to 'none'
+ # reset/_reset can be:
+ # 'none' - does not reset anything, just upgrades if a conf is present
+ # OR installs new conf if a conf is missing
+ # 'soft' - deletes only $config_dir/config file and thus resetting most
+ # conf values to their defaults. Keeps the specific Webmin cron jobs
+ # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+ # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+ local _reset="none"
+
+ # If in interactive mode ask user what should we do
+ if [[ "${INTERACTIVE}" = "yes" ]]; then
+ einfo
+ einfo "Please enter the number of the action you would like to perform?"
+ einfo
+ einfo "1. Update configuration"
+ einfo " (keeps old config options and adds the new ones)"
+ einfo "2. Soft reset configuration"
+ einfo " (keeps some old config options, the other options are set to default)"
+ ewarn " All Webmin users will be reset"
+ einfo "3. Hard reset configuration"
+ einfo " (all options including module options are set to default)"
+ ewarn " You will lose all Webmin configuration options you have done till now"
+ einfo "4. Exit this configuration utility (default)"
+ while [ "$correct" != "true" ] ; do
+ read answer
+ if [[ "$answer" = "1" ]] ; then
+ _reset="none"
+ correct="true"
+ elif [[ "$answer" = "2" ]] ; then
+ _reset="soft"
+ correct="true"
+ elif [[ "$answer" = "3" ]] ; then
+ _reset="hard"
+ correct="true"
+ elif [ "$answer" = "4" -o "$answer" = "" ] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter a number from 1 to 4"
+ fi
+ done
+
+ if [[ "$_reset" = "hard" ]]; then
+ while [ "$sure" != "true" ] ; do
+ ewarn "You will lose all Webmin configuration options you have done till now."
+ ewarn "Are you sure you want to do this? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ sure="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter 'y' or 'n'"
+ fi
+ done
+ fi
+ fi
+
+ export reset=$_reset
+
+ # Create ssl certificate for Webmin if there is not one in the proper place
+ if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+ install_cert "${EROOT}/etc/ssl/webmin/server"
+ fi
+
+ # Ensure all paths passed to the setup script use EROOT
+ export wadir="${EROOT}usr/libexec/webmin"
+ export config_dir="${EROOT}etc/webmin"
+ export var_dir="${EROOT}var/log/webmin"
+ export tempdir="${T}"
+ export pidfile="${EROOT}var/run/webmin.pid"
+ export perl="$( which perl )"
+ export os_type='gentoo-linux'
+ export os_version='*'
+ export real_os_type='Gentoo Linux'
+ export real_os_version='Any version'
+ # Forcing 'ssl' and 'ssl_redirect' for tightening security
+ export ssl=1
+ export ssl_redirect=1
+ export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+ export port=10000
+
+ export atboot=0
+
+ einfo "Executing Webmin's configure script"
+ $wadir/gentoo-setup.sh
+
+ einfo "Configuration of Webmin done"
+}
diff --git a/app-admin/webmin/webmin-1.580.ebuild b/app-admin/webmin/webmin-1.580.ebuild
deleted file mode 100644
index 0ba753ab91bf..000000000000
--- a/app-admin/webmin/webmin-1.580.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.580.ebuild,v 1.2 2012/01/26 22:00:54 mr_bones_ Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-}
-
-pkg_postrm() {
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- rc-service --ifexists -- webmin --ifstarted stop
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl' and 'ssl_redirect' for tightening security
- export ssl=1
- export ssl_redirect=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/whowatch/whowatch-1.6.0-r1.ebuild b/app-admin/whowatch/whowatch-1.6.0-r1.ebuild
index 1aef51e7f3b8..45f5ac222976 100644
--- a/app-admin/whowatch/whowatch-1.6.0-r1.ebuild
+++ b/app-admin/whowatch/whowatch-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.6.0-r1.ebuild,v 1.2 2012/02/05 18:22:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.6.0-r1.ebuild,v 1.1 2010/01/09 17:42:12 jer Exp $
inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
IUSE=""
DEPEND="sys-libs/ncurses"
diff --git a/app-admin/whowatch/whowatch-1.8.3.ebuild b/app-admin/whowatch/whowatch-1.8.3.ebuild
index 7bcd2c145b65..b8b7c7314d24 100644
--- a/app-admin/whowatch/whowatch-1.8.3.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.8.3.ebuild,v 1.6 2012/02/05 18:22:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.8.3.ebuild,v 1.4 2011/12/11 23:46:11 jer Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~sparc x86"
IUSE=""
DEPEND="sys-libs/ncurses"
diff --git a/app-admin/xstow/xstow-1.0.0-r1.ebuild b/app-admin/xstow/xstow-1.0.0-r1.ebuild
deleted file mode 100644
index 2cd5227a32dd..000000000000
--- a/app-admin/xstow/xstow-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.0-r1.ebuild,v 1.2 2011/12/19 18:10:46 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ncurses static"
-
-DEPEND="ncurses? ( sys-libs/ncurses )"
-
-src_compile() {
- econf --disable-dependency-tracking\
- $(use_with ncurses curses)\
- $(use_enable static)
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \
- install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- # create new STOWDIR
- dodir /var/lib/xstow
-
- # install env.d file to add STOWDIR to PATH and LDPATH
- doenvd ${FILESDIR}/99xstow || die "doenvd failed"
-}
-
-pkg_postinst() {
- elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
- elog "instead of /usr/local in order to avoid conflicts with the"
- elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264 "
- elog "(regarding app-admin/stow, equally applicable to XStow) for"
- elog "more details on this change."
- elog "For your convenience, PATH has been updated to include"
- elog "/var/lib/bin."
-}
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index a3cfb0cf0783..2072e0f38772 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,2 +1,4 @@
+DIST alien_8.64.tar.gz 77505 RMD160 3fd513aa4eb490180b2d6306d9cf84c01f95ce99 SHA1 408cdf88ba6549c2431cb2648fe106a778095138 SHA256 8f038af5a51f45b8f81efe6e61f6ecc71d348e1db7d0b3475213c761a8b8b1ba
+DIST alien_8.69.tar.gz 74545 RMD160 0079e409dbf4902ce7392eff64c49acaac6d18cd SHA1 279890525e41d59d7a9fecef102d56d449b9f5a8 SHA256 47dff702108d9c61aa2c425c1748007c77d13709ec98101cece92c973d398f06
+DIST alien_8.72.tar.gz 79690 RMD160 a7963b1d4d807e457ed3dd769805a13f8bac199b SHA1 c940a1ab2d51daec8cf04ba8dcba72ecff1b71b9 SHA256 b5095b20a702f07dfdd822b2344c8dcbc5c67af797a90ec30d76c51dcd67a285
DIST alien_8.74.tar.gz 75158 RMD160 732c6199a3170409a60de48fb05afba170fb9768 SHA1 6bbc48d45213b15db9a6887c401a8363d102e8fa SHA256 91ddb623f6696b6fcdf4dd1924de1c360b124669e65d12495f5460c16c413b50
-DIST alien_8.86.tar.gz 64267 RMD160 66a949a6c1765e0bdfd6a4dd734c4714d17b3dc8 SHA1 35c62f2aec9abe98be6978daf67d38281fa30595 SHA256 d81a046a122133d823cb5bd55a85c0cfa8f77916cee0ac95765c25b9cf5abd8d
diff --git a/app-arch/alien/alien-8.64.ebuild b/app-arch/alien/alien-8.64.ebuild
new file mode 100644
index 000000000000..c2b58704b9c1
--- /dev/null
+++ b/app-arch/alien/alien-8.64.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.64.ebuild,v 1.5 2007/05/21 15:47:19 armin76 Exp $
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien/"
+SRC_URI="mirror://debian/pool/main/a/alien/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0
+ >=app-arch/rpm-4.0.4-r4
+ >=app-arch/bzip2-1.0.2-r2
+ >=app-arch/dpkg-1.10.9"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+ perl Makefile.PL PREFIX="${D}/usr" || die "configuration failed"
+ emake || die "emake failed."
+}
+
+src_install() {
+ dodir /usr/lib/perl5/site_perl/`perl -e 'printf "%vd", $^V;'`/Alien/Package
+ make install \
+ PREFIX=${D}/usr \
+ INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+ INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+ VARPREFIX=${D}
+ dodoc INSTALL README TODO
+}
diff --git a/app-arch/alien/alien-8.69.ebuild b/app-arch/alien/alien-8.69.ebuild
new file mode 100644
index 000000000000..ca001b8d236b
--- /dev/null
+++ b/app-arch/alien/alien-8.69.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.69.ebuild,v 1.1 2008/02/03 11:20:03 drac Exp $
+
+EAPI=1
+
+inherit perl-app
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="+bzip2"
+
+RDEPEND="app-arch/rpm
+ app-arch/dpkg
+ bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+mydoc="TODO"
+
+src_unpack() {
+ perl-module_src_unpack
+ sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+ -i "${S}"/Makefile.PL || die "sed failed."
+}
diff --git a/app-arch/alien/alien-8.72.ebuild b/app-arch/alien/alien-8.72.ebuild
new file mode 100644
index 000000000000..eba18690618a
--- /dev/null
+++ b/app-arch/alien/alien-8.72.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.72.ebuild,v 1.1 2009/02/04 14:55:56 patrick Exp $
+
+EAPI=1
+
+inherit perl-app
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="+bzip2"
+
+RDEPEND="app-arch/rpm
+ app-arch/dpkg
+ bzip2? ( app-arch/bzip2 )
+ dev-util/debhelper"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+mydoc="TODO"
+
+src_unpack() {
+ perl-module_src_unpack
+ sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+ -i "${S}"/Makefile.PL || die "sed failed."
+}
diff --git a/app-arch/alien/alien-8.86.ebuild b/app-arch/alien/alien-8.86.ebuild
deleted file mode 100644
index b9fc5be6a8b9..000000000000
--- a/app-arch/alien/alien-8.86.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.86.ebuild,v 1.1 2012/01/29 20:47:44 lordvan Exp $
-
-EAPI=1
-
-inherit perl-app
-
-DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
-HOMEPAGE="http://kitenet.net/programs/alien"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
-IUSE="+bzip2"
-
-RDEPEND="app-arch/rpm
- app-arch/dpkg
- bzip2? ( app-arch/bzip2 )
- dev-util/debhelper
- >=app-arch/tar-1.14.91"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-mydoc="TODO"
-
-src_unpack() {
- perl-module_src_unpack
- sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
- -i "${S}"/Makefile.PL || die "sed failed."
-}
diff --git a/app-arch/deb2targz/deb2targz-1-r2.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
index 0c1678dc7725..959b86a3176e 100644
--- a/app-arch/deb2targz/deb2targz-1-r2.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/deb2targz-1-r2.ebuild,v 1.6 2012/02/05 17:51:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/deb2targz-1-r2.ebuild,v 1.1 2011/09/23 06:09:45 floppym Exp $
EAPI=4
inherit base
@@ -11,7 +11,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index ceac66160911..c62323adbf67 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1 +1,4 @@
+DIST dump-0.4b41.tar.gz 283204 RMD160 5b2d1594eb390f4d8df6218b42164b4449642a0a SHA1 dc6315d81bc4350bc556e061696a17b16817af16 SHA256 fc03fd74e4d63815e9eda48a069d69f950c44f298830d28eb03e141df6aad4f5
+DIST dump-0.4b42.tar.gz 288636 RMD160 eb22f3360ea0290c3e398c7dbbec4377786755b0 SHA1 73c4995938ab80c1b959f29afe56c21484a38582 SHA256 801def8fb22eddf89801c26a8fcb581d0389a5ad31f2f1d17e5a94fe9e65ac78
+DIST dump-0.4b43.tar.gz 290280 RMD160 f6b145722f0a36f1fc4ce81e940c708c78ddc7a5 SHA1 09dfb24ab3093e95d6d2d57633756d2e2576763b SHA256 424fea1f5f37d01c3fcae2ef23db93f7cce78b072461f74f75f3597df531fd4f
DIST dump-0.4b44.tar.gz 296691 RMD160 57d958e41c92da6959647c49faca648c6153850b SHA1 9bef0f86095a9214045b44f5c78efa3fbebcfc58 SHA256 78cb75632ac5e99dca38af3a2574303eee3c5a7af464011d279421d8b0e64f96
diff --git a/app-arch/dump/dump-0.4.41.ebuild b/app-arch/dump/dump-0.4.41.ebuild
new file mode 100644
index 000000000000..fa045fcd8518
--- /dev/null
+++ b/app-arch/dump/dump-0.4.41.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.41.ebuild,v 1.8 2007/12/29 21:53:13 rich0 Exp $
+
+MY_P=${P/4./4b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+IUSE="readline static ermt"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27
+ >=app-arch/bzip2-1.0.2
+ >=sys-libs/zlib-1.1.4
+ ermt? ( dev-libs/openssl )
+ readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+ virtual/os-headers"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ sed -i "s:-ltermcap:-lncurses:g" configure || die
+}
+
+src_compile() {
+ econf \
+ --with-dumpdatespath=/etc/dumpdates \
+ --with-{bin,man}owner=root \
+ --with-{bin,man}grp=root \
+ --enable-largefile \
+ $(use_enable ermt) \
+ $(use_enable static) \
+ $(use_enable readline) \
+ || die
+ emake || die
+}
+
+src_install() {
+ # built on old autotools, no DESTDIR support
+ einstall MANDIR="${D}"/usr/share/man/man8 || die
+ mv "${D}"/usr/sbin/{,dump-}rmt
+ mv "${D}"/usr/share/man/man8/{,dump-}rmt.8
+ use ermt && newsbin rmt/ermt dump-ermt
+
+ dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
+ cd examples
+ local d=
+ for d in * ; do
+ docinto ${d}
+ dodoc ${d}/*
+ done
+}
+
+pkg_postinst() {
+ ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+ ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+}
diff --git a/app-arch/dump/dump-0.4.42.ebuild b/app-arch/dump/dump-0.4.42.ebuild
new file mode 100644
index 000000000000..10ad383a77a2
--- /dev/null
+++ b/app-arch/dump/dump-0.4.42.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.42.ebuild,v 1.1 2009/09/30 03:14:08 vapier Exp $
+
+MY_P=${P/4./4b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ermt readline selinux static"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27
+ >=app-arch/bzip2-1.0.2
+ >=sys-libs/zlib-1.1.4
+ ermt? ( dev-libs/openssl )
+ readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+ virtual/os-headers"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ sed -i \
+ -e 's:-ltermcap:-lncurses:g' \
+ -e '/BLKID=/s:=.*:=`pkg-config --libs blkid`:' \
+ configure || die
+}
+
+src_compile() {
+ econf \
+ --with-dumpdatespath=/etc/dumpdates \
+ --with-{bin,man}owner=root \
+ --with-{bin,man}grp=root \
+ --enable-largefile \
+ $(use_enable selinux transselinux) \
+ $(use_enable ermt) \
+ $(use_enable static) \
+ $(use_enable readline) \
+ || die
+ emake || die
+}
+
+src_install() {
+ # built on old autotools, no DESTDIR support
+ einstall MANDIR="${D}"/usr/share/man/man8 || die
+ mv "${D}"/usr/sbin/{,dump-}rmt
+ mv "${D}"/usr/share/man/man8/{,dump-}rmt.8
+ use ermt && newsbin rmt/ermt dump-ermt
+
+ dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
+ cd examples
+ local d=
+ for d in * ; do
+ docinto ${d}
+ dodoc ${d}/*
+ done
+}
+
+pkg_postinst() {
+ ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+ ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+}
diff --git a/app-arch/dump/dump-0.4.43.ebuild b/app-arch/dump/dump-0.4.43.ebuild
new file mode 100644
index 000000000000..9bc31df3cef1
--- /dev/null
+++ b/app-arch/dump/dump-0.4.43.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.43.ebuild,v 1.1 2011/05/23 08:01:26 pva Exp $
+
+EAPI="4"
+inherit eutils autotools
+
+MY_P=${P/4./4b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ermt readline selinux static"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27
+ >=app-arch/bzip2-1.0.2
+ >=sys-libs/zlib-1.1.4
+ ermt? ( dev-libs/openssl )
+ readline? ( sys-libs/readline
+ sys-libs/ncurses
+ static? ( sys-libs/ncurses[static-libs] ) )"
+DEPEND="${RDEPEND}
+ virtual/os-headers"
+
+src_prepare() {
+ # https://sourceforge.net/tracker/?func=detail&aid=3306159&group_id=1306&atid=301306
+ epatch "${FILESDIR}/dump-0.4b43-pkg_config4blkid.patch"
+ epatch "${FILESDIR}/dump-0.4b43-pkg_config4ext2fs.patch"
+ epatch "${FILESDIR}/dump-0.4b43-pkg_config4crypto.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-dumpdatespath=/etc/dumpdates \
+ --with-{bin,man}owner=root \
+ --with-{bin,man}grp=root \
+ --enable-largefile \
+ $(use_enable selinux transselinux) \
+ $(use_enable ermt) \
+ $(use_enable static) \
+ $(use_enable readline) \
+ $(use_enable debug)
+}
+
+src_install() {
+ # built on old autotools, no DESTDIR support
+ einstall MANDIR="${D}"/usr/share/man/man8
+ mv "${ED}"/usr/sbin/{,dump-}rmt || die
+ mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
+ use ermt && newsbin rmt/ermt dump-ermt
+
+ dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
+ dodoc -r examples/*
+}
+
+pkg_postinst() {
+ ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+ ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+}
diff --git a/app-arch/dump/dump-0.4.44-r1.ebuild b/app-arch/dump/dump-0.4.44-r1.ebuild
index 55a3cd42c933..475644ee2dfc 100644
--- a/app-arch/dump/dump-0.4.44-r1.ebuild
+++ b/app-arch/dump/dump-0.4.44-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.44-r1.ebuild,v 1.6 2012/01/31 19:45:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.44-r1.ebuild,v 1.1 2011/06/20 08:11:49 pva Exp $
EAPI="4"
inherit eutils autotools
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug ermt readline selinux static"
RDEPEND=">=sys-fs/e2fsprogs-1.27
diff --git a/app-arch/dump/dump-0.4.44.ebuild b/app-arch/dump/dump-0.4.44.ebuild
new file mode 100644
index 000000000000..72741e15e39c
--- /dev/null
+++ b/app-arch/dump/dump-0.4.44.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.44.ebuild,v 1.2 2011/06/16 09:54:35 pva Exp $
+
+EAPI="4"
+inherit eutils autotools
+
+MY_P=${P/4./4b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Dump/restore ext2fs backup utilities"
+HOMEPAGE="http://dump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ermt readline selinux static"
+
+RDEPEND=">=sys-fs/e2fsprogs-1.27
+ >=app-arch/bzip2-1.0.2
+ >=sys-libs/zlib-1.1.4
+ ermt? ( dev-libs/openssl )
+ readline? ( sys-libs/readline
+ sys-libs/ncurses
+ static? ( sys-libs/ncurses[static-libs] ) )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ virtual/os-headers"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-underlinking.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-dumpdatespath=/etc/dumpdates \
+ --with-{bin,man}owner=root \
+ --with-{bin,man}grp=root \
+ --enable-largefile \
+ $(use_enable selinux transselinux) \
+ $(use_enable ermt) \
+ $(use_enable static) \
+ $(use_enable readline) \
+ $(use_enable debug)
+}
+
+src_install() {
+ # built on old autotools, no DESTDIR support
+ einstall MANDIR="${D}"/usr/share/man/man8
+ mv "${ED}"/usr/sbin/{,dump-}rmt || die
+ mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
+ use ermt && newsbin rmt/ermt dump-ermt
+
+ dodoc CHANGES KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
+ dodoc -r examples/*
+}
+
+pkg_postinst() {
+ ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
+ ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
+}
diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch
new file mode 100644
index 000000000000..ad109189ea31
--- /dev/null
+++ b/app-arch/dump/files/dump-0.4b43-pkg_config4blkid.patch
@@ -0,0 +1,27 @@
+=== modified file 'configure.in'
+--- configure.in 2011-05-20 04:40:59 +0000
++++ configure.in 2011-05-20 05:12:18 +0000
+@@ -465,11 +465,17 @@
+ dnl Check for blkid headers libraries
+ dnl
+ AC_CHECK_HEADER(blkid/blkid.h, [blkid_h=yes], [blkid_h=no], [-])
+-AC_CHECK_LIB(blkid, blkid_get_devname, [blkid_lib=yes], [blkid_lib=no], [-luuid])
+-if test "$blkid_h" = yes -a "$blkid_lib" = yes; then
+- AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
+- BLKID="-lblkid -luuid"
+-fi
++PKG_CHECK_EXISTS([blkid],
++ [
++ if test -n $STATIC ; then
++ BLKID=`$PKG_CONFIG --libs --static blkid`
++ else
++ BLKID=`$PKG_CONFIG --libs blkid`
++ fi
++ if test "$blkid_h" = yes ; then
++ AC_DEFINE([HAVE_BLKID],1,[Define this if you have the blkid library.])
++ fi
++ ],[BLKID=""])
+ AC_SUBST(BLKID)
+
+ dnl
+
diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch
new file mode 100644
index 000000000000..d126cf150039
--- /dev/null
+++ b/app-arch/dump/files/dump-0.4b43-pkg_config4crypto.patch
@@ -0,0 +1,50 @@
+=== modified file 'configure.in'
+--- configure.in 2011-05-20 09:47:25 +0000
++++ configure.in 2011-05-20 09:51:37 +0000
+@@ -113,7 +113,6 @@
+ if test "$enableval" = "no"
+ then
+ ERMT=""
+- CRYPTO=""
+ echo "Not compiling ermt"
+ else
+ if test "$RMTDIR" = ""
+@@ -121,16 +120,13 @@
+ AC_MSG_ERROR(ermt requires --enable-rmt)
+ fi
+ ERMT="ermt"
+- CRYPTO="-lcrypto"
+ echo "Compiling ermt"
+ fi
+ ,
+ ERMT=""
+-CRYPTO=""
+ echo "Not compiling ermt by default"
+ )
+ AC_SUBST(ERMT)
+-AC_SUBST(CRYPTO)
+
+ dnl
+ dnl Handle --enable-kerberos
+@@ -600,10 +596,19 @@
+ if test "$ERMT" != ""; then
+ AC_CHECK_HEADER(openssl/evp.h, [evp_h=yes], [evp_h=no])
+ AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_set_padding, [crypto_lib=yes], [crypto_lib=no])
+- if test "$evp_h" = no -o "$crypto_lib" = no; then
++ PKG_CHECK_EXISTS([libcrypto],
++ [
++ if test -n $STATIC ; then
++ CRYPTO=`$PKG_CONFIG --libs --static libcrypto`
++ else
++ CRYPTO=`$PKG_CONFIG --libs libcrypto`
++ fi
++ ],[CRYPTO=""])
++ if test "$evp_h" = no -o "x$CRYPTO" = "x"; then
+ AC_MSG_ERROR(You need to install the OpenSSL library (version 0.9.7a or later), or configure without --enable-ermt)
+ fi
+ fi
++AC_SUBST(CRYPTO)
+
+ dnl
+ dnl Check for types
+
diff --git a/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch b/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch
new file mode 100644
index 000000000000..11ccab9ca20d
--- /dev/null
+++ b/app-arch/dump/files/dump-0.4b43-pkg_config4ext2fs.patch
@@ -0,0 +1,40 @@
+=== modified file 'MCONFIG.in'
+--- MCONFIG.in 2011-05-20 04:40:59 +0000
++++ MCONFIG.in 2011-05-20 06:57:11 +0000
+@@ -32,7 +32,7 @@
+ GINC= -I$(top_builddir) -I$(top_srcdir)/compat/include
+ # indicate where the ext2fs library can be found (this is not needed if you
+ # have run `make install-libs' in the e2fsprogs source directory).
+-#GINC+= -I/usr/src/e2fsprogs-0.5c/lib
++GINC+= @EXT2FS_CFLAGS@
+
+ #
+ # Global libraries
+@@ -40,7 +40,7 @@
+ # indicate where the ext2fs library can be found (this is not needed if you
+ # have run `make install-libs' in the e2fsprogs source directory).
+ #GLIBDIR= -L/usr/src/e2fsprogs-0.5c/lib
+-GLIBS= $(GLIBDIR) -L../compat/lib -lcompat -lext2fs -lcom_err
++GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@
+
+ #
+ # Definitions (don't change them unless you know what you are doing)
+
+=== modified file 'configure.in'
+--- configure.in 2011-05-20 05:16:23 +0000
++++ configure.in 2011-05-20 07:01:17 +0000
+@@ -411,8 +411,11 @@
+ dnl Check for Ext2fs headers and libraries
+ dnl
+ AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
+-AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err])
+-if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then
++PKG_CHECK_MODULES(EXT2FS, [ext2fs])
++if test -n "$STATIC" ; then
++ EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs`
++fi
++if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
+ AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
+ fi
+
+
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 6fc1b211d46b..4dc60e84e759 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,4 @@
+DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd7cca SHA1 3810ded09b2d248eab9754d008f0cf144f27848d SHA256 a7e066ef857d3db0211e2d916ca14aafc48a4776c4fa108fd67092ce862a7ba8
+DIST libarchive-2.8.3.tar.gz 1438099 RMD160 7c77a87cdfc096417f67182bfc74141eab61aea4 SHA1 e0634a326cce2b46c8dc637de84d7556257e59e0 SHA256 16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a
+DIST libarchive-2.8.4.tar.gz 1502828 RMD160 4df65456c9026cdcf05b285db33518f4ff734c6e SHA1 b9cc3bbd20bd71f996be9ec738f19fda8653f7af SHA256 86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688
DIST libarchive-2.8.5.tar.gz 1410485 RMD160 b4b75a5cf5b15312dff8addde44d91161ad1a7a4 SHA1 e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 SHA256 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
-DIST libarchive-3.0.3.tar.gz 3509104 RMD160 8bfde7be3aa15221c327641b0463f0b40a797e19 SHA1 b774e2675e5c1abafbd4d667402e8c3e72313944 SHA256 c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7
diff --git a/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch b/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
new file mode 100644
index 000000000000..4929685a2eb7
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
@@ -0,0 +1,47 @@
+Index: libarchive/test/test_write_compress_lzma.c
+===================================================================
+--- libarchive/test/test_write_compress_lzma.c (revision 2811)
++++ libarchive/test/test_write_compress_lzma.c (revision 2812)
+@@ -185,10 +185,15 @@
+ archive_write_close(a);
+ assert(0 == archive_write_finish(a));
+
+- /* Level 0 really does result in larger data. */
++ /* It would be nice to assert that compression-level=0 produced
++ * consistently larger/smaller results than the default compression,
++ * but the results here vary a lot depending on the version of liblzma
++ * being used. */
++ /*
+ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes",
+ (int)used2, (int)used1);
+ assert(used2 > used1);
++ */
+
+ assert((a = archive_read_new()) != NULL);
+ assertA(0 == archive_read_support_format_all(a));
+Index: libarchive/test/test_write_compress_xz.c
+===================================================================
+--- libarchive/test/test_write_compress_xz.c (revision 2811)
++++ libarchive/test/test_write_compress_xz.c (revision 2812)
+@@ -193,10 +193,14 @@
+ archive_write_close(a);
+ assert(0 == archive_write_finish(a));
+
+- /* Level 0 really does result in larger data. */
++ /* I would like to assert that compression-level=0 results in
++ * larger data than the default compression, but that's not true
++ * for all versions of liblzma. */
++ /*
+ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes",
+ (int)used2, (int)used1);
+ assert(used2 > used1);
++ */
+
+ assert((a = archive_read_new()) != NULL);
+ assertA(0 == archive_read_support_format_all(a));
+
+Egenskapsändringar för: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /trunk:r2811
+
diff --git a/app-arch/libarchive/libarchive-2.7.1-r1.ebuild b/app-arch/libarchive/libarchive-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..6d8f7aaff2e2
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.7.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.1-r1.ebuild,v 1.11 2010/12/31 09:18:02 ferringb Exp $
+
+EAPI="2"
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+ http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+ dev-libs/openssl
+ acl? ( virtual/acl )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ !static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+ ${COMPRESS_LIBS_DEPEND}
+ kernel_linux? ( sys-fs/e2fsprogs
+ virtual/os-headers )"
+
+src_prepare() {
+ epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+ elibtoolize
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf
+
+ if ! use static ; then
+ myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+ fi
+
+ # force static libs for static binaries
+ if use static && ! use static-libs; then
+ myconf="${myconf} --enable-static"
+ fi
+
+ # Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+ # added to the final release, but since it's done in the
+ # Makefile.am we can just work it around this way.
+ append-flags -Wno-error
+
+ # We disable lzmadec because we support the newer liblzma from xz-utils
+ # and not liblzmadec with this version.
+ econf --bindir=/bin \
+ --enable-bsdtar --enable-bsdcpio \
+ $(use_enable acl) $(use_enable xattr) \
+ $(use_with zlib) \
+ $(use_with bzip2 bz2lib) $(use_with lzma) \
+ $(use_enable static-libs static) \
+ --without-lzmadec \
+ ${myconf} \
+ --disable-dependency-tracking
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ # remove useless .a and .la files (only for non static compilation)
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ # Create tar symlink for FreeBSD
+ if [[ ${CHOST} == *-freebsd* ]]; then
+ dosym bsdtar /bin/tar
+ dosym bsdtar.1 /usr/share/man/man1/tar.1
+ # We may wish to switch to symlink bsdcpio to cpio too one day
+ fi
+
+ dodoc NEWS README
+ dodir /$(get_libdir)
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ gen_usr_ldscript libarchive.so
+}
diff --git a/app-arch/libarchive/libarchive-2.8.3-r1.ebuild b/app-arch/libarchive/libarchive-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..c0b6384bca65
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3-r1.ebuild,v 1.1 2011/02/14 13:29:07 ferringb Exp $
+
+EAPI="2"
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+ http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+ dev-libs/openssl
+ !expat? ( dev-libs/libxml2 )
+ expat? ( dev-libs/expat )
+ acl? ( virtual/acl )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ !static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+ ${COMPRESS_LIBS_DEPEND}
+ kernel_linux? ( sys-fs/e2fsprogs
+ virtual/os-headers )"
+
+src_prepare() {
+ epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+ elibtoolize
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf
+
+ if ! use static ; then
+ myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+ fi
+
+ # force static libs for static binaries
+ if use static && ! use static-libs; then
+ myconf="${myconf} --enable-static"
+ fi
+
+ # Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+ # added to the final release, but since it's done in the
+ # Makefile.am we can just work it around this way.
+ append-flags -Wno-error
+
+ # We disable lzmadec because we support the newer liblzma from xz-utils
+ # and not liblzmadec with this version.
+ econf --bindir=/bin \
+ --enable-bsdtar --enable-bsdcpio \
+ $(use_enable acl) $(use_enable xattr) \
+ $(use_with zlib) \
+ $(use_with bzip2 bz2lib) $(use_with lzma) \
+ $(use_enable static-libs static) \
+ $(use_with expat expat) \
+ $(use_with !expat xml2)
+ --without-lzmadec \
+ ${myconf} \
+ --disable-dependency-tracking
+}
+
+src_test() {
+ # Replace the default src_test so that it builds tests in parallel
+ emake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ # remove useless .a and .la files (only for non static compilation)
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ # Create tar symlink for FreeBSD
+ if [[ ${CHOST} == *-freebsd* ]]; then
+ dosym bsdtar /bin/tar
+ dosym bsdtar.1 /usr/share/man/man1/tar.1
+ # We may wish to switch to symlink bsdcpio to cpio too one day
+ fi
+
+ dodoc NEWS README
+ dodir /$(get_libdir)
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ gen_usr_ldscript libarchive.so
+}
diff --git a/app-arch/libarchive/libarchive-2.8.3.ebuild b/app-arch/libarchive/libarchive-2.8.3.ebuild
new file mode 100644
index 000000000000..24e19877133d
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.5 2011/02/14 00:41:04 ferringb Exp $
+
+EAPI="2"
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+ http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+ dev-libs/openssl
+ || ( dev-libs/libxml2 dev-libs/expat )
+ acl? ( virtual/acl )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ !static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+ ${COMPRESS_LIBS_DEPEND}
+ kernel_linux? ( sys-fs/e2fsprogs
+ virtual/os-headers )"
+
+src_prepare() {
+ epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+ elibtoolize
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf
+
+ if ! use static ; then
+ myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+ fi
+
+ # force static libs for static binaries
+ if use static && ! use static-libs; then
+ myconf="${myconf} --enable-static"
+ fi
+
+ # Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+ # added to the final release, but since it's done in the
+ # Makefile.am we can just work it around this way.
+ append-flags -Wno-error
+
+ # We disable lzmadec because we support the newer liblzma from xz-utils
+ # and not liblzmadec with this version.
+ econf --bindir=/bin \
+ --enable-bsdtar --enable-bsdcpio \
+ $(use_enable acl) $(use_enable xattr) \
+ $(use_with zlib) \
+ $(use_with bzip2 bz2lib) $(use_with lzma) \
+ $(use_enable static-libs static) \
+ --without-lzmadec \
+ ${myconf} \
+ --disable-dependency-tracking
+}
+
+src_test() {
+ # Replace the default src_test so that it builds tests in parallel
+ emake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ # remove useless .a and .la files (only for non static compilation)
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ # Create tar symlink for FreeBSD
+ if [[ ${CHOST} == *-freebsd* ]]; then
+ dosym bsdtar /bin/tar
+ dosym bsdtar.1 /usr/share/man/man1/tar.1
+ # We may wish to switch to symlink bsdcpio to cpio too one day
+ fi
+
+ dodoc NEWS README
+ dodir /$(get_libdir)
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ gen_usr_ldscript libarchive.so
+}
diff --git a/app-arch/libarchive/libarchive-2.8.4-r1.ebuild b/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..b6491f0165b1
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.4-r1.ebuild,v 1.9 2011/10/29 18:41:18 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+ http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+ dev-libs/openssl
+ !expat? ( dev-libs/libxml2 )
+ expat? ( dev-libs/expat )
+ acl? ( virtual/acl )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ !static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+ ${COMPRESS_LIBS_DEPEND}
+ kernel_linux? ( sys-fs/e2fsprogs
+ virtual/os-headers )"
+
+src_prepare() {
+ epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+ elibtoolize
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf
+
+ if ! use static ; then
+ myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+ fi
+
+ # force static libs for static binaries
+ if use static && ! use static-libs; then
+ myconf="${myconf} --enable-static"
+ fi
+
+ # Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+ # added to the final release, but since it's done in the
+ # Makefile.am we can just work it around this way.
+ append-flags -Wno-error
+
+ # We disable lzmadec because we support the newer liblzma from xz-utils
+ # and not liblzmadec with this version.
+ econf --bindir=/bin \
+ --enable-bsdtar --enable-bsdcpio \
+ $(use_enable acl) $(use_enable xattr) \
+ $(use_with zlib) \
+ $(use_with bzip2 bz2lib) $(use_with lzma) \
+ $(use_enable static-libs static) \
+ $(use_with expat expat) \
+ $(use_with !expat xml2) \
+ --without-lzmadec \
+ ${myconf} \
+ --disable-dependency-tracking
+}
+
+src_test() {
+ # Replace the default src_test so that it builds tests in parallel
+ emake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ # remove useless .a and .la files (only for non static compilation)
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ # Create tar symlink for FreeBSD
+ if [[ ${CHOST} == *-freebsd* ]]; then
+ dosym bsdtar /bin/tar
+ dosym bsdtar.1 /usr/share/man/man1/tar.1
+ # We may wish to switch to symlink bsdcpio to cpio too one day
+ fi
+
+ dodoc NEWS README
+ dodir /$(get_libdir)
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ gen_usr_ldscript libarchive.so
+}
diff --git a/app-arch/libarchive/libarchive-2.8.4.ebuild b/app-arch/libarchive/libarchive-2.8.4.ebuild
new file mode 100644
index 000000000000..30881021f0eb
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.8.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.4.ebuild,v 1.6 2011/03/21 22:14:57 ranger Exp $
+
+EAPI="2"
+
+inherit eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://code.google.com/p/libarchive/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
+ http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+ dev-libs/openssl
+ || ( dev-libs/libxml2 dev-libs/expat )
+ acl? ( virtual/acl )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ !static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+ ${COMPRESS_LIBS_DEPEND}
+ kernel_linux? ( sys-fs/e2fsprogs
+ virtual/os-headers )"
+
+src_prepare() {
+ epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
+ elibtoolize
+ epunt_cxx
+}
+
+src_configure() {
+ local myconf
+
+ if ! use static ; then
+ myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+ fi
+
+ # force static libs for static binaries
+ if use static && ! use static-libs; then
+ myconf="${myconf} --enable-static"
+ fi
+
+ # Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
+ # added to the final release, but since it's done in the
+ # Makefile.am we can just work it around this way.
+ append-flags -Wno-error
+
+ # We disable lzmadec because we support the newer liblzma from xz-utils
+ # and not liblzmadec with this version.
+ econf --bindir=/bin \
+ --enable-bsdtar --enable-bsdcpio \
+ $(use_enable acl) $(use_enable xattr) \
+ $(use_with zlib) \
+ $(use_with bzip2 bz2lib) $(use_with lzma) \
+ $(use_enable static-libs static) \
+ --without-lzmadec \
+ ${myconf} \
+ --disable-dependency-tracking
+}
+
+src_test() {
+ # Replace the default src_test so that it builds tests in parallel
+ emake check || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ # remove useless .a and .la files (only for non static compilation)
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ # Create tar symlink for FreeBSD
+ if [[ ${CHOST} == *-freebsd* ]]; then
+ dosym bsdtar /bin/tar
+ dosym bsdtar.1 /usr/share/man/man1/tar.1
+ # We may wish to switch to symlink bsdcpio to cpio too one day
+ fi
+
+ dodoc NEWS README
+ dodir /$(get_libdir)
+ mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
+ gen_usr_ldscript libarchive.so
+}
diff --git a/app-arch/libarchive/libarchive-2.8.5.ebuild b/app-arch/libarchive/libarchive-2.8.5.ebuild
index 6f9d98e68303..e2537c7c8e97 100644
--- a/app-arch/libarchive/libarchive-2.8.5.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.10 2012/01/22 15:03:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.5.ebuild,v 1.1 2011/09/06 03:17:49 ferringb Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
@@ -57,7 +57,7 @@ src_configure() {
$(use_with zlib) \
$(use_with bzip2 bz2lib) $(use_with lzma) \
$(use_enable static-libs static) \
- $(use_with expat) \
+ $(use_with expat expat) \
$(use_with !expat xml2) \
--without-lzmadec \
${myconf} \
diff --git a/app-arch/libarchive/libarchive-3.0.3.ebuild b/app-arch/libarchive/libarchive-3.0.3.ebuild
deleted file mode 100644
index ff29fd51a687..000000000000
--- a/app-arch/libarchive/libarchive-3.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.3.ebuild,v 1.2 2012/01/22 15:03:12 armin76 Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib"
-
-RDEPEND="dev-libs/openssl:0
- acl? ( virtual/acl )
- bzip2? ( app-arch/bzip2 )
- expat? ( dev-libs/expat )
- !expat? ( dev-libs/libxml2 )
- iconv? ( virtual/libiconv )
- kernel_linux? (
- xattr? ( sys-apps/attr )
- )
- lzma? ( app-arch/xz-utils )
- nettle? ( dev-libs/nettle )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- kernel_linux? (
- virtual/os-headers
- e2fsprogs? ( sys-fs/e2fsprogs )
- )"
-
-DOCS="NEWS README"
-
-src_configure() {
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
- # We disable lzmadec because we support the newer liblzma from xz-utils
- # and not liblzmadec with this version.
- econf \
- $(use_enable static-libs static) \
- --enable-bsdtar=shared \
- --enable-bsdcpio=shared \
- $(use_enable xattr) \
- $(use_enable acl) \
- $(use_with zlib) \
- $(use_with bzip2 bz2lib) \
- --without-lzmadec \
- $(use_with iconv) \
- $(use_with lzma) \
- $(use_with nettle) \
- $(use_with !expat xml2) \
- $(use_with expat)
-}
-
-src_test() {
- # Replace the default src_test so that it builds tests in parallel
- emake check
-}
-
-src_install() {
- default
-
- # Libs.private: should be used from libarchive.pc instead
- rm -f "${ED}"usr/lib*/lib*.la
-
- # Create tar symlink for FreeBSD
- if [[ ${CHOST} == *-freebsd* ]]; then
- dosym bsdtar /usr/bin/tar
- echo '.so bsdtar.1' > "${T}"/tar.1
- doman "${T}"/tar.1
- # We may wish to switch to symlink bsdcpio to cpio too one day
- fi
-}
-
-pkg_preinst() {
- preserve_old_lib /{,usr/}$(get_libdir)/${PN}$(get_libname 2)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /{,usr/}$(get_libdir)/${PN}$(get_libname 2)
-}
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index d377c9fe00f2..5375af28df76 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -13,7 +13,7 @@
Build bsdtar and bsdcpio as static archives, removing
dependencies over the enabled compression libraries (lzma,
- libbz2, zlib).
+ lzmadec, libbz2, zlib).
Allow accessing gzip-compressed archives through
@@ -28,11 +28,5 @@
libarchive's native support: bsdtar will keep using bunzip2 as a
filter if that's not built-in.
-
- Use dev-libs/nettle as crypto backend
-
-
- Use file flags from sys-fs/e2fsprogs headers instead of virtual/os-headers headers
-
diff --git a/app-arch/lzip/lzip-1.12.ebuild b/app-arch/lzip/lzip-1.12.ebuild
index cebdb484ce78..f4f526a9d5a7 100644
--- a/app-arch/lzip/lzip-1.12.ebuild
+++ b/app-arch/lzip/lzip-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.12.ebuild,v 1.5 2012/02/02 15:14:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.12.ebuild,v 1.1 2011/06/15 02:26:23 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_prepare() {
diff --git a/app-arch/makeself/makeself-2.1.5-r1.ebuild b/app-arch/makeself/makeself-2.1.5-r1.ebuild
index 8400e526318c..02ec1ff36516 100644
--- a/app-arch/makeself/makeself-2.1.5-r1.ebuild
+++ b/app-arch/makeself/makeself-2.1.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.1.5-r1.ebuild,v 1.2 2012/02/05 05:50:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.1.5-r1.ebuild,v 1.1 2011/10/23 13:10:10 patrick Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="shell script that generates a self-extractible tar.gz"
HOMEPAGE="http://www.megastep.org/makeself/"
@@ -15,6 +15,10 @@ IUSE=""
S=${WORKDIR}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack || die
dosym makeself.sh /usr/bin/makeself
diff --git a/app-arch/makeself/makeself-2.1.5.ebuild b/app-arch/makeself/makeself-2.1.5.ebuild
index 3e0957606f7a..68c019584f03 100644
--- a/app-arch/makeself/makeself-2.1.5.ebuild
+++ b/app-arch/makeself/makeself-2.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.1.5.ebuild,v 1.10 2012/02/05 05:50:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/makeself/makeself-2.1.5.ebuild,v 1.9 2010/01/01 19:35:26 fauli Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="shell script that generates a self-extractible tar.gz"
HOMEPAGE="http://www.megastep.org/makeself/"
@@ -15,6 +15,10 @@ IUSE=""
S=${WORKDIR}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack || die
doman makeself.1
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index a59ec88272b6..069ba496bd97 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/mscompress/mscompress-0.3-r1.ebuild,v 1.3 2011/12/26 12:19:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mscompress/mscompress-0.3-r1.ebuild,v 1.2 2011/12/16 13:11:32 ago Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_prepare() {
diff --git a/app-arch/par2cmdline/files/par2cmdline-0.4-offset.patch b/app-arch/par2cmdline/files/par2cmdline-0.4-offset.patch
index 20a657c683b7..653928066807 100644
--- a/app-arch/par2cmdline/files/par2cmdline-0.4-offset.patch
+++ b/app-arch/par2cmdline/files/par2cmdline-0.4-offset.patch
@@ -1,8 +1,5 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=299658
-http://bugs.gentoo.org/144410
-
---- par2creatorsourcefile.cpp
-+++ par2creatorsourcefile.cpp
+--- par2cmdline-0.4.orig/par2creatorsourcefile.cpp 2004-04-15 14:45:23.000000000 +0100
++++ par2cmdline-0.4/par2creatorsourcefile.cpp 2005-09-29 02:27:43.000000000 +0100
@@ -213,11 +213,12 @@
}
}
diff --git a/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild b/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild
index 85a6532a209c..e113556aacd4 100644
--- a/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild,v 1.8 2012/01/16 16:01:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.4-r2.ebuild,v 1.7 2010/01/15 01:30:02 abcd Exp $
-EAPI=4
inherit eutils
DESCRIPTION="A PAR-2.0 file verification and repair tool"
@@ -14,20 +13,23 @@ SLOT="0"
KEYWORDS="amd64 ~hppa ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
-DOCS="AUTHORS ChangeLog README"
+DEPEND=""
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-wildcard-fix.patch \
- "${FILESDIR}"/${P}-offset.patch \
- "${FILESDIR}"/${P}-letype.patch \
- "${FILESDIR}"/${P}-gcc4.patch
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-wildcard-fix.patch
+ epatch "${FILESDIR}"/${P}-offset.patch
+ epatch "${FILESDIR}"/${P}-letype.patch
+ epatch "${FILESDIR}"/${P}-gcc4.patch
}
src_install() {
- default
+ make install DESTDIR="${D}" || die "make install failed"
# Replace the hardlinks with symlinks
dosym par2 /usr/bin/par2create
dosym par2 /usr/bin/par2repair
dosym par2 /usr/bin/par2verify
+ dodoc AUTHORS ChangeLog README
}
diff --git a/app-arch/pbzip2/pbzip2-1.1.5.ebuild b/app-arch/pbzip2/pbzip2-1.1.5.ebuild
index 52c186dd9828..d55959969e96 100644
--- a/app-arch/pbzip2/pbzip2-1.1.5.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.8 2011/12/30 16:00:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.7 2011/10/23 12:50:49 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
LICENSE="PBZIP2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="static symlink"
DEPEND="app-arch/bzip2"
diff --git a/app-arch/pet2tgz/Manifest b/app-arch/pet2tgz/Manifest
deleted file mode 100644
index b16a85abaa73..000000000000
--- a/app-arch/pet2tgz/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pet2tgz-0.3.tar.gz 90758 RMD160 46cba80f3867cef247dde9f8369dfc99a7cbcbab SHA1 a35448cb2878c5f2ad8a17e08281f27cb2ca67ef SHA256 12a52a3bc40cb62fee5626d1a72aeea64abcd848b2e107e9cb546a404dd6788c
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
deleted file mode 100644
index c2d865517c00..000000000000
--- a/app-arch/pet2tgz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- ssuominen@gentoo.org
- Samuli Suominen
-
-
diff --git a/app-arch/pet2tgz/pet2tgz-0.3.ebuild b/app-arch/pet2tgz/pet2tgz-0.3.ebuild
deleted file mode 100644
index a40f6ee6f22c..000000000000
--- a/app-arch/pet2tgz/pet2tgz-0.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pet2tgz/pet2tgz-0.3.ebuild,v 1.1 2012/01/03 10:40:34 ssuominen Exp $
-
-EAPI=4
-
-DESCRIPTION="Puppy Linux .pet to .tar.gz converter"
-HOMEPAGE="http://sourceforge.net/projects/pet2tgz/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="AUTHORS"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 2915c7ec7bc0..687ca6a5c93d 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,2 +1 @@
DIST pigz-2.1.6.tar.gz 52250 RMD160 715a90eefbb9d2f6dbd94ec7ee196a0ea7b32e7f SHA1 df05bdcc7b08246a3c1e6a2ab2edc7d0a45c0369 SHA256 2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640
-DIST pigz-2.1.7.tar.gz 44800 RMD160 a3b29bc6b80de489b61fbb903d072a3378c0a732 SHA1 d8a5ab8887741353d8174b89280ed1b8b19515aa SHA256 a7ca0d68295e485115fef9c73917b6bcaab3aa6ca1cb2801f25c5b858fdac0e4
diff --git a/app-arch/pigz/pigz-2.1.7.ebuild b/app-arch/pigz/pigz-2.1.7.ebuild
deleted file mode 100644
index 939202bb3f05..000000000000
--- a/app-arch/pigz/pigz-2.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.7.ebuild,v 1.1 2011/12/18 20:56:54 spatz Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="http://www.zlib.net/pigz/"
-SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
-IUSE="symlink test"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
- test? ( app-arch/ncompress )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- sed -i -e '1,3d' -e '5s/$(CC)/$(CC) $(LDFLAGS)/' "${S}/Makefile" || die
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
- dosym /usr/bin/${PN} /usr/bin/un${PN}
- dodoc README
- doman ${PN}.1
-
- if use symlink; then
- dosym /usr/bin/${PN} /usr/bin/gzip
- dosym /usr/bin/un${PN} /usr/bin/gunzip
- fi
-}
diff --git a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
index df62e064041b..8c8b381c2b09 100644
--- a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
+++ b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild,v 1.3 2011/12/18 19:55:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild,v 1.1 2010/08/27 05:43:29 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pure-sfv/${PN}_${PV}_src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE=""
RESTRICT="test"
diff --git a/app-arch/q7z/metadata.xml b/app-arch/q7z/metadata.xml
index ca934b44cc32..3cbebd85b7e2 100644
--- a/app-arch/q7z/metadata.xml
+++ b/app-arch/q7z/metadata.xml
@@ -1,7 +1,5 @@
-
- maintainer-needed@gentoo.org
-
+ qt
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index b2206602be97..62af06098882 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,6 +1,11 @@
+DIST rarlinux-3.8.0.tar.gz 791915 RMD160 d2d706104d8ae90ed8ebf38f007d4017652f605b SHA1 352a1601d0b2dc114a1deaca482ccab41cf09609 SHA256 d81a172ebe982254ef913f251c23daf94af15508cb38fb5430c557f6f3718b0f
+DIST rarlinux-3.9.3.tar.gz 833828 RMD160 e6b80e045aa101da82a5776a4bb0be3e33e8b0f8 SHA1 7dee8a086e663ff3a79d99a22f9ce910e49de251 SHA256 55122286a2a72ccc2b866c5a0e415c05638dfe99cebb5f2ef036784387a8eff8
+DIST rarlinux-4.0.0.tar.gz 859660 RMD160 28fc45946c67b50e1c159fea10e9b9d3e44f4b71 SHA1 c598fbab6b399277468b63ea4e18a7a0daec690c SHA256 bcd52f3134151fb645295c4ce771f95d296fbb94996a42e47cc52fffce821261
DIST rarlinux-4.0.1.tar.gz 860102 RMD160 efbdc06750b03a1a288c325e155a064c079b43e0 SHA1 9113bb010c1fd3300bcb990b79efa8d5a956f4c3 SHA256 fe11f48385091b0bfc2d9a8151ac2160ef07748730a47fb0512885bd882e719b
-DIST rarlinux-4.1.0.tar.gz 915027 RMD160 51716353d20c5e81de8bff7e3ad7683039e73ccd SHA1 e4e46520458d3e5f507c270d1ace47a54bc71488 SHA256 6bbbee7ffad0b545a2a677d590d5c6db666739b133e1b25f4eab92256623f479
+DIST rarlinux-x64-3.8.0.tar.gz 821986 RMD160 e4347244c9fe188c4a225f759e77461fe691884f SHA1 103cf8b508feda5f7cadd98bbafde6c8ec134a88 SHA256 faeb1c1f12151a3bc0aa2826ddcc6eef96ddf67cc4cd4fb6b266a788bc6960c6
+DIST rarlinux-x64-3.9.3.tar.gz 870541 RMD160 571d867509f43b06fb4fa12ddd416b55e05b8ea3 SHA1 eb1e891afd9fdbe08b4246a751f3fb2d606b2b24 SHA256 d4abf243420acb570f8a422812c7e1408a4788832eabc3254fa5a256ea17e3b8
+DIST rarlinux-x64-4.0.0.tar.gz 894808 RMD160 6172fb43ce3873eb67e87ac4882d5f942673b9cb SHA1 22e23d6fc654ddebefea345928038cc091e804eb SHA256 aa78873750a0ded35109d71280a7af337fc36492034362ee69f73d4f14d866c4
DIST rarlinux-x64-4.0.1.tar.gz 894579 RMD160 154f55f3a84714ac5dfc76072bd464d1832ee9e4 SHA1 737ddf2e9945006fd317144ba621625fae0eb774 SHA256 452b32e5bbb872e59ea67daadd5be1ac9ab35bf2298823928ae60ba224cb2120
-DIST rarlinux-x64-4.1.0.tar.gz 952728 RMD160 588c91afb2e2bea7c924546ce77a21f05327075b SHA1 6b8cf69127f18189eec8390730d264ef30e24d2d SHA256 a94da95aea0d723b28b3cc0af4329e0ad4f0044f3cd5ed75cb04e8767e890da7
+DIST winrar-x64-393.exe 1531593 RMD160 e97ea1edcdaecbda8ab255e82eaad04c27051495 SHA1 289a882f79ad36b3b10b0e2d9e4d8747f6228680 SHA256 5c8638fcb844252de93afbc2d94c3156960e6957907d8e357fe3abd053a36d51
+DIST winrar-x64-400.exe 1573972 RMD160 ef5fd83d4dcc71aca3c00b3cf24a7ee4bfcfc048 SHA1 efa8f7aa0484a73d0a0a3195a9a7f231adb4c993 SHA256 1703c2c8754c9c1857e3ac1ab399badc1085e7a288007e58348e0e74b677b42e
DIST winrar-x64-401.exe 1569316 RMD160 94f83d8eb2d8e504c723a24ec1d85ff0e3f019df SHA1 4679f735c743177dc94604d27b665e9a5aca5c20 SHA256 d21297ee40e91e72c2028f7ab0e7e5b922ffb6738b66aaad3bccbc0b8036c685
-DIST winrar-x64-410.exe 1637578 RMD160 9226b0ebd5f9f29c2d863cfce7e0b1d6c6cfb75f SHA1 eaaf620603f2c1330f935185746ceb834ce9b4a3 SHA256 56f6436c69243acc7ced536811efa02471498317e9228a62e263640da1372ef1
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index 2ef34aee7d3b..ef0adbed4ce3 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -3,8 +3,14 @@
proxy-maintainers
- jdhore@gentoo.org
- Jeff Horelick
+ jdhore1@gmail.com
+ JD Horelick
+ Maintainer. Add bugs to him
+
+
+hwoarang@gentoo.org
+Markos Chandras
+Proxy maintainer. CC him on bugs
diff --git a/app-editors/ghex/ghex-3.0.0.ebuild b/app-editors/ghex/ghex-3.0.0.ebuild
index 7a262970b000..8a0bba3a114f 100644
--- a/app-editors/ghex/ghex-3.0.0.ebuild
+++ b/app-editors/ghex/ghex-3.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-3.0.0.ebuild,v 1.4 2012/01/14 16:04:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-3.0.0.ebuild,v 1.2 2011/09/27 18:57:34 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 FDL-1.1"
SLOT="2"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/glib-2.26:2
diff --git a/app-editors/gummi/gummi-0.6.1.ebuild b/app-editors/gummi/gummi-0.6.1.ebuild
index 694d150e47ba..48a08b961cff 100644
--- a/app-editors/gummi/gummi-0.6.1.ebuild
+++ b/app-editors/gummi/gummi-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.1.ebuild,v 1.3 2012/01/21 16:25:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.1.ebuild,v 1.1 2011/12/02 18:30:50 hwoarang Exp $
EAPI=4
inherit base eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.midnightcoding.org/redmine/attachments/download/217/${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
LANGS="ar ca cs da de el es fr it nl pl pt pt_BR ro ru sv zh_TW"
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index fca78f6bbd45..92fef0475f96 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -2,14 +2,14 @@
-alexvandermey@gmail.com
-Alexander van der Mey
-Upstream developer.
-
-
hwoarang@gentoo.org
Markos Chandras
-Proxy maintainer.
+Proxy maintainer. CC him on bugs
+
+
+alexvandermey@gmail.com
+Alexander van der Mey
+Upstream developer. Assign bugs to him
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index e052c47c632b..570b8731796e 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -10,6 +10,3 @@ DIST vim-patches-7.3.244.patch.bz2 450514 RMD160 ab8efb017d00cfcb2317d9ab7faa384
DIST vim-patches-7.3.266.patch.bz2 482229 RMD160 20399fd3a4366f486ce9edf2d09733647b26d487 SHA1 22f2f52cc703ea3ee06dcf9d9c49e39208fbf72a SHA256 28ebe4e469fad7a9f3a55611323e9235b83ec40c6abca85da485f9df02aa0177
DIST vim-patches-7.3.322.patch.bz2 544050 RMD160 012ff0a37550bd4665224409eb4b5940e4fa91b9 SHA1 8e4b1d454658c27db0fdffee8d3e159817a70597 SHA256 78708f9bf3c1947882036d213a18ed77f5e4771892501b958c2202c81c8d8d18
DIST vim-patches-7.3.353.patch.bz2 573639 RMD160 9f7a984fe7eab9418d029ff5769e8b4b3509bb74 SHA1 0160e88bfbf92bf9e47ebdd35f1f10aeb8c30788 SHA256 34091a604a747ae47a9fcf9b96a224a2c68da8c53ec1c0aad252bc3940b71591
-DIST vim-patches-7.3.372.patch.bz2 576444 RMD160 4eb27324f20e67e8f4d66e06f6d2f52b94b944c6 SHA1 ac4532b4322578ed10b5764281888af1145d1836 SHA256 46ff9230e671150656cbac03cff270e1c5d22833ec3b9273f2dca0f40e9fab50
-DIST vim-patches-7.3.393.patch.bz2 605537 RMD160 a59773867338e92412e13f00d40a18caf0f241d9 SHA1 853f2d170d248349dc0cbe3d5dd57a8592548165 SHA256 eb2e0ac7d82d9f696555ed5d6c4b711a261be1e1479891b4e2ae24bba6bde7db
-DIST vim-patches-7.3.409.patch.bz2 648440 RMD160 b407d1198bebdea1b1e13fb166676381726c9482 SHA1 6c2e775fc5b1c583a4012cb1705140541f68de5e SHA256 cc2b5402712ef1e94647be0c1398b3cf5a6129e0237e7e60c9515f82e1999958
diff --git a/app-editors/gvim/gvim-7.3.372.ebuild b/app-editors/gvim/gvim-7.3.372.ebuild
deleted file mode 100644
index 13bdd16a2f49..000000000000
--- a/app-editors/gvim/gvim-7.3.372.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.372.ebuild,v 1.1 2012/01/05 18:01:48 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
- epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
- fi
-}
diff --git a/app-editors/gvim/gvim-7.3.393.ebuild b/app-editors/gvim/gvim-7.3.393.ebuild
deleted file mode 100644
index 0334e4d11f60..000000000000
--- a/app-editors/gvim/gvim-7.3.393.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.393.ebuild,v 1.1 2012/01/05 18:17:30 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
- epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
- fi
-}
diff --git a/app-editors/gvim/gvim-7.3.409.ebuild b/app-editors/gvim/gvim-7.3.409.ebuild
deleted file mode 100644
index 869bb5f8419a..000000000000
--- a/app-editors/gvim/gvim-7.3.409.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.409.ebuild,v 1.1 2012/01/21 03:23:33 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
- epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
- fi
-}
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 4cd6e3b216fa..e50deb31e877 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1 @@
-DIST kile-2.1.1.tar.bz2 4680438 RMD160 611ae2756a941949b58ef90d8956fbfabef66d21 SHA1 36987669dd9db05b063a0b4650ef3589dc79f711 SHA256 e1e5a9cbc4afaee033751ddf8483bcff45f9d30af146cfb2cfcd316a6e86b2f0
DIST kile-2.1.tar.bz2 4891810 RMD160 75592d6ccbd70d6d51de9313cb2812be12db6497 SHA1 860ac96b68b6026f48b8a9c401c6024ba78e3cdf SHA256 2c2a60c16209d61418df06b9b97e4a86370fa297f32e302f2483176180f2e629
diff --git a/app-editors/kile/kile-2.1.1.ebuild b/app-editors/kile/kile-2.1.1.ebuild
deleted file mode 100644
index 6216087ab150..000000000000
--- a/app-editors/kile/kile-2.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-2.1.1.ebuild,v 1.1 2012/01/29 17:01:47 johu Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
- KDE_DOC_DIRS="doc"
- KDE_HANDBOOK="optional"
- MY_P=${P/_beta/b}
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-else
- EGIT_REPO_URI="http://anongit.kde.org/kile"
- GIT_ECLASS="git"
-fi
-
-inherit kde4-base ${GIT_ECLASS}
-
-DESCRIPTION="A Latex Editor and TeX shell for KDE"
-HOMEPAGE="http://kile.sourceforge.net/"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="4"
-IUSE="debug +pdf +png"
-
-DEPEND="
- x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdebase-data)
- || (
- $(add_kdebase_dep okular 'pdf?,ps')
- app-text/acroread
- )
- virtual/latex-base
- virtual/tex-base
- pdf? (
- app-text/dvipdfmx
- app-text/ghostscript-gpl
- )
- png? (
- app-text/dvipng
- media-gfx/imagemagick[png]
- )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
- kde4-base_src_prepare
-
- # I know upstream wants to help us but it doesn't work..
- sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
- -i CMakeLists.txt || die
-
- [[ ${PV} != *9999* ]] && { use handbook || rm -fr doc ; }
-}
diff --git a/app-editors/latexila/latexila-2.2.2.ebuild b/app-editors/latexila/latexila-2.2.2.ebuild
index 7ca1f9166d5e..1a6103c6fa6b 100644
--- a/app-editors/latexila/latexila-2.2.2.ebuild
+++ b/app-editors/latexila/latexila-2.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/latexila/latexila-2.2.2.ebuild,v 1.2 2011/12/18 03:24:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/latexila/latexila-2.2.2.ebuild,v 1.1 2011/12/17 09:06:16 tetromino Exp $
EAPI="4"
CMAKE_MIN_VERSION="2.6.4"
@@ -19,7 +19,7 @@ IUSE="gnome +latexmk rubber"
COMMON_DEPEND="
>=dev-libs/glib-2.28:2
- dev-libs/libgee:0
+ dev-libs/libgee
dev-libs/libunique:1
>=x11-libs/gtk+-2.16:2
>=x11-libs/gtksourceview-2.10:2.0
diff --git a/app-editors/leechcraft-popishu/Manifest b/app-editors/leechcraft-popishu/Manifest
index f2ec93f7e5c7..485b25733312 100644
--- a/app-editors/leechcraft-popishu/Manifest
+++ b/app-editors/leechcraft-popishu/Manifest
@@ -1,3 +1,3 @@
+DIST leechcraft-0.4.85.tar.bz2 4048479 RMD160 e1a57dbe445ee595da73ea31028d7cd74dc1da95 SHA1 f755543d758e073068bbe2cda927212ce2733532 SHA256 8653262be3f922bff1cddb6c165743ddce803751226bc494fd952387058300c2
+DIST leechcraft-0.4.90.tar.bz2 4934648 RMD160 ccf069e3d853e59576665b0d472f3d4653cad670 SHA1 9967ef523c379f85d0013da3f5626b8691466d4a SHA256 8baf875a75791ea11803ffd34799b10977d004041e55c9e6cd1c5e6e5394667f
DIST leechcraft-0.4.96.tar.xz 4580632 RMD160 b8b2692d5a664e569c8420c95893f602c3f73c95 SHA1 753a49b90998f130a1e0f32b1bfdae69a8a7fc0c SHA256 36c488a6b87e4c78d4dbb36dd1cd061de73c76ae308ce352e926df373a0c756b
-DIST leechcraft-0.4.97.tar.xz 4598464 RMD160 7f93221dca8f3e42534e4a7206dadbee8963db53 SHA1 775633cba7679795dcea4421c1b24faa990a4e50 SHA256 036f4334da386fcbb48e463bbcb45e6fb5dc642ff3d619641d95d1f0380d9d25
-DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
diff --git a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.85.ebuild b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.85.ebuild
new file mode 100644
index 000000000000..32cd38d47707
--- /dev/null
+++ b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.85.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.85.ebuild,v 1.1 2011/08/23 19:30:37 maksbotan Exp $
+
+EAPI="2"
+
+inherit leechcraft
+
+DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="=net-misc/leechcraft-core-${PV}
+ x11-libs/qscintilla"
+RDEPEND="${DEPEND}"
diff --git a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.90.ebuild b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.90.ebuild
new file mode 100644
index 000000000000..d6d47d88e24d
--- /dev/null
+++ b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.90.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.90.ebuild,v 1.1 2011/09/14 16:59:29 maksbotan Exp $
+
+EAPI="2"
+
+inherit leechcraft
+
+DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="=net-misc/leechcraft-core-${PV}
+ x11-libs/qscintilla"
+RDEPEND="${DEPEND}"
diff --git a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.97.ebuild b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.97.ebuild
deleted file mode 100644
index 08dcfe755d47..000000000000
--- a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.97.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.97.ebuild,v 1.1 2011/12/31 12:03:16 maksbotan Exp $
-
-EAPI="4"
-
-inherit leechcraft
-
-DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft."
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="~net-misc/leechcraft-core-${PV}
- x11-libs/qscintilla"
-RDEPEND="${DEPEND}"
diff --git a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.99.ebuild b/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.99.ebuild
deleted file mode 100644
index 0747ea79a194..000000000000
--- a/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.99.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leechcraft-popishu/leechcraft-popishu-0.4.99.ebuild,v 1.2 2012/02/04 19:09:26 ago Exp $
-
-EAPI="4"
-
-inherit leechcraft
-
-DESCRIPTION="Popishu, the text editor with IDE features for LeechCraft."
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug"
-
-DEPEND="~net-misc/leechcraft-core-${PV}
- x11-libs/qscintilla"
-RDEPEND="${DEPEND}"
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 8b8b29932152..699aa26df327 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1 +1,2 @@
+DIST mg-20110120.tar.gz 137905 RMD160 6f950825cecd266dc69feb8a24e6d1ea7fca540e SHA1 1f0f3eb31f72cbf92513339aa681e289a00d654b SHA256 bd03b584fc16a5b5f61e7e41b38c8d9f5a30b2dd9777d1f7f94616811cbd9983
DIST mg-20110905.tar.gz 138805 RMD160 721b2a2e9059ddf6ea637dafd205575150b58c8c SHA1 51d2bac801cab33c9b552c36db5f8637fbbe9363 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229
diff --git a/app-editors/mg/mg-20110120.ebuild b/app-editors/mg/mg-20110120.ebuild
new file mode 100644
index 000000000000..457a066ab257
--- /dev/null
+++ b/app-editors/mg/mg-20110120.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110120.ebuild,v 1.7 2011/09/25 17:49:10 ulm Exp $
+
+EAPI=3
+
+inherit toolchain-funcs
+
+DESCRIPTION="Micro GNU/emacs, a port from the BSDs"
+HOMEPAGE="http://homepage.boetes.org/software/mg/"
+SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+
+LICENSE="public-domain BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="livecd"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ # econf won't work, as this script does not accept any parameters
+ ./configure || die "configure failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+ einstall || die
+ dodoc README tutorial || die
+}
+
+pkg_postinst() {
+ if use livecd; then
+ [[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+ fi
+}
diff --git a/app-editors/mg/mg-20110905.ebuild b/app-editors/mg/mg-20110905.ebuild
index f1a365d22521..22aa7d8bdf93 100644
--- a/app-editors/mg/mg-20110905.ebuild
+++ b/app-editors/mg/mg-20110905.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110905.ebuild,v 1.10 2012/01/06 15:18:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110905.ebuild,v 1.9 2011/12/03 17:14:14 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
LICENSE="public-domain BSD"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="livecd"
DEPEND="sys-libs/ncurses"
diff --git a/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch b/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
deleted file mode 100644
index 84bd0b70ff87..000000000000
--- a/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c662db58448fefe86184117e6bab5799e43eccf1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Sun, 1 Jan 2012 02:26:16 -0500
-Subject: [PATCH] search ncurses via pkg-config first
-
-Newer ncurses installs include pkg-config files which tell us the right
--I/-L paths we need, so default to that before trying the legacy ways.
-
-Signed-off-by: Mike Frysinger
----
- configure.ac | 18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1f61ae4..05308be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_PROG_CC
- AC_PROG_LN_S
- AC_ISC_POSIX
- AC_SYS_LARGEFILE
-+PKG_PROG_PKG_CONFIG
-
- dnl Internationalization macros.
-
-@@ -439,6 +440,23 @@ AC_CHECK_FUNCS(getopt_long)
- dnl Checks for libraries.
-
- if eval "test x$CURSES_LIB_NAME = x"; then
-+ if test x$enable_utf8 != xno; then
-+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
-+ CURSES_LIB=$NCURSESW_LIBS
-+ CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
-+ CURSES_LIB_NAME=ncursesw
-+ CURSES_LIB_WIDE=yes
-+ ], [:])
-+ else
-+ PKG_CHECK_MODULES([NCURSES], [ncurses], [
-+ CURSES_LIB=$NCURSES_LIBS
-+ CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
-+ CURSES_LIB_NAME=ncurses
-+ ], [:])
-+ fi
-+fi
-+
-+if eval "test x$CURSES_LIB_NAME = x"; then
- AC_CHECK_HEADERS(ncurses.h)
-
- if test x$enable_utf8 != xno; then
---
-1.7.6.1
-
diff --git a/app-editors/nano/nano-2.3.1-r1.ebuild b/app-editors/nano/nano-2.3.1-r1.ebuild
index 66bc3b16e187..e3c58d263f26 100644
--- a/app-editors/nano/nano-2.3.1-r1.ebuild
+++ b/app-editors/nano/nano-2.3.1-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.2 2012/01/01 07:34:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.1 2011/08/29 18:08:00 grobian Exp $
EAPI="3"
-
-inherit eutils autotools
+inherit eutils
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
- inherit subversion autotools
+ inherit subversion
else
MY_P=${PN}-${PV/_}
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
@@ -21,15 +20,16 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug justify minimal ncurses nls slang spell unicode"
-RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
+DEPEND=">=sys-libs/ncurses-5.2[unicode?]
nls? ( sys-devel/gettext )
!ncurses? ( slang? ( sys-libs/slang ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
- eautoreconf
+ if [[ ! -e configure ]] ; then
+ ./autogen.sh || die
+ fi
+ # Prefix fix for odd ncursesw logic, bug #361251
+ sed -i -e "s:-I\(/usr/include/ncursesw\):-I${EPREFIX}\1:" configure || die
}
src_configure() {
@@ -63,6 +63,14 @@ src_install() {
dodir /usr/bin
dosym /bin/nano /usr/bin/nano
+
+ insinto /usr/share/nano
+ local f
+ for f in "${FILESDIR}"/*.nanorc ; do
+ [[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
+ doins "${f}" || die
+ echo "# include \"${EPREFIX}/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
+ done
}
pkg_postinst() {
diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest
index f094fbb285b5..e167489e3bd8 100644
--- a/app-editors/padre/Manifest
+++ b/app-editors/padre/Manifest
@@ -1,2 +1,5 @@
+DIST Padre-0.84.tar.gz 1601993 RMD160 d90ce4d72a5ed4700f37b987fc781eb020f799ed SHA1 9fdf4b32c8b733d645e8657afd76bd9ef46440d9 SHA256 8e3390a96302ef460f94e3b50ec3fe9df9ace99fbac23ff5981e89af2076da6e
+DIST Padre-0.86.tar.gz 1637100 RMD160 d55ce0c0d3ebed6c2d2eb773508e199ca4688b38 SHA1 0614d34e9a4bb5473d2dd5367dd3a890c8607f56 SHA256 e232747a58dddb8df932832ca69af8472e9c202846e6c2f849509f5e536992f0
+DIST Padre-0.88.tar.gz 1680034 RMD160 fa2c4a4daa0530665b50a8623478afa646205727 SHA1 02d27fb33c5e6f1d48b728e45a1da08ddcede4b4 SHA256 c4e36db5eeaa752832ef335078fce5d463cf1c1d94523cef09a1f75e1b6cb395
+DIST Padre-0.90.tar.gz 1690985 RMD160 24e7ec10555c472403e2db341501f5efbe904125 SHA1 cfce4de4fb216aff5dc1e87cc0c141def39f9744 SHA256 807e29dfde998d533346321e1463c028fcd8be4a557420bd015436f4bfc72403
DIST Padre-0.92.tar.gz 1821353 RMD160 37b844ff66b47fa501572dd30bff8383d15b82ab SHA1 bd124e266bf1e790901f7c67ff6551476d648c2b SHA256 f9d0804ec940453b96edca6760d0ac18e930572766fc1db3259bd86d30e9d541
-DIST Padre-0.94.tar.gz 1871534 RMD160 2a9489c8e446663a87428bdfaf9c7f0ecaa7a5a1 SHA1 61a297e02734febf9ecce6f0d8ace5a696350fb5 SHA256 a01a9f7dc44c5eafdcc9cf872af0ee1fdd51fe27b586f0f383bed882e8bac6fd
diff --git a/app-editors/padre/padre-0.840.0.ebuild b/app-editors/padre/padre-0.840.0.ebuild
new file mode 100644
index 000000000000..3b5b75429290
--- /dev/null
+++ b/app-editors/padre/padre-0.840.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.840.0.ebuild,v 1.1 2011/03/16 07:51:25 tove Exp $
+
+EAPI=3
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.84
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+ >=dev-perl/Capture-Tiny-0.06
+ >=dev-perl/Test-MockObject-1.09
+ >=dev-perl/Test-Script-1.07
+ >=dev-perl/Test-Exception-0.27
+ >=dev-perl/Test-NoWarnings-0.084
+ >=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+# >=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+ >=dev-lang/perl-5.10.1
+ >=dev-perl/Class-Adapter-1.05
+ >=dev-perl/Class-Inspector-1.22
+ >=dev-perl/Class-Unload-0.03
+ >=dev-perl/Class-XSAccessor-1.05
+ >=dev-perl/DBD-SQLite-1.27
+ >=dev-perl/DBI-1.58
+ >=dev-perl/Devel-Dumpvar-0.04
+ >=dev-perl/Debug-Client-0.11
+ >=dev-perl/Devel-Refactor-0.05
+ >=virtual/perl-Digest-MD5-2.38
+ >=dev-perl/File-Copy-Recursive-0.37
+ >=dev-perl/File-Find-Rule-0.30
+ >=dev-perl/File-HomeDir-0.91
+ >=virtual/perl-File-Path-2.08
+ >=dev-perl/File-Remove-1.40
+ >=dev-perl/File-ShareDir-1.00
+ >=virtual/perl-File-Spec-3.27.01
+ >=virtual/perl-File-Temp-0.20
+ >=dev-perl/File-Which-1.08
+ dev-perl/File-pushd
+ >=dev-perl/Format-Human-Bytes-0.06
+ virtual/perl-Getopt-Long
+ >=dev-perl/HTML-Parser-3.58
+ >=dev-perl/IO-stringy-2.110
+ virtual/perl-IO
+ >=dev-perl/IO-String-1.08
+ >=dev-perl/IPC-Run-0.83
+ >=dev-perl/JSON-XS-2.2.9
+ >=virtual/perl-Scalar-List-Utils-1.18
+ >=dev-perl/libwww-perl-5.815
+ >=dev-perl/List-MoreUtils-0.22
+ >=dev-perl/Locale-Msgfmt-0.15
+ >=dev-perl/Module-Manifest-0.07
+ >=dev-perl/Module-Refresh-0.13
+ >=dev-perl/Module-Starter-1.50
+ >=dev-perl/ORLite-1.48
+ >=dev-perl/PAR-0.989
+ >=dev-perl/Params-Util-0.33
+ >=dev-perl/Parse-ErrorString-Perl-0.14
+ >=dev-perl/Parse-ExuberantCTags-1.00
+ >=dev-perl/Pod-Abstract-0.16
+ >=dev-perl/Pod-POM-0.17
+ >=virtual/perl-Pod-Simple-3.07
+ >=dev-perl/PPI-1.205
+ >=dev-perl/PPIx-EditorTools-0.10
+ >=dev-perl/PPIx-Regexp-0.011
+ dev-perl/Probe-Perl
+ >=virtual/perl-Storable-2.15
+ >=dev-perl/Template-Tiny-0.11
+ >=virtual/perl-Text-Balanced-0.80
+ >=dev-perl/Text-Diff-0.35
+ >=dev-perl/Text-FindIndent-0.10
+ >=virtual/perl-threads-1.71
+ >=virtual/perl-threads-shared-1.33
+ >=virtual/perl-Time-HiRes-1.97.18
+ >=dev-perl/URI-0
+ >=dev-perl/wxperl-0.91
+ >=dev-perl/Wx-Perl-ProcessStream-0.28
+ >=dev-perl/YAML-Tiny-1.32
+ >=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+# test? (
+# ${TDEPEND}
+# )
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+ unset DISPLAY
+ perl-module_src_configure
+}
diff --git a/app-editors/padre/padre-0.860.0.ebuild b/app-editors/padre/padre-0.860.0.ebuild
new file mode 100644
index 000000000000..e1b0e09418bb
--- /dev/null
+++ b/app-editors/padre/padre-0.860.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.860.0.ebuild,v 1.1 2011/06/23 08:25:01 tove Exp $
+
+EAPI=4
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.86
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+ >=dev-perl/Capture-Tiny-0.06
+ >=dev-perl/Test-MockObject-1.09
+ >=dev-perl/Test-Script-1.07
+ >=dev-perl/Test-Exception-0.27
+ >=dev-perl/Test-NoWarnings-0.084
+ >=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+# >=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+ >=dev-lang/perl-5.10.1
+ >=dev-perl/Class-Adapter-1.05
+ >=dev-perl/Class-Inspector-1.22
+ >=dev-perl/Class-Unload-0.03
+ >=dev-perl/Class-XSAccessor-1.05
+ >=dev-perl/DBD-SQLite-1.27
+ >=dev-perl/DBI-1.58
+ >=dev-perl/Devel-Dumpvar-0.04
+ >=dev-perl/Debug-Client-0.11
+ >=dev-perl/Devel-Refactor-0.05
+ >=virtual/perl-Digest-MD5-2.38
+ >=dev-perl/File-Copy-Recursive-0.37
+ >=dev-perl/File-Find-Rule-0.30
+ >=dev-perl/File-HomeDir-0.91
+ >=virtual/perl-File-Path-2.08
+ >=dev-perl/File-Remove-1.40
+ >=dev-perl/File-ShareDir-1.00
+ >=virtual/perl-File-Spec-3.27.01
+ >=virtual/perl-File-Temp-0.20
+ >=dev-perl/File-Which-1.08
+ dev-perl/File-pushd
+ >=dev-perl/Format-Human-Bytes-0.06
+ virtual/perl-Getopt-Long
+ >=dev-perl/HTML-Parser-3.58
+ >=dev-perl/IO-stringy-2.110
+ virtual/perl-IO
+ >=dev-perl/IO-String-1.08
+ >=dev-perl/IPC-Run-0.83
+ >=dev-perl/JSON-XS-2.2.9
+ >=virtual/perl-Scalar-List-Utils-1.18
+ >=dev-perl/libwww-perl-5.815
+ >=dev-perl/List-MoreUtils-0.22
+ >=dev-perl/Locale-Msgfmt-0.15
+ >=dev-perl/Module-Manifest-0.07
+ >=dev-perl/Module-Refresh-0.13
+ >=dev-perl/Module-Starter-1.50
+ >=dev-perl/ORLite-1.48
+ >=dev-perl/PAR-0.989
+ >=dev-perl/Params-Util-0.33
+ >=dev-perl/Parse-ErrorString-Perl-0.14
+ >=dev-perl/Parse-ExuberantCTags-1.00
+ >=dev-perl/Pod-Abstract-0.16
+ >=dev-perl/Pod-POM-0.17
+ >=virtual/perl-Pod-Simple-3.07
+ >=dev-perl/PPI-1.205
+ >=dev-perl/PPIx-EditorTools-0.130.0
+ >=dev-perl/PPIx-Regexp-0.011
+ dev-perl/Probe-Perl
+ >=virtual/perl-Storable-2.15
+ >=dev-perl/Template-Tiny-0.11
+ >=virtual/perl-Text-Balanced-0.80
+ >=dev-perl/Text-Diff-0.35
+ >=dev-perl/Text-FindIndent-0.10
+ >=virtual/perl-threads-1.71
+ >=virtual/perl-threads-shared-1.33
+ >=virtual/perl-Time-HiRes-1.97.18
+ >=dev-perl/URI-0
+ >=dev-perl/wxperl-0.91
+ >=dev-perl/Wx-Perl-ProcessStream-0.28
+ >=dev-perl/YAML-Tiny-1.32
+ >=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+# test? (
+# ${TDEPEND}
+# )
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+ unset DISPLAY
+ perl-module_src_configure
+}
diff --git a/app-editors/padre/padre-0.880.0.ebuild b/app-editors/padre/padre-0.880.0.ebuild
new file mode 100644
index 000000000000..58d6b193665a
--- /dev/null
+++ b/app-editors/padre/padre-0.880.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.880.0.ebuild,v 1.2 2011/08/11 10:30:07 tove Exp $
+
+EAPI=4
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.88
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+ >=dev-perl/Test-MockObject-1.09
+ >=dev-perl/Test-Script-1.07
+ >=dev-perl/Test-Exception-0.27
+ >=dev-perl/Test-NoWarnings-0.084
+ >=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+# >=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+ >=dev-lang/perl-5.10.1
+ >=dev-perl/Capture-Tiny-0.06
+ >=dev-perl/Class-Adapter-1.05
+ >=dev-perl/Class-Inspector-1.22
+ >=dev-perl/Class-Unload-0.03
+ >=dev-perl/Class-XSAccessor-1.05
+ >=dev-perl/DBD-SQLite-1.27
+ >=dev-perl/DBI-1.58
+ >=dev-perl/Devel-Dumpvar-0.04
+ >=dev-perl/Debug-Client-0.11
+ >=dev-perl/Devel-Refactor-0.05
+ >=virtual/perl-Digest-MD5-2.38
+ >=dev-perl/File-Copy-Recursive-0.37
+ >=dev-perl/File-Find-Rule-0.30
+ >=dev-perl/File-HomeDir-0.91
+ >=virtual/perl-File-Path-2.08
+ >=dev-perl/File-Remove-1.40
+ >=dev-perl/File-ShareDir-1.00
+ >=virtual/perl-File-Spec-3.27.01
+ >=virtual/perl-File-Temp-0.20
+ >=dev-perl/File-Which-1.08
+ dev-perl/File-pushd
+ >=dev-perl/Format-Human-Bytes-0.06
+ virtual/perl-Getopt-Long
+ >=dev-perl/HTML-Parser-3.58
+ >=dev-perl/IO-stringy-2.110
+ virtual/perl-IO
+ >=dev-perl/IO-String-1.08
+ >=dev-perl/IPC-Run-0.83
+ >=dev-perl/JSON-XS-2.2.9
+ >=virtual/perl-Scalar-List-Utils-1.18
+ >=dev-perl/libwww-perl-5.815
+ >=dev-perl/List-MoreUtils-0.22
+ >=dev-perl/Locale-Msgfmt-0.15
+ >=dev-perl/Module-Manifest-0.07
+ >=dev-perl/ORLite-1.48
+ >=dev-perl/PAR-0.989
+ >=dev-perl/Params-Util-0.33
+ >=dev-perl/Parse-ErrorString-Perl-0.14
+ >=dev-perl/Parse-ExuberantCTags-1.00
+ >=dev-perl/Pod-Abstract-0.16
+ >=dev-perl/Pod-POM-0.17
+ >=virtual/perl-Pod-Simple-3.07
+ >=dev-perl/PPI-1.205
+ >=dev-perl/PPIx-EditorTools-0.130.0
+ >=dev-perl/PPIx-Regexp-0.011
+ dev-perl/Probe-Perl
+ >=virtual/perl-Storable-2.16
+ >=dev-perl/Template-Tiny-0.11
+ >=virtual/perl-Text-Balanced-0.80
+ >=dev-perl/Text-Diff-0.35
+ >=dev-perl/Text-FindIndent-0.10
+ >=virtual/perl-threads-1.71
+ >=virtual/perl-threads-shared-1.33
+ >=virtual/perl-Time-HiRes-1.97.18
+ >=dev-perl/URI-0
+ >=dev-perl/wxperl-0.91
+ >=dev-perl/Wx-Perl-ProcessStream-0.28
+ >=dev-perl/YAML-Tiny-1.32
+ >=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+# test? (
+# ${TDEPEND}
+# )
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+ unset DISPLAY
+ perl-module_src_configure
+}
diff --git a/app-editors/padre/padre-0.900.0.ebuild b/app-editors/padre/padre-0.900.0.ebuild
new file mode 100644
index 000000000000..dd9dad6f5f34
--- /dev/null
+++ b/app-editors/padre/padre-0.900.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.900.0.ebuild,v 1.1 2011/08/21 06:58:33 tove Exp $
+
+EAPI=4
+
+MY_PN=Padre
+MODULE_AUTHOR=PLAVEN
+MODULE_VERSION=0.90
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+ >=dev-perl/Test-MockObject-1.09
+ >=dev-perl/Test-Script-1.07
+ >=dev-perl/Test-Exception-0.27
+ >=dev-perl/Test-NoWarnings-0.084
+ >=virtual/perl-Test-Simple-0.88
+"
+
+# Depend on perl-5.10.1 but it only needs
+# a modern EU::MM
+# >=virtual/perl-Pod-Perldoc-3.15
+RDEPEND="
+ >=dev-lang/perl-5.10.1
+ >=dev-perl/Capture-Tiny-0.06
+ >=dev-perl/Class-Adapter-1.05
+ >=dev-perl/Class-Inspector-1.22
+ >=dev-perl/Class-Unload-0.03
+ >=dev-perl/Class-XSAccessor-1.05
+ >=dev-perl/DBD-SQLite-1.27
+ >=dev-perl/DBI-1.58
+ >=dev-perl/Devel-Dumpvar-0.04
+ >=dev-perl/Debug-Client-0.11
+ >=dev-perl/Devel-Refactor-0.05
+ >=dev-perl/File-Copy-Recursive-0.37
+ >=dev-perl/File-Find-Rule-0.30
+ >=dev-perl/File-HomeDir-0.91
+ >=virtual/perl-File-Path-2.08
+ >=dev-perl/File-Remove-1.40
+ >=dev-perl/File-ShareDir-1.00
+ >=virtual/perl-File-Spec-3.27.01
+ >=virtual/perl-File-Temp-0.20
+ >=dev-perl/File-Which-1.08
+ dev-perl/File-pushd
+ >=dev-perl/Format-Human-Bytes-0.06
+ virtual/perl-Getopt-Long
+ >=dev-perl/HTML-Parser-3.58
+ >=dev-perl/IO-stringy-2.110
+ virtual/perl-IO
+ >=dev-perl/IO-String-1.08
+ >=dev-perl/IPC-Run-0.83
+ >=dev-perl/JSON-XS-2.2.9
+ >=virtual/perl-Scalar-List-Utils-1.18
+ >=dev-perl/libwww-perl-5.815
+ >=dev-perl/List-MoreUtils-0.22
+ >=dev-perl/Locale-Msgfmt-0.15
+ >=dev-perl/Module-Manifest-0.07
+ >=dev-perl/ORLite-1.48
+ >=dev-perl/PAR-0.989
+ >=dev-perl/Params-Util-0.33
+ >=dev-perl/Parse-ErrorString-Perl-0.14
+ >=dev-perl/Parse-ExuberantCTags-1.00
+ >=dev-perl/Pod-Abstract-0.16
+ >=dev-perl/Pod-POM-0.17
+ >=virtual/perl-Pod-Simple-3.07
+ >=dev-perl/PPI-1.205
+ >=dev-perl/PPIx-EditorTools-0.130.0
+ >=dev-perl/PPIx-Regexp-0.011
+ dev-perl/Probe-Perl
+ >=virtual/perl-Storable-2.16
+ >=dev-perl/Template-Tiny-0.11
+ >=virtual/perl-Text-Balanced-0.80
+ >=dev-perl/Text-Diff-0.35
+ >=dev-perl/Text-FindIndent-0.10
+ >=virtual/perl-threads-1.71
+ >=virtual/perl-threads-shared-1.33
+ >=virtual/perl-Time-HiRes-1.97.18
+ >=dev-perl/URI-0
+ >=dev-perl/wxperl-0.91
+ >=dev-perl/Wx-Perl-ProcessStream-0.28
+ >=dev-perl/YAML-Tiny-1.32
+ >=virtual/perl-version-0.79
+"
+DEPEND="${RDEPEND}"
+# test? (
+# ${TDEPEND}
+# )
+#"
+
+#SRC_TEST=do
+
+src_configure() {
+ unset DISPLAY
+ perl-module_src_configure
+}
diff --git a/app-editors/padre/padre-0.940.0.ebuild b/app-editors/padre/padre-0.940.0.ebuild
deleted file mode 100644
index ddc840b1dd48..000000000000
--- a/app-editors/padre/padre-0.940.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/padre/padre-0.940.0.ebuild,v 1.2 2012/01/26 11:32:10 tove Exp $
-
-EAPI=4
-
-MY_PN=Padre
-MODULE_AUTHOR=PLAVEN
-MODULE_VERSION=0.94
-inherit perl-module
-
-DESCRIPTION="Perl Application Development and Refactoring Environment"
-HOMEPAGE="http://padre.perlide.org/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Test Deps
-TDEPEND="
- >=dev-perl/Test-MockObject-1.09
- >=dev-perl/Test-Script-1.07
- >=dev-perl/Test-Exception-0.27
- >=dev-perl/Test-NoWarnings-0.084
- >=virtual/perl-Test-Simple-0.88
-"
-
-# Depend on perl-5.10.1 but it only needs
-# a modern EU::MM
-# >=virtual/perl-Pod-Perldoc-3.15
-RDEPEND="
- >=dev-lang/perl-5.10.1
- >=dev-perl/Algorithm-Diff-1.190.0
- >=dev-perl/Capture-Tiny-0.06
- >=dev-perl/Class-Adapter-1.05
- >=dev-perl/Class-Inspector-1.22
- >=dev-perl/Class-XSAccessor-1.130.0
- >=dev-perl/DBD-SQLite-1.350.0
- >=dev-perl/DBI-1.58
- >=dev-perl/Devel-Dumpvar-0.04
- >=dev-perl/Debug-Client-0.160.0
- >=dev-perl/Devel-Refactor-0.05
- >=dev-perl/File-Copy-Recursive-0.37
- >=dev-perl/File-Find-Rule-0.30
- >=dev-perl/File-HomeDir-0.91
- >=virtual/perl-File-Path-2.08
- >=dev-perl/File-Remove-1.40
- >=dev-perl/File-ShareDir-1.00
- >=virtual/perl-File-Spec-3.27.01
- >=virtual/perl-File-Temp-0.20
- >=dev-perl/File-Which-1.08
- dev-perl/File-pushd
- >=dev-perl/Format-Human-Bytes-0.06
- virtual/perl-Getopt-Long
- >=dev-perl/HTML-Parser-3.58
- >=dev-perl/IO-stringy-2.110
- virtual/perl-IO
- >=dev-perl/IO-String-1.08
- >=dev-perl/IPC-Run-0.83
- >=dev-perl/JSON-XS-2.2.9
- >=virtual/perl-Scalar-List-Utils-1.18
- >=dev-perl/libwww-perl-5.815
- >=dev-perl/List-MoreUtils-0.22
- >=dev-perl/Locale-Msgfmt-0.15
- >=dev-perl/Module-Manifest-0.07
- >=dev-perl/ORLite-1.510.0
- >=dev-perl/ORLite-Migrate-1.80.0
- >=dev-perl/PAR-0.989
- >=dev-perl/Params-Util-0.33
- >=dev-perl/Parse-ErrorString-Perl-0.14
- >=dev-perl/Parse-ExuberantCTags-1.00
- >=dev-perl/Pod-Abstract-0.16
- >=dev-perl/Pod-POM-0.17
- >=virtual/perl-Pod-Simple-3.07
- >=dev-perl/PPI-1.205
- >=dev-perl/PPIx-EditorTools-0.130.0
- >=dev-perl/PPIx-Regexp-0.011
- dev-perl/Probe-Perl
- >=dev-perl/Sort-Versions-1.500.0
- >=virtual/perl-Storable-2.16
- >=dev-perl/Template-Tiny-0.11
- >=virtual/perl-Text-Balanced-0.80
- >=dev-perl/Text-Diff-1.410.0
- >=dev-perl/Text-FindIndent-0.10
- >=dev-perl/Text-Patch-1.800.0
- >=virtual/perl-threads-1.71
- >=virtual/perl-threads-shared-1.33
- >=virtual/perl-Time-HiRes-1.97.18
- >=dev-perl/URI-0
- >=dev-perl/wxperl-0.990.100
- >=dev-perl/Wx-Perl-ProcessStream-0.28
- >=dev-perl/Wx-Scintilla-0.340.0
- >=dev-perl/YAML-Tiny-1.32
- >=virtual/perl-version-0.79
-"
-DEPEND="${RDEPEND}"
-# test? (
-# ${TDEPEND}
-# )
-#"
-
-#SRC_TEST=do
-
-src_configure() {
- unset DISPLAY
- perl-module_src_configure
-}
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index a64c35d3c70a..d5cf2f8771d6 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,3 +1,2 @@
DIST QXmlEdit-0.4.9-sources.tgz 1177149 RMD160 2bf0ec2c87c1a7c3bfd2fcc6a7a52ed0e24dc0d4 SHA1 668e099a1f23ef21b2114eaa1da6810668e2bf58 SHA256 3a25d7b4e62d7f41787d41ed7c448fdc4689fff0aac1b90488d3dd7a3d97e7d2
DIST qxmledit-0.4.3.src.tgz 342690 RMD160 9d9c12d2731e4ad0156cbcbd87e76be8defa1903 SHA1 be6a0874038712881a5f715db033ced104837d90 SHA256 195af295d3e661fe2182b6e740154a47570d23354d918e707f75c0845ae24c5f
-DIST qxmledit-0.6.1-src.tgz 8783111 RMD160 50a5ad34777f17271a2ea3825530ade7b6595158 SHA1 f9d3b39181205a73cf166b2e027b959874aad57b SHA256 8d51d45bc165d0491aad18dfa049eb0183ce27eb78636f220c0a78b77868aedc
diff --git a/app-editors/qxmledit/qxmledit-0.4.9.ebuild b/app-editors/qxmledit/qxmledit-0.4.9.ebuild
index f15061bae1fb..53a84b6fb370 100644
--- a/app-editors/qxmledit/qxmledit-0.4.9.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.4.9.ebuild,v 1.2 2012/02/03 14:46:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.4.9.ebuild,v 1.1 2010/10/04 20:37:58 chiiph Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="x11-libs/qt-gui:4"
diff --git a/app-editors/qxmledit/qxmledit-0.6.1.ebuild b/app-editors/qxmledit/qxmledit-0.6.1.ebuild
deleted file mode 100644
index cc38ed35f8ad..000000000000
--- a/app-editors/qxmledit/qxmledit-0.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit qt4-r2
-
-MY_P="qxmledit-${PV}-src"
-
-DESCRIPTION="Qt4 XML Editor"
-HOMEPAGE="http://code.google.com/p/qxmledit/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src/"
-
-DOCS="AUTHORS NEWS README TODO"
-DOCSDIR="${WORKDIR}/${P}/"
-
-src_prepare(){
- # fix installation path
- sed -i "/^INST_DIR/ s/\/opt\/${PN}/\/usr\/bin/" QXmlEdit.pro || \
- die "failed to fix installation path"
- # fix translations
- sed -i "/^INST_DATA_DIR/ s/\/opt/\/usr\/share/" QXmlEdit.pro || \
- die "failed to fix translations"
- qt4-r2_src_prepare
-}
-
-src_install(){
- qt4-r2_src_install
- newicon "${S}"/images/icon.png ${PN}.png
- make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
-}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index d0ed5da5cb92..0ffe565075a6 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,4 +4,3 @@ DIST scite226.tgz 1882394 RMD160 e55abe75f34234899738cab0d1da03aea2ca267c SHA1 e
DIST scite227.tgz 1883989 RMD160 f61251b8d451ef05bedef55836b483bbf188c761 SHA1 d248394fe09dc1d111d1afe5c89320b67c01e9f0 SHA256 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c
DIST scite228.tgz 1875473 RMD160 8497fb7b65bc203c94b6d557955b58e14186cfff SHA1 38d75df0997cf68215cac0ea79ad68243741b200 SHA256 a4fa35a2babdfdc25d41474ea8133e6f1fbffaf411ebfc260740e728505acaf7
DIST scite301.tgz 1810301 RMD160 3f3c7614d7ac261520aa5721522584166977b7ca SHA1 175e616e9449ee94fa19d6ba38c0fe8963c20593 SHA256 603859e1ec1c05c1722d836b08180be36a70cc6662a6b574e83019b0da902e5d
-DIST scite302.tgz 1825937 RMD160 58deba8cc61299ce3e827dc01dde12a39f394789 SHA1 c614e10ff3e2b0af85fb9f7833592c4e7c82730b SHA256 a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa
diff --git a/app-editors/scite/scite-3.0.1.ebuild b/app-editors/scite/scite-3.0.1.ebuild
index 8f999821d288..8f1bfafc3abc 100644
--- a/app-editors/scite/scite-3.0.1.ebuild
+++ b/app-editors/scite/scite-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.5 2012/02/06 17:22:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.2 2011/11/30 19:05:10 nelchael Exp $
EAPI="4"
@@ -13,14 +13,10 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
LICENSE="Scintilla"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="lua"
-RDEPEND="dev-libs/glib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/gdk-pixbuf
- x11-libs/pango
+RDEPEND="x11-libs/gtk+:2
lua? ( >=dev-lang/lua-5 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -34,7 +30,6 @@ src_prepare() {
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
- -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e "s#-Os##" \
|| die "error patching makefile"
@@ -50,7 +45,6 @@ src_prepare() {
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
- -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e 's#${D}##' \
-e 's#-g root#-g 0#' \
-e "s#-Os##" \
diff --git a/app-editors/scite/scite-3.0.2.ebuild b/app-editors/scite/scite-3.0.2.ebuild
deleted file mode 100644
index c96df5bf4c13..000000000000
--- a/app-editors/scite/scite-3.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.2.ebuild,v 1.2 2012/01/27 23:21:34 nelchael Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="Scintilla"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/gdk-pixbuf
- x11-libs/pango
- lua? ( >=dev-lang/lua-5 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
- cd "${WORKDIR}/scintilla/gtk"
- sed -i makefile \
- -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
- -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
- -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
- -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
- -e "s#-Os##" \
- || die "error patching makefile"
-
- cd "${WORKDIR}/scite/gtk"
- sed -i makefile \
- -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
- || die "error patching makefile"
-
- cd "${S}"
- sed -i makefile \
- -e 's#usr/local#usr#g' \
- -e 's#/gnome/apps/Applications#/applications#' \
- -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
- -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
- -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
- -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
- -e 's#${D}##' \
- -e 's#-g root#-g 0#' \
- -e "s#-Os##" \
- || die "error patching makefile"
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
-}
-
-src_compile() {
- emake -C ../../scintilla/gtk
- if use lua; then
- emake
- else
- emake NO_LUA=1
- fi
-}
-
-src_install() {
- dodir /usr/bin
- dodir /usr/share/{pixmaps,applications}
-
- emake prefix="${ED}/usr" install
-
- # we have to keep this because otherwise it'll break upgrading
- mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
- dosym /usr/bin/scite /usr/bin/SciTE
-
- # replace .desktop file with our own working version
- rm -f "${ED}/usr/share/applications/SciTE.desktop"
- insinto /usr/share/applications
- doins "${FILESDIR}/scite.desktop"
-
- doman ../doc/scite.1
- dodoc ../README
-}
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index c288197c8e57..7ef2cd21abe7 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,2 +1,3 @@
-DIST tea-31.2.0.tar.bz2 262806 RMD160 11514eebed9d789ca56d8289e32e2639821cbee0 SHA1 78986b8447eab21be136dc18a2e1afca39a442bb SHA256 81bb3d02a776a4a02fdb94751562194a32e6f8794ccf981d11db422cc44f836b
+DIST tea-27.0.0.tar.bz2 207676 RMD160 8e2d46f919736f4da31d1df370b8b7ce2aff826b SHA1 b0d6d3b806468368f8d58bfa2f159ce0c8a04142 SHA256 9301ecc1098b0da23aa5653a8b6778276d18cce4d8ba92ee2d26b626b03885ac
+DIST tea-28.1.2.tar.bz2 233850 RMD160 5fe178096d01e4b91171b36c599c991405198dd3 SHA1 b6b6d42ed39a3095a41a066b72f69f381d11a27f SHA256 ba4eb9b16bf5fefe345093be36501e6826f29184f77b8cbf909091fcf8db8f9d
DIST teagtk-17.6.6.tar.bz2 479197 RMD160 e8b6aabd7dfb86c43db88bceb7ebaec5f9738594 SHA1 17c3019c9dc6b53d87a9a3bc1cc02784d256f234 SHA256 e2583776fb38331f1e7989f7f8ea23bbae593af26f4c3cdeeae61a793b6bd752
diff --git a/app-editors/tea/tea-27.0.0.ebuild b/app-editors/tea/tea-27.0.0.ebuild
new file mode 100644
index 000000000000..502cfcb8fc76
--- /dev/null
+++ b/app-editors/tea/tea-27.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-27.0.0.ebuild,v 1.1 2010/02/27 19:52:06 yngwin Exp $
+
+EAPI="2"
+inherit eutils qt4-r2
+
+DESCRIPTION="Small, lightweight Qt text editor"
+HOMEPAGE="http://tea-editor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tea-editor/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
+IUSE="aspell hunspell"
+
+DEPEND="x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-script:4"
+RDEPEND="${DEPEND}
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )"
+
+src_configure() {
+ local myopts
+ if use aspell ; then
+ myopts="USE_ASPELL=true"
+ else
+ myopts="USE_ASPELL=false"
+ fi
+
+ if use hunspell ; then
+ myopts="${myopts} USE_HUNSPELL=true"
+ else
+ myopts="${myopts} USE_HUNSPELL=false"
+ fi
+
+ eqmake4 src.pro PREFIX="/usr/bin" ${myopts}
+}
+
+src_install() {
+ dobin bin/tea || die
+ dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO || die
+ doicon icons/tea_icon_v2.png || die
+
+ make_desktop_entry tea Tea tea_icon_v2 Utility
+}
diff --git a/app-editors/tea/tea-28.1.2.ebuild b/app-editors/tea/tea-28.1.2.ebuild
new file mode 100644
index 000000000000..8a303e71cce3
--- /dev/null
+++ b/app-editors/tea/tea-28.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-28.1.2.ebuild,v 1.1 2010/10/06 20:02:57 chiiph Exp $
+
+EAPI="2"
+inherit eutils qt4-r2
+
+DESCRIPTION="Small, lightweight Qt text editor"
+HOMEPAGE="http://tea-editor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tea-editor/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
+IUSE="aspell hunspell"
+
+DEPEND="x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-script:4"
+RDEPEND="${DEPEND}
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )"
+
+src_configure() {
+ local myopts
+ if use aspell ; then
+ myopts="USE_ASPELL=true"
+ else
+ myopts="USE_ASPELL=false"
+ fi
+
+ if use hunspell ; then
+ myopts="${myopts} USE_HUNSPELL=true"
+ else
+ myopts="${myopts} USE_HUNSPELL=false"
+ fi
+
+ eqmake4 src.pro PREFIX="/usr/bin" ${myopts}
+}
+
+src_install() {
+ dobin bin/tea || die
+ dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO || die
+ doicon icons/tea_icon_v2.png || die
+
+ make_desktop_entry tea Tea tea_icon_v2 Utility
+}
diff --git a/app-editors/tea/tea-31.2.0.ebuild b/app-editors/tea/tea-31.2.0.ebuild
deleted file mode 100644
index 89d701898dd5..000000000000
--- a/app-editors/tea/tea-31.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-31.2.0.ebuild,v 1.1 2012/01/21 22:08:26 johu Exp $
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://tea-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tea-editor/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE="aspell hunspell"
-
-RDEPEND="sys-libs/zlib
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell )"
-DEPEND="${RDEPEND}
- hunspell? ( dev-util/pkgconfig )"
-
-src_configure() {
- local myopts
- if use aspell ; then
- myopts="USE_ASPELL=true"
- else
- myopts="USE_ASPELL=false"
- fi
-
- if use hunspell ; then
- myopts="${myopts} USE_HUNSPELL=true"
- else
- myopts="${myopts} USE_HUNSPELL=false"
- fi
-
- eqmake4 src.pro PREFIX="/usr/bin" ${myopts}
-}
-
-src_install() {
- dobin bin/tea
- dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO
- doicon icons/tea_icon_v2.png
-
- make_desktop_entry tea Tea tea_icon_v2 Utility
-}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 243e3c36e698..935c170963a5 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -13,6 +13,3 @@ DIST vim-patches-7.3.244.patch.bz2 450514 RMD160 ab8efb017d00cfcb2317d9ab7faa384
DIST vim-patches-7.3.266.patch.bz2 482229 RMD160 20399fd3a4366f486ce9edf2d09733647b26d487 SHA1 22f2f52cc703ea3ee06dcf9d9c49e39208fbf72a SHA256 28ebe4e469fad7a9f3a55611323e9235b83ec40c6abca85da485f9df02aa0177
DIST vim-patches-7.3.322.patch.bz2 544050 RMD160 012ff0a37550bd4665224409eb4b5940e4fa91b9 SHA1 8e4b1d454658c27db0fdffee8d3e159817a70597 SHA256 78708f9bf3c1947882036d213a18ed77f5e4771892501b958c2202c81c8d8d18
DIST vim-patches-7.3.353.patch.bz2 573639 RMD160 9f7a984fe7eab9418d029ff5769e8b4b3509bb74 SHA1 0160e88bfbf92bf9e47ebdd35f1f10aeb8c30788 SHA256 34091a604a747ae47a9fcf9b96a224a2c68da8c53ec1c0aad252bc3940b71591
-DIST vim-patches-7.3.372.patch.bz2 576444 RMD160 4eb27324f20e67e8f4d66e06f6d2f52b94b944c6 SHA1 ac4532b4322578ed10b5764281888af1145d1836 SHA256 46ff9230e671150656cbac03cff270e1c5d22833ec3b9273f2dca0f40e9fab50
-DIST vim-patches-7.3.393.patch.bz2 605537 RMD160 a59773867338e92412e13f00d40a18caf0f241d9 SHA1 853f2d170d248349dc0cbe3d5dd57a8592548165 SHA256 eb2e0ac7d82d9f696555ed5d6c4b711a261be1e1479891b4e2ae24bba6bde7db
-DIST vim-patches-7.3.409.patch.bz2 648440 RMD160 b407d1198bebdea1b1e13fb166676381726c9482 SHA1 6c2e775fc5b1c583a4012cb1705140541f68de5e SHA256 cc2b5402712ef1e94647be0c1398b3cf5a6129e0237e7e60c9515f82e1999958
diff --git a/app-editors/vim-core/vim-core-7.3.372.ebuild b/app-editors/vim-core/vim-core-7.3.372.ebuild
deleted file mode 100644
index 0e4983e6ae7c..000000000000
--- a/app-editors/vim-core/vim-core-7.3.372.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.372.ebuild,v 1.1 2012/01/05 18:00:05 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-VIMRC_FILE_SUFFIX="-r4"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_CORE_GENTOO_PATCHES}
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="vim and gvim shared files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-editors/vim-core/vim-core-7.3.393.ebuild b/app-editors/vim-core/vim-core-7.3.393.ebuild
deleted file mode 100644
index a044da64c799..000000000000
--- a/app-editors/vim-core/vim-core-7.3.393.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.393.ebuild,v 1.1 2012/01/05 18:15:59 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-VIMRC_FILE_SUFFIX="-r4"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_CORE_GENTOO_PATCHES}
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="vim and gvim shared files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-editors/vim-core/vim-core-7.3.409.ebuild b/app-editors/vim-core/vim-core-7.3.409.ebuild
deleted file mode 100644
index 55754fa25148..000000000000
--- a/app-editors/vim-core/vim-core-7.3.409.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.409.ebuild,v 1.1 2012/01/21 03:22:20 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-VIMRC_FILE_SUFFIX="-r4"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_CORE_GENTOO_PATCHES}
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="vim and gvim shared files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e052c47c632b..570b8731796e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -10,6 +10,3 @@ DIST vim-patches-7.3.244.patch.bz2 450514 RMD160 ab8efb017d00cfcb2317d9ab7faa384
DIST vim-patches-7.3.266.patch.bz2 482229 RMD160 20399fd3a4366f486ce9edf2d09733647b26d487 SHA1 22f2f52cc703ea3ee06dcf9d9c49e39208fbf72a SHA256 28ebe4e469fad7a9f3a55611323e9235b83ec40c6abca85da485f9df02aa0177
DIST vim-patches-7.3.322.patch.bz2 544050 RMD160 012ff0a37550bd4665224409eb4b5940e4fa91b9 SHA1 8e4b1d454658c27db0fdffee8d3e159817a70597 SHA256 78708f9bf3c1947882036d213a18ed77f5e4771892501b958c2202c81c8d8d18
DIST vim-patches-7.3.353.patch.bz2 573639 RMD160 9f7a984fe7eab9418d029ff5769e8b4b3509bb74 SHA1 0160e88bfbf92bf9e47ebdd35f1f10aeb8c30788 SHA256 34091a604a747ae47a9fcf9b96a224a2c68da8c53ec1c0aad252bc3940b71591
-DIST vim-patches-7.3.372.patch.bz2 576444 RMD160 4eb27324f20e67e8f4d66e06f6d2f52b94b944c6 SHA1 ac4532b4322578ed10b5764281888af1145d1836 SHA256 46ff9230e671150656cbac03cff270e1c5d22833ec3b9273f2dca0f40e9fab50
-DIST vim-patches-7.3.393.patch.bz2 605537 RMD160 a59773867338e92412e13f00d40a18caf0f241d9 SHA1 853f2d170d248349dc0cbe3d5dd57a8592548165 SHA256 eb2e0ac7d82d9f696555ed5d6c4b711a261be1e1479891b4e2ae24bba6bde7db
-DIST vim-patches-7.3.409.patch.bz2 648440 RMD160 b407d1198bebdea1b1e13fb166676381726c9482 SHA1 6c2e775fc5b1c583a4012cb1705140541f68de5e SHA256 cc2b5402712ef1e94647be0c1398b3cf5a6129e0237e7e60c9515f82e1999958
diff --git a/app-editors/vim/vim-7.3.372.ebuild b/app-editors/vim/vim-7.3.372.ebuild
deleted file mode 100644
index 8117431b310b..000000000000
--- a/app-editors/vim/vim-7.3.372.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.372.ebuild,v 1.1 2012/01/05 18:00:44 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
- fi
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
-}
diff --git a/app-editors/vim/vim-7.3.393.ebuild b/app-editors/vim/vim-7.3.393.ebuild
deleted file mode 100644
index 4f33d2502229..000000000000
--- a/app-editors/vim/vim-7.3.393.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.393.ebuild,v 1.1 2012/01/05 18:16:58 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
- fi
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
-}
diff --git a/app-editors/vim/vim-7.3.409.ebuild b/app-editors/vim/vim-7.3.409.ebuild
deleted file mode 100644
index b094eaaf9b4b..000000000000
--- a/app-editors/vim/vim-7.3.409.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.409.ebuild,v 1.1 2012/01/21 03:23:00 lack Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
- http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- vim_src_prepare
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
- fi
- epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
-}
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index 4c08df3048ee..1466c0890e64 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -1,3 +1,3 @@
+DIST zile-2.3.23.tar.gz 928118 RMD160 6148dfe3879153db7e50a9778e5c95ad96ef86b1 SHA1 69e61d6339246c61c58a75b517c812a499516674 SHA256 86ad8aad5f060688312b6454497d1c6b1aa4b77885b6e86a1eb75491553d7007
DIST zile-2.3.24.tar.gz 953962 RMD160 a9a7a4bce857fcc1bca5e9d1ca7bc47b5b335a9e SHA1 e7f6e83d24d66ce46fc14a9e95efd3959f40f862 SHA256 218bb2af414c6a168101656631a5b2da92f20a965895e1006658cc658b0b7e89
DIST zile-2.4.2.tar.gz 1238696 RMD160 77519a90131c7eed1eebb4e75f9b7af76b0b2fc2 SHA1 e4f62a58af163198a38f6318be8227aec1651fd3 SHA256 73b4229474bced1565ef4f4e87b3187dca16ebb5422cb714b45a7b87020b4945
-DIST zile-2.4.3.tar.gz 1235561 RMD160 a379df869e47e2ec75a1fb3eee2618de4e33da39 SHA1 5acef10464641e93a396bbffa2d45766c1ad4c28 SHA256 83eda904f38a302af7f91179e985baa801f457b62ee19988fdcfae14079bcf67
diff --git a/app-editors/zile/zile-2.3.23.ebuild b/app-editors/zile/zile-2.3.23.ebuild
new file mode 100644
index 000000000000..62e180b74f94
--- /dev/null
+++ b/app-editors/zile/zile-2.3.23.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.23.ebuild,v 1.6 2011/05/29 16:20:58 armin76 Exp $
+
+EAPI=3
+
+DESCRIPTION="Zile is a small Emacs clone"
+HOMEPAGE="http://www.gnu.org/software/zile/"
+SRC_URI="mirror://gnu/zile/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="livecd test valgrind"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+ test? ( valgrind? ( dev-util/valgrind ) )"
+
+src_configure() {
+ econf $(use test && use_with valgrind || echo "--without-valgrind")
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ # FAQ is installed by the build system in /usr/share/zile
+ dodoc AUTHORS BUGS NEWS README THANKS || die
+
+ # Zile should never install charset.alias (even on non-glibc arches)
+ rm -f "${ED}"/usr/lib/charset.alias
+}
+
+pkg_postinst() {
+ if use livecd; then
+ [ -e "${EROOT}"/usr/bin/emacs ] || ln -s zile "${EROOT}"/usr/bin/emacs
+ fi
+}
diff --git a/app-editors/zile/zile-2.3.24-r1.ebuild b/app-editors/zile/zile-2.3.24-r1.ebuild
index 8e09f90d2db7..79062f8a41bb 100644
--- a/app-editors/zile/zile-2.3.24-r1.ebuild
+++ b/app-editors/zile/zile-2.3.24-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.24-r1.ebuild,v 1.5 2012/01/06 15:15:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.3.24-r1.ebuild,v 1.4 2011/09/24 17:18:28 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="livecd test valgrind"
RDEPEND="sys-libs/ncurses"
diff --git a/app-editors/zile/zile-2.4.3.ebuild b/app-editors/zile/zile-2.4.3.ebuild
deleted file mode 100644
index c46bb9dd16d0..000000000000
--- a/app-editors/zile/zile-2.4.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-2.4.3.ebuild,v 1.1 2011/12/22 11:10:49 ulm Exp $
-
-EAPI=4
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="http://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="acl test"
-
-RDEPEND="dev-libs/boehm-gc
- sys-libs/ncurses
- acl? ( virtual/acl )"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --disable-silent-rules \
- $(use_enable acl)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # AUTHORS, FAQ, and NEWS are installed by the build system
- dodoc README THANKS
-
- # Zile should never install charset.alias (even on non-glibc arches)
- rm -f "${ED}"/usr/lib/charset.alias
-}
diff --git a/app-editors/znotes/Manifest b/app-editors/znotes/Manifest
index 47a4e276f023..0507e4ec2f29 100644
--- a/app-editors/znotes/Manifest
+++ b/app-editors/znotes/Manifest
@@ -1,3 +1,2 @@
DIST znotes-0.4.3.tar.gz 103097 RMD160 ba55c5294991586baf176e14891bbd8134db416f SHA1 0acfbe194c5e9818053337289a55ec3a430582e8 SHA256 41be96c465332d7231c44d27a550427f9dab6df7ca77794626bfbc18c375851e
DIST znotes-0.4.4.tar.gz 111286 RMD160 de89844b2a4cfe0c6a0bbd52149e1d5bcf038170 SHA1 9910ac7a3af1753d90234c40f87236fde4d2b896 SHA256 0b0c21a28d446d3649153575f658d7eb07e37c963dff9aed1eb184eb5089be47
-DIST znotes-0.4.5.tar.gz 171884 RMD160 7f1e44fbbbd1a4b242c6bde47bbffdd4a314d348 SHA1 8cd1e31d52455f0a5bd4cde2fc27d7a59262c3b3 SHA256 ac692253e74bda8f989db40042c26b6db2bb60a5f9c30cdbfcd824af0de1c5b2
diff --git a/app-editors/znotes/znotes-0.4.5.ebuild b/app-editors/znotes/znotes-0.4.5.ebuild
deleted file mode 100644
index aaeaf631bbf7..000000000000
--- a/app-editors/znotes/znotes-0.4.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/znotes/znotes-0.4.5.ebuild,v 1.1 2012/01/30 07:49:35 johu Exp $
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="Simple Notes"
-HOMEPAGE="http://znotes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/qt-core:4
- x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGELOG THANKS"
-
-src_configure() {
- lrelease znotes.pro || die "lrelease failed"
- qt4-r2_src_configure
-}
diff --git a/app-emacs/auctex/auctex-11.86-r1.ebuild b/app-emacs/auctex/auctex-11.86-r1.ebuild
index b73123137f6d..49a16df384ca 100644
--- a/app-emacs/auctex/auctex-11.86-r1.ebuild
+++ b/app-emacs/auctex/auctex-11.86-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.86-r1.ebuild,v 1.8 2012/01/14 16:09:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.86-r1.ebuild,v 1.7 2011/07/18 00:45:44 halcy0n Exp $
EAPI=3
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~spa
IUSE="preview-latex"
DEPEND="virtual/latex-base
- preview-latex? (
+ preview-latex? ( !dev-tex/preview-latex
app-text/dvipng
app-text/ghostscript-gpl )"
RDEPEND="${DEPEND}"
@@ -43,7 +43,6 @@ src_configure() {
}
src_compile() {
- export VARTEXFONTS="${T}"/fonts
emake || die "emake failed"
cd doc; emake tex-ref.pdf || die "creation of tex-ref.pdf failed"
}
diff --git a/app-emacs/cedet/Manifest b/app-emacs/cedet/Manifest
index 0d7d7edf5636..60395b32558f 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -1 +1 @@
-DIST cedet-1.0.1.tar.gz 2101932 RMD160 1862ccd138297b24282b10edb7b1f74450923d5b SHA1 583cf48c50720a8944d5b2f499ecaac5adad5090 SHA256 8b651232f9a1c79cdddce9d0933c22a9240115272f2b395395c4f026151f96f4
+DIST cedet-1.0.tar.gz 2100938 RMD160 a3703cb76f21468a1d218a091599441ca9aa5d11 SHA1 bc3c7c22465f79df603fb6bb5684442a439f198e SHA256 f0d5c76d22a8d7dceaccb659be094c44cb999eae75db3545eef086d8dcd342f4
diff --git a/app-emacs/cedet/cedet-1.0.1.ebuild b/app-emacs/cedet/cedet-1.0.1.ebuild
deleted file mode 100644
index ef9334001a3f..000000000000
--- a/app-emacs/cedet/cedet-1.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.5 2012/02/01 17:17:10 ranger Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp
-
-MY_P=${P/_}
-DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
-HOMEPAGE="http://cedet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-EMACSFLAGS="${EMACSFLAGS} -L ${S}/eieio -L ${S}/semantic -L ${S}/srecode \
- -L ${S}/ede -L ${S}/speedbar -L ${S}/cogre"
-
-src_compile() {
- emake -j1 \
- EMACS="${EMACS}" \
- EMACSFLAGS="${EMACSFLAGS}"
-}
-
-src_test() {
- emake -j1 \
- EMACS="${EMACS}" \
- EMACSFLAGS="${EMACSFLAGS}" \
- utest
-}
-
-src_install() {
- local target file dir
- find . -type d -name tests -prune -o -type f -print | while read target
- do
- file=${target##*/}
- dir=${target%/*}; dir=${dir#./}
- case "${file}" in
- *~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST \
- | Project.ede | USING_CEDET_FROM_CVS | grammar-fw-ov.txt)
- ;;
- ChangeLog | README | AUTHORS | *NEWS | INSTALL \
- | renamelist.txt | semanticdb.sh)
- docinto "${dir}"
- dodoc "${target}" ;;
- *.el | *.by | *.wy)
- # install grammar sources along with the elisp files, since
- # the location where semantic expects them is not configurable
- insinto "${SITELISP}/${PN}/${dir}"
- doins "${target}" ;;
- *.elc)
- # we are in a subshell, so collecting in a variable won't work
- echo "${target}" >>"${T}/elc-list.txt" ;;
- *.srt | *.xpm)
- insinto "${SITEETC}/${PN}/${dir}"
- doins "${target}" ;;
- *.info* | grammar-fw-ov.png)
- doinfo "${target}" ;;
- *)
- die "Unrecognised file ${target}" ;;
- esac
- done
-
- # make sure that the compiled elisp files have a later time stamp than
- # the corresponding sources, in order to suppress warnings at run time
- while read target; do
- dir=${target%/*}; dir=${dir#./}
- insinto "${SITELISP}/${PN}/${dir}"
- doins "${target}"
- done <"${T}/elc-list.txt"
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
diff --git a/app-emacs/cedet/cedet-1.0.ebuild b/app-emacs/cedet/cedet-1.0.ebuild
new file mode 100644
index 000000000000..1d202da9371c
--- /dev/null
+++ b/app-emacs/cedet/cedet-1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.ebuild,v 1.6 2011/01/25 18:02:00 ulm Exp $
+
+NEED_EMACS=22
+
+inherit elisp
+
+MY_P=${P/_}
+DESCRIPTION="CEDET: Collection of Emacs Development Environment Tools"
+HOMEPAGE="http://cedet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-emacs/semantic
+ !app-emacs/eieio
+ !app-emacs/speedbar"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+EMACSFLAGS="${EMACSFLAGS} -L ${S}/eieio -L ${S}/semantic -L ${S}/srecode \
+ -L ${S}/ede -L ${S}/speedbar -L ${S}/cogre"
+
+src_compile() {
+ emake -j1 \
+ EMACS="${EMACS}" \
+ EMACSFLAGS="${EMACSFLAGS}" \
+ || die "emake failed"
+}
+
+src_test() {
+ emake -j1 \
+ EMACS="${EMACS}" \
+ EMACSFLAGS="${EMACSFLAGS}" \
+ utest || die "make utest failed"
+}
+
+src_install() {
+ local target file dir
+ find . -type d -name tests -prune -o -type f -print | while read target
+ do
+ file=${target##*/}
+ dir=${target%/*}; dir=${dir#./}
+ case "${file}" in
+ *~ | Makefile | *.texi | *-script | PRERELEASE_CHECKLIST \
+ | Project.ede | USING_CEDET_FROM_CVS | grammar-fw-ov.txt)
+ ;;
+ ChangeLog | README | AUTHORS | *NEWS | INSTALL \
+ | renamelist.txt | semanticdb.sh)
+ docinto "${dir}"
+ dodoc "${target}" || die ;;
+ *.el | *.by | *.wy)
+ # install grammar sources along with the elisp files, since
+ # the location where semantic expects them is not configurable
+ insinto "${SITELISP}/${PN}/${dir}"
+ doins "${target}" || die ;;
+ *.elc)
+ # we are in a subshell, so collecting in a variable won't work
+ echo "${target}" >>"${T}/elc-list.txt" ;;
+ *.srt | *.xpm)
+ insinto "${SITEETC}/${PN}/${dir}"
+ doins "${target}" || die ;;
+ *.info* | grammar-fw-ov.png)
+ doinfo "${target}" || die ;;
+ *)
+ die "Unrecognised file ${target}" ;;
+ esac
+ done
+
+ # make sure that the compiled elisp files have a later time stamp than
+ # the corresponding sources, in order to suppress warnings at run time
+ while read target; do
+ dir=${target%/*}; dir=${dir#./}
+ insinto "${SITELISP}/${PN}/${dir}"
+ doins "${target}" || die
+ done <"${T}/elc-list.txt"
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+}
diff --git a/app-emacs/elib/elib-1.0-r1.ebuild b/app-emacs/elib/elib-1.0-r1.ebuild
index 9a0679d9ca33..1f7adca3594a 100644
--- a/app-emacs/elib/elib-1.0-r1.ebuild
+++ b/app-emacs/elib/elib-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/elib-1.0-r1.ebuild,v 1.4 2012/01/15 15:53:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/elib-1.0-r1.ebuild,v 1.1 2010/02/01 22:06:03 ulm Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://jdee.sunsite.dk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/elib/elib-1.0.ebuild b/app-emacs/elib/elib-1.0.ebuild
new file mode 100644
index 000000000000..f815e62dce44
--- /dev/null
+++ b/app-emacs/elib/elib-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/elib-1.0.ebuild,v 1.15 2008/01/25 12:10:09 opfer Exp $
+
+inherit elisp
+
+DESCRIPTION="The Emacs Lisp Library"
+HOMEPAGE="http://jdee.sourceforge.net"
+SRC_URI="http://jdee.sunsite.dk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+SITEFILE=50elib-gentoo.el
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ sed -i 's:--infodir:--info-dir:g' Makefile
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install() {
+ dodir "${SITELISP}/elib"
+ dodir /usr/share/info
+ emake prefix="${D}/usr" infodir="${D}/usr/share/info" install || die "emake install failed"
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ dodoc ChangeLog INSTALL NEWS README RELEASING TODO
+}
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 52522f3797cf..8445b2d668ba 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1 +1,2 @@
+DIST emacs-common-gentoo-1.2.tar.gz 46622 RMD160 88c923d05286b53687e1099294fb579a2f4f5d39 SHA1 4712b6186d4620aaa5258236367d3228f515f341 SHA256 d15f9654214b10e9efc9e38fe45b4e08c3f0cc1c975de34058e4d360d3053108
DIST emacs-common-gentoo-1.3.tar.gz 46819 RMD160 40c12dd355c3fd80ad65d45190c4f3c7f2134ad6 SHA1 ff743a4646d493dd14ed1e812d3adfd6323498e9 SHA256 c874088b1d9833432e1da9c3e3f79e7891cb3af41bcdecb02aa299d207c0218d
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild
new file mode 100644
index 000000000000..06a8fd01b81c
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.2-r2.ebuild,v 1.9 2011/07/15 14:29:24 xarthisius Exp $
+
+EAPI=4
+
+inherit elisp-common eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="X emacs22icons"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+ if [ -e "${EROOT}${SITELISP}/subdirs.el" ] \
+ && ! has_version ">=${CATEGORY}/${PN}-1"
+ then
+ ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
+ rm -f "${EROOT}${SITELISP}/subdirs.el"
+ fi
+}
+
+src_install() {
+ elisp-install . subdirs.el || die
+
+ if use X; then
+ local i
+ domenu emacs.desktop emacsclient.desktop || die
+ newicon icons/sink.png emacs-sink.png || die
+ if use emacs22icons; then
+ newicon icons/emacs22_48.png emacs.png || die
+ for i in 16 24 32 48; do
+ insinto /usr/share/icons/hicolor/${i}x${i}/apps
+ newins icons/emacs22_${i}.png emacs.png
+ done
+ else
+ newicon icons/emacs_48.png emacs.png || die
+ for i in 16 24 32 48 128; do
+ insinto /usr/share/icons/hicolor/${i}x${i}/apps
+ newins icons/emacs_${i}.png emacs.png
+ done
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins icons/emacs.svg
+ fi
+ gnome2_icon_savelist
+ fi
+}
+
+make-site-start() {
+ ebegin "Creating default ${SITELISP}/site-start.el"
+ cat <<-EOF >"${T}/site-start.el"
+ ;;; site-start.el -*- no-byte-compile: t -*-
+
+ ;;; Commentary:
+ ;; This default site startup file for Emacs was created by package
+ ;; ${CATEGORY}/${PF}. You may modify this file, replace
+ ;; it by your own site initialisation, or even remove it completely.
+
+ ;;; Code:
+ ;; Load site initialisation for Gentoo installed packages.
+ (require 'site-gentoo)
+
+ ;;; site-start.el ends here
+ EOF
+ mv "${T}/site-start.el" "${EROOT}${SITELISP}/site-start.el"
+ eend $? "Installation of site-start.el failed"
+}
+
+pkg_config() {
+ # make sure that site-gentoo.el exists since site-start.el requires it
+ elisp-site-regen
+
+ if [ ! -e "${EROOT}${SITELISP}/site-start.el" ]; then
+ echo
+ einfo "Press ENTER to create a default site-start.el file"
+ einfo "for GNU Emacs, or Control-C to abort now ..."
+ read
+ make-site-start
+ else
+ einfo "site-start.el for GNU Emacs already exists."
+ fi
+}
+
+pkg_postinst() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+
+ # make sure that site-gentoo.el exists since site-start.el requires it
+ elisp-site-regen
+
+ if [ ! -e "${EROOT}${SITELISP}/site-start.el" ]; then
+ local line
+ echo
+ while read line; do elog "${line:- }"; done <<-EOF
+ All site initialisation for Gentoo-installed packages is added to
+ /usr/share/emacs/site-lisp/site-gentoo.el. In order for this site
+ initialisation to be loaded for all users automatically, a default
+ site-start.el is created in the same directory. You are responsible
+ for all further maintenance of this file.
+
+ Alternatively, individual users can add the following command:
+
+ (require 'site-gentoo)
+
+ to their ~/.emacs initialisation files, or, for greater flexibility,
+ users may load single package-specific initialisation files from
+ /usr/share/emacs/site-lisp/site-gentoo.d/.
+ EOF
+ echo
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ # This is a new install. Create default site-start.el, so that
+ # Gentoo packages will work.
+ make-site-start
+ else
+ # This package was already installed, but site-start.el does
+ # not exist. Give a hint how to (re-)create it.
+ elog "If this is a new install, you may want to run:"
+ elog "emerge --config =${CATEGORY}/${PF}"
+ fi
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
deleted file mode 100644
index d96335808e57..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild,v 1.1 2012/01/29 18:19:40 ulm Exp $
-
-EAPI=4
-
-inherit elisp-common eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X emacs22icons"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
- if [[ -e ${EROOT}${SITELISP}/subdirs.el ]] \
- && ! has_version ">=${CATEGORY}/${PN}-1"
- then
- ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
- rm -f "${EROOT}${SITELISP}/subdirs.el"
- fi
-}
-
-src_install() {
- insinto "${SITELISP}"
- doins subdirs.el
-
- keepdir /etc/emacs
- insinto /etc/emacs
- doins site-start.el
-
- if use X; then
- local i
- domenu emacs.desktop emacsclient.desktop || die
- newicon icons/sink.png emacs-sink.png || die
- if use emacs22icons; then
- newicon icons/emacs22_48.png emacs.png || die
- for i in 16 24 32 48; do
- insinto /usr/share/icons/hicolor/${i}x${i}/apps
- newins icons/emacs22_${i}.png emacs.png
- done
- else
- newicon icons/emacs_48.png emacs.png || die
- for i in 16 24 32 48 128; do
- insinto /usr/share/icons/hicolor/${i}x${i}/apps
- newins icons/emacs_${i}.png emacs.png
- done
- insinto /usr/share/icons/hicolor/scalable/apps
- doins icons/emacs.svg
- fi
- gnome2_icon_savelist
- fi
-}
-
-site-start-modified-p() {
- case $(cksum <"${EROOT}${SITELISP}/site-start.el") in
- # checksums of auto-generated site-start.el files
- "2098727038 349") return 1 ;; # elisp-common.eclass
- "3626264063 355") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.1)
- "3738455534 394") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.6)
- "4199862847 394") return 1 ;; # emacs-common-gentoo-1.1
- "2547348044 394") return 1 ;; # emacs-common-gentoo-1.2
- "2214952934 397") return 1 ;; # emacs-common-gentoo-1.2-r1
- "3917799317 397") return 1 ;; # emacs-common-gentoo-1.2-r2
- *) return 0 ;;
- esac
-}
-
-pkg_postinst() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-
- # make sure that site-gentoo.el exists since site-start.el requires it
- elisp-site-regen
-
- local line
- while read line; do elog "${line:- }"; done <<-EOF
- All site initialisation for Gentoo-installed packages is added to
- ${SITELISP}/site-gentoo.el. In order for this site
- initialisation to be loaded for all users automatically, a default
- site startup file /etc/emacs/site-start.el is installed. You are
- responsible for maintenance of this file.
-
- Alternatively, individual users can add the following command:
-
- (require 'site-gentoo)
-
- to their ~/.emacs initialisation files, or, for greater flexibility,
- users may load single package-specific initialisation files from
- ${SITELISP}/site-gentoo.d/.
- EOF
-
- if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
- elog
- ewarn "The location of the site startup file for Emacs has changed to"
- ewarn "/etc/emacs/site-start.el."
- if site-start-modified-p; then
- ewarn "If your site-start.el file contains your own customisation,"
- ewarn "you should move it to the new file. In any case, you should"
- ewarn "remove the old ${SITELISP}/site-start.el file."
- else
- ewarn "Removing the old ${SITELISP}/site-start.el file."
- rm -f "${EROOT}${SITELISP}/site-start.el"
- fi
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
index e301509c88d8..ace5e57e9862 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.7 2012/01/16 02:59:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.2 2011/12/15 07:22:59 ulm Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="X emacs22icons"
PDEPEND="virtual/emacs"
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild
index 5983cdc0f6c2..5193200dc29d 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild,v 1.9 2011/12/26 00:49:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.18.ebuild,v 1.8 2011/08/24 20:39:51 ulm Exp $
inherit elisp
@@ -30,6 +30,7 @@ pkg_setup() {
Use "eselect emacs" to select an Emacs version >= 23.
EOF
elif [[ ${has_gtk} == t ]]; then
+ echo
while read line; do ewarn "${line}"; done <<-EOF
Your current Emacs is compiled with GTK+. There is a long-standing
bug in GTK+ that prevents Emacs from recovering from X disconnects:
@@ -37,6 +38,7 @@ pkg_setup() {
If you run Emacs as a daemon, then it is strongly recommended that
you compile it with the Lucid toolkit, i.e. with USE="Xaw3d -gtk".
EOF
+ echo
fi
}
diff --git a/app-emacs/gentoo-syntax/Manifest b/app-emacs/gentoo-syntax/Manifest
index 3db33f53a397..eb1dd4f5692f 100644
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@@ -1,3 +1,2 @@
DIST gentoo-syntax-1.17.tar.bz2 20238 RMD160 88449201daebb60d7292ddc92cab1c39c2abc8f2 SHA1 5e78d3437493b41d32bd2137e59b46569c9d40bf SHA256 fe5743de2cb2326448eba9335f4c64e07a84269ec9703fb8a3b89522241b4b33
DIST gentoo-syntax-1.18.tar.bz2 20819 RMD160 362c8557aba26af3bd4fd7c8deb73140292ba5a9 SHA1 f87cf81504dd7506f090967543aab8411aca17f9 SHA256 c05a935ce7803595a888c77c37c2f16dd9fe5da31418bc8f9b5940be9c08fb14
-DIST gentoo-syntax-1.19.tar.bz2 21385 RMD160 48b36dafaa1fdb1cca3647cba33b3f4079c6de01 SHA1 c612288be9f059d78fc41b791d60ac3ed7220ba1 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
deleted file mode 100644
index 2daa8fca39c7..000000000000
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.1 2011/12/23 21:29:51 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DOCS="ChangeLog"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- elisp_src_compile
- makeinfo gentoo-syntax.texi || die
-}
-
-src_install() {
- elisp-install ${PN} *.el *.elc || die
- sed -e "s:@PORTDIR@:${PORTDIR}:" \
- "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
- elisp-site-file-install "${T}/${SITEFILE}" || die
- doinfo gentoo-syntax.info || die
- dodoc ${DOCS} || die
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- elog "Some optional features may require installation of additional"
- elog "packages, like app-portage/gentoolkit-dev for echangelog."
-}
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
index 67e61ee98d9b..8b178ccd59ee 100644
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild,v 1.5 2011/12/26 14:12:07 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild,v 1.4 2011/09/05 13:55:47 naota Exp $
EAPI=4
@@ -17,6 +17,4 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE=""
-DEPEND="app-arch/xz-utils"
-
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/howm/howm-1.3.9.1.ebuild b/app-emacs/howm/howm-1.3.9.1.ebuild
index 2d430626026a..a2b8195baa1a 100644
--- a/app-emacs/howm/howm-1.3.9.1.ebuild
+++ b/app-emacs/howm/howm-1.3.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.1.ebuild,v 1.4 2012/01/15 15:54:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.1.ebuild,v 1.1 2011/01/30 12:08:57 ulm Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild b/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild
index a8f87afcb83c..43adcb1874ef 100644
--- a/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild,v 1.5 2011/12/26 14:17:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/markdown-mode/markdown-mode-1.8.1.ebuild,v 1.4 2011/09/26 16:43:47 ulm Exp $
EAPI=4
@@ -17,6 +17,4 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-arch/xz-utils"
-
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild b/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild
index 09f323086b00..cf8ab43d8fee 100644
--- a/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild
+++ b/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild,v 1.7 2012/01/14 18:33:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.1.0_pre20070306.ebuild,v 1.6 2009/11/24 20:59:48 fauli Exp $
inherit elisp
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
DEPEND="app-emacs/cedet"
diff --git a/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild b/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild
index a76591b75796..3849fdcada32 100644
--- a/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild
+++ b/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild,v 1.3 2012/01/14 18:33:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.0_pre20091116.ebuild,v 1.2 2009/11/24 20:59:48 fauli Exp $
inherit elisp
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~fauli/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
DEPEND="app-emacs/cedet"
diff --git a/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild b/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild
index cb9cc0047e43..a3df41683dc4 100644
--- a/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild
+++ b/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild,v 1.2 2012/01/14 18:33:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/matlab/matlab-3.3.1_pre20100121.ebuild,v 1.1 2010/03/08 10:35:09 fauli Exp $
inherit elisp
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~fauli/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
DEPEND="app-emacs/cedet"
diff --git a/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild b/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild
index 67abdaad759f..463b6a8b3612 100644
--- a/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild
+++ b/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild,v 1.7 2012/02/05 18:21:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/navi2ch/navi2ch-1.8.3-r1.ebuild,v 1.6 2010/05/23 18:51:36 pacho Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/navi2ch/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/navi2ch/navi2ch-1.8.4.ebuild b/app-emacs/navi2ch/navi2ch-1.8.4.ebuild
index 34be7373b409..d3d17f92abec 100644
--- a/app-emacs/navi2ch/navi2ch-1.8.4.ebuild
+++ b/app-emacs/navi2ch/navi2ch-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/navi2ch/navi2ch-1.8.4.ebuild,v 1.4 2012/02/05 18:21:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/navi2ch/navi2ch-1.8.4.ebuild,v 1.3 2011/12/11 09:26:31 phajdan.jr Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/navi2ch/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 98018bd9864a..afd88254d739 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,2 +1,3 @@
DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
+DIST ocaml-3.12.0.tar.bz2 2639049 RMD160 3d10d5f7431d8200688fa74122e7ed528126a0fa SHA1 33ebbfb1115806f117808f37e40d206c8994943d SHA256 17811756209ec9658e1027b0d3b8e5dedb772ca1c43e0bdfa630a2a183ffec3b
DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.0.ebuild
new file mode 100644
index 000000000000..c5cb7eab5a8c
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.0.ebuild,v 1.1 2011/01/19 17:37:03 ulm Exp $
+
+EAPI=3
+
+inherit elisp
+
+MY_P=${P/-mode/}
+
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README README.itz"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
index 92c940458d20..92c417924d5c 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild,v 1.7 2012/01/15 19:00:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild,v 1.1 2011/11/21 13:14:10 ulm Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
S="${WORKDIR}/${MY_P}/emacs"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 49b7a41b0b68..6d19b67207ec 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,4 +1,3 @@
DIST org-6.36c.tar.gz 2706358 RMD160 bc745e506712619a03f0b296ac606a5cc7ad81c9 SHA1 56d55f8c751248100aabbc3109495af31ccf277f SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0
+DIST org-7.5.tar.gz 2897817 RMD160 8fa7de0454cddf690e71ac00e8f6a4bcb3ab0606 SHA1 935392f885a6a6cbb3912aaffe55f3eaeaea2472 SHA256 978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b
DIST org-7.7.tar.gz 3248717 RMD160 7d87fc763c942d25dd65f8a0851bab3b7011c008 SHA1 214b4b66f573686d72dd1f829d1f639dd7d1ff7d SHA256 6df7633ec40231f466b436c5e63b03a62c585d3fe0e53838a2cd7c18c68e7f26
-DIST org-7.8.02.tar.gz 3272089 RMD160 a5e071324b7ffec1e8d72e16713dfbc038a7cb74 SHA1 08caeabdc4514187193f93d42f656e7fa6f24013 SHA256 c97c7e50d80424e3c3ffdd1cdd6c597be815b7450bb02da0e661a3d3cafb3f19
-DIST org-7.8.03.tar.gz 3288565 RMD160 f1ad226d2ec2d99ddf6f793f45bb140042b014be SHA1 731809e4b6732e50a2b5a4b0ecba61123ffe3420 SHA256 49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el
deleted file mode 100644
index 0400fc728e8a..000000000000
--- a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-(require 'org-install)
-(setq org-odt-styles-dir "@SITEETC@/styles")
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el
deleted file mode 100644
index adaaf28f996a..000000000000
--- a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-(require 'org-install)
-(setq org-odt-data-dir "@SITEETC@")
diff --git a/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch b/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch
deleted file mode 100644
index 09b4fc48d9c6..000000000000
--- a/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/396269
-Install OpenDocument style files.
-
-Makefile patch from upstream git repo,
-commit e514982ae126c058b965dd00393b4e68e5f8522d by Dave Marquardt.
-
---- org-7.8.02-orig/Makefile
-+++ org-7.8.02/Makefile
-@@ -19,6 +19,12 @@
- # Where local lisp files go.
- lispdir = $(prefix)/share/emacs/site-lisp
-
-+# Where etc files go
-+etcdir = $(lispdir)/../etc
-+
-+# Where style files go
-+stylesdir = $(etcdir)/styles
-+
- # Where info files go.
- infodir = $(prefix)/share/info
-
-@@ -175,6 +181,7 @@
- CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
- TEXIFILES = doc/org.texi
- INFOFILES = doc/org
-+STYLESFILES = etc/styles/OrgOdtContentTemplate.xml etc/styles/OrgOdtStyles.xml
-
- # Package Manager (ELPA)
- PKG_TAG = $(shell date +%Y%m%d)
-@@ -211,7 +218,7 @@
-
- compile: $(ELCFILES0) $(ELCBFILES)
-
--install: install-lisp
-+install: install-lisp install-etc
-
- doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
-
-@@ -231,6 +238,10 @@
- $(CP) $(INFOFILES) $(infodir)
- $(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
-
-+install-etc: $(STYLESFILES)
-+ if [ ! -d $(stylesdir) ]; then $(MKDIR) $(stylesdir); else true; fi ;
-+ $(CP) $(STYLESFILES) $(stylesdir)
-+
- autoloads: lisp/org-install.el
-
- lisp/org-install.el: $(LISPFILES0) Makefile
---- org-7.8.02-orig/lisp/org-odt.el
-+++ org-7.8.02/lisp/org-odt.el
-@@ -76,7 +76,7 @@
- "Regular expressions for special string conversion.")
-
- (defconst org-odt-lib-dir (file-name-directory load-file-name))
--(defconst org-odt-styles-dir
-+(defvar org-odt-styles-dir
- (let* ((styles-dir1 (expand-file-name "../etc/styles/" org-odt-lib-dir))
- (styles-dir2 (expand-file-name "./etc/styles/" org-odt-lib-dir))
- (styles-dir
diff --git a/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch b/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch
deleted file mode 100644
index 918727f03aeb..000000000000
--- a/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Don't re-compile org-odt.el at install time.
-Patch submitted upstream:
-http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00005.html
-
---- org-7.8.03-orig/Makefile
-+++ org-7.8.03/Makefile
-@@ -247,14 +247,10 @@
- g:
- ${MAKE} pdf && open doc/orgguide.pdf
-
--# Always force re-compilation of org-odt
--lisp/org-odt.elc: org-odt-data-dir
--org-odt-data-dir:
--
- # Sleight of hand to "hard code" the value of $(datadir) in
- # org-odt.el. See variables `org-odt-styles-dir-list' and
- # `org-odt-schema-dir-list'.
--install-lisp: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))"
-+lisp/org-odt.elc: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))"
-
- install-lisp: $(LISPFILES) $(ELCFILES)
- if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
diff --git a/app-emacs/org-mode/org-mode-7.5.ebuild b/app-emacs/org-mode/org-mode-7.5.ebuild
new file mode 100644
index 000000000000..7069225e55f9
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-7.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.5.ebuild,v 1.7 2011/06/19 16:03:41 armin76 Exp $
+
+EAPI=4
+NEED_EMACS=22
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="http://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
+IUSE="contrib"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ # Remove autoload file to make sure that it is regenerated with
+ # the right Emacs version.
+ rm -f lisp/org-install.el
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake \
+ prefix="${ED}/usr" \
+ lispdir="${ED}${SITELISP}/${PN}" \
+ infodir="${ED}/usr/share/info" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ doinfo doc/org
+ dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+ if use contrib; then
+ elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
+ insinto /usr/share/doc/${PF}/contrib
+ doins -r contrib/README contrib/babel contrib/scripts
+ find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+ -exec rm -f '{}' '+'
+ fi
+}
diff --git a/app-emacs/org-mode/org-mode-7.7.ebuild b/app-emacs/org-mode/org-mode-7.7.ebuild
index 82f45de46ff9..d0d7cc33932b 100644
--- a/app-emacs/org-mode/org-mode-7.7.ebuild
+++ b/app-emacs/org-mode/org-mode-7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.7.ebuild,v 1.6 2012/01/06 16:44:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.7.ebuild,v 1.2 2011/10/09 10:26:59 ulm Exp $
EAPI=4
NEED_EMACS=22
@@ -13,15 +13,18 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT as-is )"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
IUSE="contrib"
S="${WORKDIR}/org-${PV}"
-# Remove autoload file to make sure that it is regenerated with
-# the right Emacs version.
-ELISP_REMOVE="lisp/org-install.el"
SITEFILE="50${PN}-gentoo.el"
+src_prepare() {
+ # Remove autoload file to make sure that it is regenerated with
+ # the right Emacs version.
+ rm -f lisp/org-install.el
+}
+
src_compile() {
default
}
diff --git a/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild b/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild
deleted file mode 100644
index a3c7c0c91a6b..000000000000
--- a/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild
+++ /dev/null
@@ -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-emacs/org-mode/org-mode-7.8.02-r1.ebuild,v 1.1 2012/01/01 19:16:30 ulm Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT as-is )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
-IUSE="contrib"
-
-S="${WORKDIR}/org-${PV}"
-ELISP_PATCHES="${P}-odt-styles.patch"
-# Remove autoload file to make sure that it is regenerated with
-# the right Emacs version.
-ELISP_REMOVE="lisp/org-install.el"
-SITEFILE="50${PN}-gentoo-${PV}.el"
-
-src_compile() {
- default
-}
-
-src_install() {
- emake \
- prefix="${ED}/usr" \
- lispdir="${ED}${SITELISP}/${PN}" \
- etcdir="${ED}${SITEETC}/${PN}" \
- infodir="${ED}/usr/share/info" \
- install
-
- cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
- if use contrib; then
- elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
- insinto /usr/share/doc/${PF}/contrib
- doins -r contrib/README contrib/babel contrib/odt contrib/scripts
- find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
- -exec rm -f '{}' '+'
- # add the contrib subdirectory to load-path
- sed -ie 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
- "${T}/${SITEFILE}" || die
- fi
-
- elisp-site-file-install "${T}/${SITEFILE}" || die
- doinfo doc/org
- dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild b/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild
deleted file mode 100644
index e41a3c9c0d7c..000000000000
--- a/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild
+++ /dev/null
@@ -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-emacs/org-mode/org-mode-7.8.03-r1.ebuild,v 1.1 2012/01/05 07:31:45 ulm Exp $
-
-EAPI=4
-NEED_EMACS=22
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT as-is )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
-IUSE="contrib"
-
-S="${WORKDIR}/org-${PV}"
-ELISP_PATCHES="${P}-Makefile.patch"
-# Remove autoload file to make sure that it is regenerated with
-# the right Emacs version.
-ELISP_REMOVE="lisp/org-install.el"
-SITEFILE="50${PN}-gentoo-${PV}.el"
-
-src_compile() {
- emake datadir="${SITEETC}/${PN}"
-}
-
-src_install() {
- emake \
- prefix="${ED}/usr" \
- lispdir="${ED}${SITELISP}/${PN}" \
- datadir="${ED}${SITEETC}/${PN}" \
- infodir="${ED}/usr/share/info" \
- install
-
- cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
- if use contrib; then
- elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
- insinto /usr/share/doc/${PF}/contrib
- doins -r contrib/README contrib/babel contrib/odt contrib/scripts
- find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
- -exec rm -f '{}' '+'
- # add the contrib subdirectory to load-path
- sed -ie 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
- "${T}/${SITEFILE}" || die
- fi
-
- elisp-site-file-install "${T}/${SITEFILE}" || die
- doinfo doc/org
- dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/psgml/psgml-1.2.5-r1.ebuild b/app-emacs/psgml/psgml-1.2.5-r1.ebuild
index 9449c516c65f..882d47436190 100644
--- a/app-emacs/psgml/psgml-1.2.5-r1.ebuild
+++ b/app-emacs/psgml/psgml-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/psgml/psgml-1.2.5-r1.ebuild,v 1.12 2012/02/05 18:20:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/psgml/psgml-1.2.5-r1.ebuild,v 1.11 2009/05/05 08:03:37 fauli Exp $
inherit elisp
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/psgml/"
SRC_URI="mirror://sourceforge/psgml/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="x86 sparc amd64 ppc"
DEPEND="app-text/openjade"
RDEPEND="${DEPEND}"
diff --git a/app-emacs/psgml/psgml-1.3.2.ebuild b/app-emacs/psgml/psgml-1.3.2.ebuild
index c80f60968462..0821d00ddf42 100644
--- a/app-emacs/psgml/psgml-1.3.2.ebuild
+++ b/app-emacs/psgml/psgml-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/psgml/psgml-1.3.2.ebuild,v 1.6 2012/02/05 18:20:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/psgml/psgml-1.3.2.ebuild,v 1.4 2011/12/14 08:51:01 phajdan.jr Exp $
inherit elisp
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/psgml/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
DEPEND="app-text/openjade"
diff --git a/app-emacs/python-mode/python-mode-5.2.0.ebuild b/app-emacs/python-mode/python-mode-5.2.0.ebuild
index 8eb785e17a53..2678cb4d229d 100644
--- a/app-emacs/python-mode/python-mode-5.2.0.ebuild
+++ b/app-emacs/python-mode/python-mode-5.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.6 2012/01/06 16:40:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.5 2011/12/04 15:49:44 armin76 Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ~ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
S="${WORKDIR}/${PN}"
diff --git a/app-emacs/rudel/rudel-0.3_pre20110721.ebuild b/app-emacs/rudel/rudel-0.3_pre20110721.ebuild
index 17ba4704ea6e..157eb622a13c 100644
--- a/app-emacs/rudel/rudel-0.3_pre20110721.ebuild
+++ b/app-emacs/rudel/rudel-0.3_pre20110721.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/rudel/rudel-0.3_pre20110721.ebuild,v 1.3 2011/12/26 14:09:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/rudel/rudel-0.3_pre20110721.ebuild,v 1.2 2011/08/23 17:14:37 ulm Exp $
EAPI=4
NEED_EMACS=23
@@ -18,9 +18,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="virtual/emacs-cedet"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
+DEPEND="virtual/emacs-cedet"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index ce558b13edf1..242e0f99948d 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -2,4 +2,3 @@ DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1
DIST vm-8.0.12.tgz 547048 RMD160 b2e0976d349a182111dc928073dbbb9327087f6e SHA1 f7016a33c9ef8b8c291aa0c16ccc73adeb8e7c43 SHA256 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
DIST vm-8.1.0.tgz 689653 RMD160 da17398849b4d6ac10614d504415dad85fdb6f54 SHA1 8c0367c73f14b2fb85a8ea964d8c78db2d927886 SHA256 c9065188c476367f67a76d4441ea69372ab6e321c4fa673156838eebcbf68664
DIST vm-8.1.1.tgz 701429 RMD160 a13383dabe0536e0e19de1abd9acc2e702402a8f SHA1 0d551c47a67f4e1e347896ce3bbde19342669dd2 SHA256 1a40c48027e3ca164415b7054d83f9d00a0236d41d82af0c1816e4a911e869f1
-DIST vm-8.2.0b.tgz 839789 RMD160 d94e96c430cfdd615a4e6afe1b70337a1aad8bb5 SHA1 cd7ba5ad202173a7d44d24f873f8e64811f8eea1 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
deleted file mode 100644
index 554b6634a2ee..000000000000
--- a/app-emacs/vm/files/50vm-gentoo-8.0.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITEETC@")
-(setq vm-image-directory "@SITEETC@")
-(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
index d823436d3bd2..554b6634a2ee 100644
--- a/app-emacs/vm/files/50vm-gentoo.el
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -1,2 +1,4 @@
(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
deleted file mode 100644
index 86608e77c97a..000000000000
--- a/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- vm-8.2.0b-orig/lisp/Makefile.in
-+++ vm-8.2.0b/lisp/Makefile.in
-@@ -96,7 +96,10 @@
- datadir= @datadir@
- datarootdir= @datarootdir@
- lispdir = @lispdir@
-+etcdir= @etcdir@
- pixmapdir= @pixmapdir@
-+docdir = @docdir@
-+infodir = @infodir@
-
- EMACS_PROG = @EMACS_PROG@
- EMACS_FLAVOR = @EMACS_FLAVOR@
-@@ -137,7 +140,7 @@
- "$(EMACS_PROG)" $(FLAGS) -l autoload \
- -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
- echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
-- echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@
-+ echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
- echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@
- echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
- echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
-@@ -168,7 +171,7 @@
- cat $@.tmp >> $@
- echo "(setq features (delete 'vm-autoloads features))" >> $@
- echo "(require 'vm-vars)" >> $@
-- echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
-+ echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@
- echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
- $(RM) $@.tmp
-
diff --git a/app-emacs/vm/vm-8.0.12-r6.ebuild b/app-emacs/vm/vm-8.0.12-r6.ebuild
index 0a7ac8e211df..f0e4e6b9a217 100644
--- a/app-emacs/vm/vm-8.0.12-r6.ebuild
+++ b/app-emacs/vm/vm-8.0.12-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.6 2011/12/29 22:10:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.5 2010/01/11 18:05:51 armin76 Exp $
inherit elisp eutils
@@ -17,7 +17,7 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
RDEPEND="${DEPEND}
ssl? ( net-misc/stunnel )"
-SITEFILE="50${PN}-gentoo-8.0.el"
+SITEFILE="50${PN}-gentoo.el"
src_unpack() {
unpack ${A}
diff --git a/app-emacs/vm/vm-8.1.0.ebuild b/app-emacs/vm/vm-8.1.0.ebuild
index 5dc21a52b5b2..3a867fb0e664 100644
--- a/app-emacs/vm/vm-8.1.0.ebuild
+++ b/app-emacs/vm/vm-8.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0.ebuild,v 1.2 2011/12/29 22:10:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0.ebuild,v 1.1 2010/03/16 11:59:52 ulm Exp $
inherit elisp eutils
@@ -21,7 +21,7 @@ RDEPEND="!app-emacs/u-vm-color
ssl? ( net-misc/stunnel )"
S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
+SITEFILE="50${PN}-gentoo.el"
src_unpack() {
unpack ${A}
diff --git a/app-emacs/vm/vm-8.1.1.ebuild b/app-emacs/vm/vm-8.1.1.ebuild
index 079a1040367b..600bef998047 100644
--- a/app-emacs/vm/vm-8.1.1.ebuild
+++ b/app-emacs/vm/vm-8.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.3 2011/12/29 22:10:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.2 2010/05/23 16:30:03 ulm Exp $
inherit elisp eutils
@@ -21,7 +21,7 @@ RDEPEND="!app-emacs/u-vm-color
ssl? ( net-misc/stunnel )"
S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
+SITEFILE="50${PN}-gentoo.el"
src_unpack() {
unpack ${A}
diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta.ebuild
deleted file mode 100644
index a60f285cb999..000000000000
--- a/app-emacs/vm/vm-8.2.0_beta.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.2.0_beta.ebuild,v 1.1 2011/12/29 22:10:34 ulm Exp $
-
-EAPI=4
-
-inherit elisp eutils
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
- ${DEPEND}
- ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-datadir.patch"
-
- if ! use bbdb; then
- elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
- epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
- fi
-}
-
-src_configure() {
- econf \
- --with-emacs="emacs" \
- --with-lispdir="${SITELISP}/${PN}" \
- --with-etcdir="${SITEETC}/${PN}" \
- --with-docdir="/usr/share/doc/${PF}" \
- $(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
- # delete duplicate documentation
- find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
- -o -type f -exec rm '{}' '+' || die
- rm "${D}/usr/share/doc/${PF}/COPYING" || die
-
- dodoc example.vm
- # NEWS is accessed from lisp and must not be compressed
- docompress -x /usr/share/doc/${PF}/NEWS
-}
diff --git a/app-emacs/yow/Manifest b/app-emacs/yow/Manifest
index 6937f1205f1d..a233d4468b3b 100644
--- a/app-emacs/yow/Manifest
+++ b/app-emacs/yow/Manifest
@@ -1,2 +1 @@
-DIST cookie-1.15-pkg.tar.gz 35035 RMD160 2854a70a6ca08582e39488d757af685aa807c4c4 SHA1 64a95a834bb6d3f6c5743fd7407555c347458b62 SHA256 351e8957b59c057842cf591e683ba8ef58ed8f678bfc2e42aeb5ec0c0f8ab59b
-DIST yow-1.15-21.4_p20020329.patch.gz 1930 RMD160 e7e98da69f75071c1eefdbab0f79c835a5cc3cbb SHA1 347f1c56ad74ba2b7cde955500500edc17bd0a29 SHA256 540400c5a4f674137356f36d63c525489f8977b4e2353c3f6fc838d2e2d509dc
+DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
diff --git a/app-emacs/yow/files/yow-fix-misspellings.patch b/app-emacs/yow/files/yow-fix-misspellings.patch
new file mode 100644
index 000000000000..314eaa9bbd33
Binary files /dev/null and b/app-emacs/yow/files/yow-fix-misspellings.patch differ
diff --git a/app-emacs/yow/yow-21.4_p20020329.ebuild b/app-emacs/yow/yow-21.4_p20020329.ebuild
index 198c3d0e7a1e..4cace4c8cecc 100644
--- a/app-emacs/yow/yow-21.4_p20020329.ebuild
+++ b/app-emacs/yow/yow-21.4_p20020329.ebuild
@@ -1,33 +1,33 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/yow-21.4_p20020329.ebuild,v 1.9 2011/12/27 13:38:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/yow-21.4_p20020329.ebuild,v 1.8 2011/09/10 10:48:17 ulm Exp $
EAPI=4
inherit elisp
-XE_PV="1.15"
+MY_P="emacs-${PV%_p*}"
DESCRIPTION="Zippy the pinhead data base"
HOMEPAGE="http://www.gnu.org/software/emacs/"
-# We used to take the file from the GNU Emacs 21.4 tarball, but 20 MB for one
-# 53 kB file is wasteful. So we take it from app-xemacs/cookie and patch it.
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/cookie-${XE_PV}-pkg.tar.gz
- mirror://gentoo/${PN}-${XE_PV}-${PV}.patch.gz"
+SRC_URI="mirror://gnu/emacs/${MY_P}a.tar.gz"
+# A slightly different version of yow.lines is also included with
+# app-xemacs/cookie, and also with games-misc/fortune-mod which is
+# under a BSD licence.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-S="${WORKDIR}"
-ELISP_PATCHES="${PN}-${XE_PV}-${PV}.patch"
+S="${WORKDIR}/${MY_P}/etc"
+ELISP_PATCHES="${PN}-fix-misspellings.patch"
SITEFILE="50${PN}-gentoo.el"
src_compile() { :; }
src_install() {
insinto "${SITEETC}/${PN}"
- doins etc/yow.lines
+ doins yow.lines
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
}
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index 54c3168587e0..8b07d3f87b9e 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1 +1,2 @@
+DIST zenburn-20090708.el.bz2 8162 RMD160 e0661b066e1a11b9332474440977666651afbf26 SHA1 f9f36d4b2fb6e2feb0174acf386136cc8d32605b SHA256 5b01db657c5120a3ea6179273e41166e66abc6d7732d2ac34c364ce2f2f856f1
DIST zenburn-20110907.el.bz2 6979 RMD160 997cfa80a320af4a72e96d0fb5284621e46d9fcf SHA1 6e8ad7bc274606f752f8f292d25622f3e0a3090d SHA256 b376c33ea3f97678d59b7d8103c352899515f3a6e68ab7f294ab787d9b29abd5
diff --git a/app-emacs/zenburn/zenburn-20090708.ebuild b/app-emacs/zenburn/zenburn-20090708.ebuild
new file mode 100644
index 000000000000..c95ad0260650
--- /dev/null
+++ b/app-emacs/zenburn/zenburn-20090708.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/zenburn/zenburn-20090708.ebuild,v 1.3 2010/05/22 15:55:53 pacho Exp $
+
+inherit elisp
+
+DESCRIPTION="Zenburn color theme for Emacs"
+HOMEPAGE="http://slinky.imukuppi.org/zenburnpage/"
+# taken from: http://www.brockman.se/software/zenburn/zenburn.el
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-emacs/color-theme"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "To enable zenburn by default, initialise it in your ~/.emacs:"
+ elog " (color-theme-zenburn)"
+}
diff --git a/app-emacs/zenburn/zenburn-20110907.ebuild b/app-emacs/zenburn/zenburn-20110907.ebuild
index db234ccb413f..baf22f5de801 100644
--- a/app-emacs/zenburn/zenburn-20110907.ebuild
+++ b/app-emacs/zenburn/zenburn-20110907.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/zenburn/zenburn-20110907.ebuild,v 1.3 2012/01/21 16:28:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/zenburn/zenburn-20110907.ebuild,v 1.1 2011/12/03 08:41:41 ulm Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.el.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-emacs/color-theme"
diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml
index 7e91f8b37ff5..a130b7bb2a71 100644
--- a/app-emulation/aqemu/metadata.xml
+++ b/app-emulation/aqemu/metadata.xml
@@ -6,7 +6,7 @@
Proxy maintainer (CC on bugs)
- andreis.vinogradovs@gmail.com
+ spamslepnoga@inbox.ru
Proxied maintainer (assign bugs)
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
index f3bbd8d45661..71dcfee6ec3d 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.4 2009/03/05 08:38:03 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
index d456314c6a1d..a102ccfcc9d3 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.4 2009/03/05 08:38:03 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
index 7724b63650c9..7f7a312a9560 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.4 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.3 2009/03/05 08:38:03 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
index a006ccfde4ca..ce417e0e5ad7 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.4 2009/07/07 23:02:56 flameeyes Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
elog "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
index 58ede87374bd..b5e6af1d76f7 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.11 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.10 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -36,6 +36,10 @@ pkg_setup() {
&& die "you need to have perl built with USE=ithreads"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
index 02750f87fb5e..1af94686b418 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.10 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.9 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
index 8eabfe9ecbbe..749c51e2b25f 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.8 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.7 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
index 42a29263ff5c..007adfa210c6 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.6 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.5 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
index f849927cf11b..7d50ed3da8d4 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.6 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.5 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
index 53ac6c473d9c..ccb4d77994fe 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.2 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
index 0476b0633779..1357d86c18b9 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.2 2007/12/27 21:30:54 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
index 71d0c070feeb..66bf8bb270be 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
index 941f6b939b1b..71e7442268a2 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
index f5da0baa3922..b04794a52179 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
index 4f46d086a8c8..c707c243fcbf 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.1 2010/04/20 07:51:42 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
index ac8ecf2547d4..18069ae32872 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.1 2010/04/30 13:17:15 vapier Exp $
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,6 +31,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
index 43140f13dd93..3bf60df1d222 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.4 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.3 2011/09/17 20:37:57 vapier Exp $
EAPI="3"
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -35,6 +35,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
index 9fb44d284d04..a620113014e1 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.2 2011/09/17 20:37:57 vapier Exp $
EAPI="3"
-inherit unpacker
+inherit eutils
DESCRIPTION="simplified/streamlined version of wine with commercial support"
HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -35,6 +35,10 @@ pkg_nofetch() {
einfo "and place ${A} in ${DISTDIR}"
}
+src_unpack() {
+ unpack_makeself
+}
+
src_install() {
dodir /opt/cxoffice
cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 51f3461e0ee1..0c7e0649f3e1 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,2 +1,5 @@
+DIST emul-linux-x86-baselibs-20110129.tar.bz2 46349432 RMD160 85bae36a6816c5877594c9202cff0bc2a235e134 SHA1 ab5e6cc0cca0be53a9cddf1ff8c1c400de6d7401 SHA256 1bb2bb6a2550939ee9b40175bac16c5843ebe9927dedba546f26042eef2a9350
+DIST emul-linux-x86-baselibs-20110722.tar.xz 35205244 RMD160 a03a03205494ae62110b67410186dcaea3c6691f SHA1 1af5719d121aaf159ced60d5e4826bf12db997ca SHA256 f0b0f2e77d7e10f49d618b7aaca6e98c09733664f9b70ed39a4ec416924b7069
DIST emul-linux-x86-baselibs-20110928.tar.xz 35553120 RMD160 5b0a661c5d4cf629bac12b4353a44825346651e2 SHA1 1226cfee1380b838be973be6fe1cf869bbd36393 SHA256 f17e5a5077dec400ecdb9041d545aec3f2f4f6915293ef37da83ff9fdc105bc1
-DIST emul-linux-x86-baselibs-20120127.tar.xz 35224884 RMD160 8c6cdc73d7f780f1c01254dd3cab78808b1f2055 SHA1 f5eed895a94eb60ec98262e7b2665e2b4aebeb98 SHA256 542122442f43b88fdd8f29544d35f151fff63df90d16a7dc68bc6893ca5470f5
+DIST libffi-3.0.9-r2.tbz2 92776 RMD160 3e68810397c5358e3c51dcc1832a2c2e9533ccb6 SHA1 2285469a5e4f0a64f6312eb53aa08c8ef5b85700 SHA256 74413b772a7194f169bea8e8fb13b7dad6c00ccd1a5c96741cc1b9176a9f0fc4
+DIST llvm-2.9-r2.tbz2 12505681 RMD160 da87f265191a880aabf7ee30c8b1366f55ae3210 SHA1 1ae8b59ce0b8d8da5cedbb48fee5d78a84ad8107 SHA256 60e88bc6f97c9f9acf67737305759845fea685e2336d40a052a354f1239a7a53
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild
new file mode 100644
index 000000000000..d2e93f56d352
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild,v 1.2 2011/02/12 20:19:02 hwoarang Exp $
+
+inherit emul-linux-x86
+
+LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
+ GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 GPL-3 LGPL-3
+ MIT MPL-1.1 OPENLDAP OpenSoftware openssl OracleDB ZLIB
+ tcp_wrappers_license as-is UoI-NCSA"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="!
-
-
-amd64
-Install pkgconfig files
-
diff --git a/app-emulation/emul-linux-x86-gstplugins/Manifest b/app-emulation/emul-linux-x86-gstplugins/Manifest
deleted file mode 100644
index 31e9d248e90d..000000000000
--- a/app-emulation/emul-linux-x86-gstplugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST emul-linux-x86-gstplugins-20120127.tar.xz 5575244 RMD160 7fcd6a44a820362a9869f850d4aeedb55b3bc966 SHA1 379f8006e03eb77162c0118a5ebf223064389d9f SHA256 29b390a9637f547d883c4647a5a673f3f423e2dfa0660fb07704ae62d71735b5
diff --git a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20120127.ebuild b/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20120127.ebuild
deleted file mode 100644
index a6517ab0a12d..000000000000
--- a/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20120127.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gstplugins/emul-linux-x86-gstplugins-20120127.ebuild,v 1.1 2012/01/27 18:03:08 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-db-${PV}
- ~app-emulation/emul-linux-x86-gtklibs-${PV}
- ~app-emulation/emul-linux-x86-medialibs-${PV}
- ~app-emulation/emul-linux-x86-soundlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gstplugins/metadata.xml b/app-emulation/emul-linux-x86-gstplugins/metadata.xml
deleted file mode 100644
index 3b884cbcf2ee..000000000000
--- a/app-emulation/emul-linux-x86-gstplugins/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-amd64
-Install pkgconfig files
-
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index fb263204d97a..9e53cefdbd16 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-gtklibs-20110129.tar.bz2 6001419 RMD160 46d1cd327a0e3a2bec11c6805121aa251148be69 SHA1 0ec288878d5a22100f056c46f715484902ab5654 SHA256 3ca8bc51f39348296ed51e14221ed2c57c7b3cc7aa998f42f3d024620c47256a
+DIST emul-linux-x86-gtklibs-20110722.tar.xz 4826976 RMD160 c20d694a08aa8342aacf0e55e4ab956806cbf522 SHA1 0d909212b54b46e8df96271134c60c5f22cb0aa1 SHA256 893d6d8741125a615ebf58585dde5af155123f23e5cf499e730d42ee66371ddc
DIST emul-linux-x86-gtklibs-20110928.tar.xz 4783132 RMD160 7baa8042badb97ef0d0fb9f1f12256491e6ae359 SHA1 af03a1a5be483607e0b2c51f3309ef74235fcc52 SHA256 13e0cf9e36f7079f73af513052667eaf7fc2b80b428a2b670fb2c0b64c47a60b
-DIST emul-linux-x86-gtklibs-20120127.tar.xz 6119504 RMD160 0c5d7351814051b908426a7dbad28eab91156a80 SHA1 bfcaf11d92eec9afcffd7f7ee945e743429fb134 SHA256 737999cff634581aae4a311520a410b268116ac18156245354d17d46b964600b
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild
new file mode 100644
index 000000000000..1b40056b907d
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild,v 1.3 2011/03/30 09:05:21 pacho Exp $
+
+inherit emul-linux-x86
+
+LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}
+ ~app-emulation/emul-linux-x86-opengl-${PV}"
+# RDEPEND on opengl stuff shouldn't be needed, but add it anyway until bug #354943 is properly solved
+
+src_unpack() {
+ query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
+ ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
+ emul-linux-x86_src_unpack
+
+ # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
+ mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
+ mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
+ mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
+}
+
+pkg_preinst() {
+ #bug 169058
+ for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
+ [[ -L ${l} ]] && rm -f ${l}
+ done
+}
+
+pkg_postinst() {
+ PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+ if [[ ${ROOT} == "/" ]] ; then
+ einfo "Generating pango modules listing..."
+ mkdir -p ${PANGO_CONFDIR}
+ pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
+ fi
+
+ GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+ einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+ mkdir -p ${GTK2_CONFDIR}
+ gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+ gdk-pixbuf-query-loaders32 > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+ # gdk-pixbuf.loaders should be in their CHOST directories respectively.
+ if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
+ ewarn
+ ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
+ ewarn "multilib systems, please remove it by hand."
+ ewarn
+ fi
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
new file mode 100644
index 000000000000..01935337ed9a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild,v 1.2 2011/08/24 10:01:24 chainsaw Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}
+ ~app-emulation/emul-linux-x86-opengl-${PV}"
+# RDEPEND on opengl stuff shouldn't be needed, but add it anyway until bug #354943 is properly solved
+
+src_prepare() {
+ query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
+ ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
+ emul-linux-x86_src_prepare
+
+ # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
+ mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
+ mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
+ mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
+}
+
+pkg_preinst() {
+ #bug 169058
+ for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
+ [[ -L ${l} ]] && rm -f ${l}
+ done
+}
+
+pkg_postinst() {
+ PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+ if [[ ${ROOT} == "/" ]] ; then
+ einfo "Generating pango modules listing..."
+ mkdir -p ${PANGO_CONFDIR}
+ pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
+ fi
+
+ GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+ einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+ mkdir -p ${GTK2_CONFDIR}
+ gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+ gdk-pixbuf-query-loaders32 > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+ # gdk-pixbuf.loaders should be in their CHOST directories respectively.
+ if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
+ ewarn
+ ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
+ ewarn "multilib systems, please remove it by hand."
+ ewarn
+ fi
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
deleted file mode 100644
index 89f452f842e7..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
+++ /dev/null
@@ -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-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild,v 1.1 2012/01/27 18:04:28 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-xlibs-${PV}"
-
-my_gdk_pixbuf_query_loaders() {
- # causes segfault if set
- unset __GL_NO_DSO_FINALIZER
-
- tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
- # be atomic!
- if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
- cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
- else
- ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
- fi
- rm "${tmp_file}"
-}
-
-src_prepare() {
- query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
- ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
- emul-linux-x86_src_prepare
-
- # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
- mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
- mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
- mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-}
-
-pkg_preinst() {
- #bug 169058
- for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
- [[ -L ${l} ]] && rm -f ${l}
- done
-}
-
-pkg_postinst() {
- PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
- einfo "Generating pango modules listing..."
- mkdir -p ${PANGO_CONFDIR}
- pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules || die
-
- GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
- einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
- mkdir -p ${GTK2_CONFDIR}
- gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
- my_gdk_pixbuf_query_loaders
-
- # gdk-pixbuf.loaders should be in their CHOST directories respectively.
- if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
- ewarn
- ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
- ewarn "multilib systems, please remove it by hand."
- ewarn
- fi
-}
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/Manifest b/app-emulation/emul-linux-x86-gtkmmlibs/Manifest
index 5dc6f3b0355c..2e4f0d2c363f 100644
--- a/app-emulation/emul-linux-x86-gtkmmlibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-gtkmmlibs-20110129.tar.bz2 1668378 RMD160 d7561e68ab50c06554b82fc14cb56c9196053837 SHA1 4b3d6438cce8c71ab54b72c20568710ccf08820e SHA256 afe902fb608e382c58aac47891554d05f160972de88ab014f2b197f181f79d10
+DIST emul-linux-x86-gtkmmlibs-20110722.tar.xz 1275064 RMD160 688323b471f5df33eec48873039ea9a351ea7ae3 SHA1 4934a453f8858ad8b82a4d37012178b441e3c9fb SHA256 bb6d800398583dca8ab18584cd6f28b444a7053bd9b1b0fe219df6eb085e69de
DIST emul-linux-x86-gtkmmlibs-20110928.tar.xz 1302368 RMD160 102df7fe962f7c0186ad8be7cd093b32ffdb2266 SHA1 af34a0d66b32df01aa4c87444b4dd9bf04a14a35 SHA256 fbba5a73a51358da43abf083fb960c1cf3051306225ecfbc030c53a3ec90a48a
-DIST emul-linux-x86-gtkmmlibs-20120127.tar.xz 1322028 RMD160 f7fe482f530cb3f7553e502ca7ca0e4ec106e328 SHA1 1ba5dfc948fb5c62ba571c530a3865a485c25077 SHA256 3e672e37e9f6cbe8c1caee9331403d8921a16544061746e3dd2d726242d9924c
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110129.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110129.ebuild
new file mode 100644
index 000000000000..278d20e9239d
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110129.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110129.ebuild,v 1.1 2011/01/30 11:25:20 pacho Exp $
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1 GPL-2"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-cpplibs-${PV}
+ ~app-emulation/emul-linux-x86-gtklibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110722.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110722.ebuild
new file mode 100644
index 000000000000..af5c952526a6
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110722.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20110722.ebuild,v 1.1 2011/07/22 19:18:42 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1 GPL-2"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-cpplibs-${PV}
+ ~app-emulation/emul-linux-x86-gtklibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20120127.ebuild b/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20120127.ebuild
deleted file mode 100644
index f97471a6cbd7..000000000000
--- a/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20120127.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtkmmlibs/emul-linux-x86-gtkmmlibs-20120127.ebuild,v 1.1 2012/01/27 18:05:37 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 LGPL-2.1 GPL-2"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-cpplibs-${PV}
- ~app-emulation/emul-linux-x86-gtklibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index 9c860ae56b17..16b1338efbd1 100644
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-medialibs-20110129.tar.bz2 14151687 RMD160 dc465373e84f0bcd6d62ece44e8fcefb872aa2f4 SHA1 bfd8affbfb03598b32fa012b961e762fa98293f2 SHA256 eed512a359ffa85ca3b38f6147a1de7af0ab7ef02c0401e589ed5a0af9336d14
+DIST emul-linux-x86-medialibs-20110722.tar.xz 8062260 RMD160 3cf9bdbd6122d4fd618d70ef3b012146393fe5c8 SHA1 06efc852632f3c8847f9120d77a44463af14eaad SHA256 72234642df403757521eb1c0ed4df454d4e4c0e9f9bc13dbcd8d96b21f0e4585
DIST emul-linux-x86-medialibs-20110928.tar.xz 8055424 RMD160 6922687e7328262e89f51b280847495eb0dec54d SHA1 8120b11e6fcb4243f00fb5cc81215e69815ec554 SHA256 687ddb9181a87a789af8bda8135141646ff6f72fb578e75e8b2a75b436b871a7
-DIST emul-linux-x86-medialibs-20120127.tar.xz 10774496 RMD160 f13dab141592dbb783db5a4f7c7ea763cbec3d21 SHA1 c9618c9660fa764e6697e2da1bd603ce17578071 SHA256 b8dba159a2dc988f8efcbcc0008190d994244f098ecaf87e9987cc900ac6d964
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
new file mode 100644
index 000000000000..793e15eb285e
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110129.ebuild,v 1.2 2011/02/12 20:19:41 hwoarang Exp $
+
+inherit emul-linux-x86
+
+LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}
+ !<=app-emulation/emul-linux-x86-sdl-20081109"
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
+
+src_unpack() {
+ # Include all libv4l libs, bug #348277
+ ALLOWED="${S}/usr/lib32/libv4l/"
+ emul-linux-x86_src_unpack
+}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
new file mode 100644
index 000000000000..3d1d96fb7451
--- /dev/null
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110722.ebuild,v 1.2 2011/08/24 10:04:13 chainsaw Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}
+ !<=app-emulation/emul-linux-x86-sdl-20081109"
+PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
+
+src_prepare() {
+ # Include all libv4l libs, bug #348277
+ ALLOWED="${S}/usr/lib32/libv4l/"
+ emul-linux-x86_src_prepare
+}
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
deleted file mode 100644
index 6632266d72aa..000000000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild,v 1.1 2012/01/27 18:07:08 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="GPL-2 GPL-3 LGPL-2 LGPL-2.1 BSD BSD-2 public-domain"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-xlibs-${PV}
- ~app-emulation/emul-linux-x86-db-${PV}
- !<=app-emulation/emul-linux-x86-sdl-20081109"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}
- ~app-emulation/emul-linux-x86-sdl-${PV}"
-# sdl pdep should be dropped once bug #299324 is solved
-
-src_prepare() {
- # Include all libv4l libs, bug #348277
- ALLOWED="${S}/usr/lib32/libv4l/"
- emul-linux-x86_src_prepare
-}
diff --git a/app-emulation/emul-linux-x86-motif/Manifest b/app-emulation/emul-linux-x86-motif/Manifest
index 838034d4193f..a2ec017aea7f 100644
--- a/app-emulation/emul-linux-x86-motif/Manifest
+++ b/app-emulation/emul-linux-x86-motif/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-motif-20110129.tar.bz2 2492359 RMD160 588b3845c94676a791cae33d2997b61cdaa4c298 SHA1 a7c6a7f694737b93f6f2b04c506a82c125fb3686 SHA256 d42f6e60912edd99a5edaa1c74b48913b582a0bf34a566492a5e0d6f0540dcb8
+DIST emul-linux-x86-motif-20110722.tar.xz 1719824 RMD160 daae110d9d11e14a8b2252804420a3adff237b1d SHA1 87a60d52e164650462a16b0b5ae794beaf065fdf SHA256 26c6aafdb6ab4b6a8c43637dc76a8b08562eabd7f61dbe116a33dff3e4e5cbdc
DIST emul-linux-x86-motif-20110928.tar.xz 1705960 RMD160 3328c9449471686471d4f945fa26b630c00b2ce3 SHA1 bf8cb51467b8180a2c803a68d4ed5595a8fd9b6a SHA256 8079f26569ab92e9ed50dd1034c13b3613c1b8bf5ca32563118e7d9e16dffeb0
-DIST emul-linux-x86-motif-20120127.tar.xz 1703444 RMD160 982d02a8ed718f4a7d7df80ddcbb630ebc2a0247 SHA1 b99fca2eed95c89311f603d8f0bb220899e6ec16 SHA256 8bc93cb80200679ced25449684f7f483191ac165e2aa99d7d9eb35724f987f0e
diff --git a/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110129.ebuild b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110129.ebuild
new file mode 100644
index 000000000000..270e64b79680
--- /dev/null
+++ b/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110129.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-motif/emul-linux-x86-motif-20110129.ebuild,v 1.1 2011/01/30 11:30:17 pacho Exp $
+
+inherit emul-linux-x86
+
+LICENSE="MIT MOTIF"
+
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+ !=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+ !=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+ !=app-emulation/emul-linux-x86-baselibs-20110722-r99
+ media-libs/mesa"
+
+src_prepare() {
+ emul-linux-x86_src_prepare
+ rm -f "${S}/usr/lib32/libGL.so" || die
+ rm -f "${S}/usr/lib32/libGL.so.1" || die
+}
+
+pkg_postinst() {
+ # Update GL symlinks
+ eselect opengl set --use-old || die
+ # And the same for mesa (bug #355393)
+ eselect mesa set 32bit --auto || die
+}
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
new file mode 100644
index 000000000000..991863e842db
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20110722.ebuild,v 1.3 2011/09/17 19:04:19 mattst88 Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="BSD LGPL-2 MIT"
+
+KEYWORDS="-* amd64 ~amd64-linux"
+
+DEPEND="app-admin/eselect-opengl
+ >=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+ !=app-admin/eselect-mesa-0.0.9"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
- ! "${T}/44qt4-emul"
+ LDPATH=/usr/lib32/qt4
+ EOF
+ doenvd "${T}/44qt4-emul"
+}
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild
new file mode 100644
index 000000000000..c79f1e06e180
--- /dev/null
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20110722.ebuild,v 1.2 2011/08/24 10:05:55 chainsaw Exp $
+
+EAPI="4"
+
+inherit eutils emul-linux-x86
+
+LICENSE="LGPL-2.1 GPL-3"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-medialibs-${PV}
+ ~app-emulation/emul-linux-x86-xlibs-${PV}"
+
+src_install() {
+ emul-linux-x86_src_install
+
+ # Set LDPATH for not needing x11-libs/qt-core
+ cat <<-EOF > "${T}/44qt4-emul"
+ LDPATH=/usr/lib32/qt4
+ EOF
+ doenvd "${T}/44qt4-emul"
+}
diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20120127.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20120127.ebuild
deleted file mode 100644
index baa59d89ba5e..000000000000
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20120127.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20120127.ebuild,v 1.1 2012/01/27 18:11:47 pacho Exp $
-
-EAPI="4"
-
-inherit eutils emul-linux-x86
-
-LICENSE="LGPL-2.1 GPL-3"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-medialibs-${PV}
- ~app-emulation/emul-linux-x86-opengl-${PV}"
-
-src_install() {
- emul-linux-x86_src_install
-
- # Set LDPATH for not needing x11-libs/qt-core
- cat <<-EOF > "${T}/44qt4-emul"
- LDPATH=/usr/lib32/qt4
- EOF
- doenvd "${T}/44qt4-emul"
-}
diff --git a/app-emulation/emul-linux-x86-sdl/Manifest b/app-emulation/emul-linux-x86-sdl/Manifest
index 6544fd144a5f..eef5967fc226 100644
--- a/app-emulation/emul-linux-x86-sdl/Manifest
+++ b/app-emulation/emul-linux-x86-sdl/Manifest
@@ -1,4 +1,5 @@
+DIST emul-linux-x86-sdl-20110129.tar.bz2 915331 RMD160 7a6db4bad7282d39390e30a9e3b0cec3b34c48b6 SHA1 8aff779ac9b40576146b852578de1bdcd59ec75c SHA256 2cdcdff2b2996b3c71bbe649d16fcad576f1942c013472494fb94743efe2194d
+DIST emul-linux-x86-sdl-20110722.tar.xz 591236 RMD160 c13731bb34a6e3c0683f456076cf346728326e04 SHA1 011d7e0097fccab156bfe759762555d3522ffb2b SHA256 7af06bd3c8cfb02256c3259ed6a6217bc995fe0fcf523c5aefc49727bb882c38
DIST emul-linux-x86-sdl-20110928.tar.xz 590128 RMD160 57cdd3ac31c23dc0fa06f173cb39dfba49410f00 SHA1 8e1338140e45de672b9903721c8ca245f066d0c9 SHA256 d6a534da9482fd0d013211b65b26ea11cb7de0e47e0362f229d40124d4a330e0
-DIST emul-linux-x86-sdl-20120127.tar.xz 579208 RMD160 8105e6598f73fb4cc06b0d9e759090fef1943685 SHA1 1b740a3ac74de9d7cafeed99d2f6c7c135bcdbc8 SHA256 04855b4aece7bb922203158a2c47eb0ac44a864077d78f57993ca9a30fe10254
+DIST libsdl-1.2.14-r6.tbz2 256778 RMD160 9470ebdcdf24839924511af6a34a7b8d326ae619 SHA1 ec73675aaaac0c4be33f29e72859837d7d9e54d7 SHA256 408d4bd8dedd5c8246c2d77a52e8157336ae7948d82c0c342c221f7303135108
DIST libsdl-1.2.14-r6_20110928.tbz2 257178 RMD160 298ce9939c64d6db5a95e162f00ccdb8ba8449f0 SHA1 da84950888cd890571cc501a5638d1d756a75d19 SHA256 9568ffcf9655443d516f45765e309beb653af9491de6bce980a784843c34f7f6
-DIST libsdl-1.2.14-r6_20120127.tbz2 256624 RMD160 cf523300e059728de508d912652e99c8b8912251 SHA1 c69e3b635ccb65817b5d9d73448b96d93b9b732f SHA256 3c7eec40140e013a2bb1865fb7fdb43926d86b77fc43202fce6fe542c7b955fb
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110129.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110129.ebuild
new file mode 100644
index 000000000000..d9fddcb77b5b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110129.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110129.ebuild,v 1.2 2011/02/12 20:20:38 hwoarang Exp $
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1"
+KEYWORDS="-* amd64"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+ ~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-soundlibs-${PV}
+ ~app-emulation/emul-linux-x86-medialibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild
new file mode 100644
index 000000000000..62e902665929
--- /dev/null
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20110722.ebuild,v 1.2 2011/08/24 10:07:17 chainsaw Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="LGPL-2 LGPL-2.1"
+KEYWORDS="-* amd64"
+IUSE="pulseaudio"
+
+SRC_URI="${SRC_URI}
+ !pulseaudio? ( http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libsdl-1.2.14-r6.tbz2 )"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
+ ~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-soundlibs-${PV}[pulseaudio?]
+ ~app-emulation/emul-linux-x86-medialibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20120127.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20120127.ebuild
deleted file mode 100644
index 46aa6090b768..000000000000
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20120127.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20120127.ebuild,v 1.1 2012/01/27 18:12:56 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="LGPL-2 LGPL-2.1"
-KEYWORDS="-* ~amd64"
-IUSE="pulseaudio"
-
-SRC_URI="${SRC_URI}
- !pulseaudio? ( http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libsdl-1.2.14-r6_${PV}.tbz2 )"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
- ~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-soundlibs-${PV}[pulseaudio?]
- ~app-emulation/emul-linux-x86-medialibs-${PV}"
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 680e6f9f39ae..d638e67826f1 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-soundlibs-20110129.tar.bz2 10058759 RMD160 8eb58fe3b980f108f36eeb21fb20b8e3834bb7af SHA1 ea7a34656c4f891f16334805e8e5c4fe858ce9bf SHA256 6389ca8afb89b65b778e5fbf255afb7141616b231d2301b1fc88f3ac2740e6e5
+DIST emul-linux-x86-soundlibs-20110722.tar.xz 6108620 RMD160 f81b8d051c84c94bdfe479510cc647b8270fbe5e SHA1 951a06e12fd00e4a122c43b2fac461436c37d532 SHA256 80347d4138ba86b56a1134a570dfbfbed1e29bcdb5c78ae4909daa5840476f87
DIST emul-linux-x86-soundlibs-20110928.tar.xz 5900108 RMD160 0bb6e2a330ea648a1dec021a5ec39c48445d2042 SHA1 22514fb7ce241cd3a54a31fa44be35ed5b0943dc SHA256 f6c4c688b8582aa44aa550df7a7f344e7f902b60127182411974ae4d07238323
-DIST emul-linux-x86-soundlibs-20120127.tar.xz 6459848 RMD160 782c4297d2b1b4a2fe0ce6a4d459c271b53c89b8 SHA1 435b7c8ff7fd5d5b8065350159dba39bdec04fe5 SHA256 bd705e6a633b0f96f667615070c7f6f0c569f699c8c4065d9b207c56436c8c9c
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110129.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110129.ebuild
new file mode 100644
index 000000000000..ce2f7f8cdb3b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110129.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110129.ebuild,v 1.2 2011/02/12 20:20:57 hwoarang Exp $
+
+inherit emul-linux-x86
+
+LICENSE="as-is BSD FDL-1.2 GPL-2 LGPL-2 LGPL-2.1 gsm public-domain"
+KEYWORDS="-* amd64"
+IUSE="${IUSE} alsa pulseaudio"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+ ~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-medialibs-${PV}"
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_unpack() {
+ _ALLOWED="${S}/etc/env.d"
+ use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+ ALLOWED="(${_ALLOWED})"
+
+ emul-linux-x86_src_unpack
+
+ if use alsa; then
+ mv -f "${S}"/usr/bin/aoss{,32} || die
+ fi
+
+ # libs without the rest of pulseaudio cause problems, bug 302003
+ if ! use pulseaudio; then
+ rm -rf $(find "${S}" -name '*pulse*' -not -name '*impulse*') || die
+ fi
+}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild
new file mode 100644
index 000000000000..72663b13bf86
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20110722.ebuild,v 1.2 2011/08/24 10:03:51 chainsaw Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="as-is BSD FDL-1.2 GPL-2 LGPL-2 LGPL-2.1 gsm public-domain"
+KEYWORDS="-* amd64"
+IUSE="alsa pulseaudio"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+ ~app-emulation/emul-linux-x86-baselibs-${PV}
+ ~app-emulation/emul-linux-x86-medialibs-${PV}"
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+ _ALLOWED="${S}/etc/env.d"
+ use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+ ALLOWED="(${_ALLOWED})"
+
+ emul-linux-x86_src_prepare
+
+ if use alsa; then
+ mv -f "${S}"/usr/bin/aoss{,32} || die
+ fi
+
+ # libs without the rest of pulseaudio cause problems, bug 302003
+ if ! use pulseaudio; then
+ rm -rf $(find "${S}" -name '*pulse*' -not -name '*impulse*') || die
+ fi
+}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120127.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120127.ebuild
deleted file mode 100644
index 6753f43f6b6e..000000000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120127.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120127.ebuild,v 1.1 2012/01/27 18:14:12 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="as-is BSD FDL-1.2 GPL-2 LGPL-2 LGPL-2.1 gsm public-domain"
-KEYWORDS="-* ~amd64"
-IUSE="alsa pulseaudio"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- ~app-emulation/emul-linux-x86-baselibs-${PV}
- ~app-emulation/emul-linux-x86-medialibs-${PV}"
-
-QA_DT_HASH="usr/lib32/.*"
-
-src_prepare() {
- _ALLOWED="${S}/etc/env.d"
- use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
- ALLOWED="(${_ALLOWED})"
-
- emul-linux-x86_src_prepare
-
- if use alsa; then
- mv -f "${S}"/usr/bin/aoss{,32} || die
- fi
-
- # libs without the rest of pulseaudio cause problems, bug 302003
- if ! use pulseaudio; then
- rm -rf $(find "${S}" -name '*pulse*' -not -name '*impulse*') || die
- fi
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 933955f2050d..7581752079ea 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,2 +1,3 @@
+DIST emul-linux-x86-xlibs-20110129.tar.bz2 3284957 RMD160 54423b9d515673dd90e65c1f63b27a362aa4e417 SHA1 0c45a66dcf0de0702d5d7813fa00fa967c242031 SHA256 cd3fc5f06af77568e1de1458d537ccecfef9032197644baf646703584f30b315
+DIST emul-linux-x86-xlibs-20110722.tar.xz 2647664 RMD160 0d77fbc4fda6110c40497599d1c0e855d833ff5e SHA1 b9f194909df83e488464930d9aac179b780fc507 SHA256 d1fedacbe4820c7198bda51ce8aaf5aa1fb8e61024347db3b1ee49827625287e
DIST emul-linux-x86-xlibs-20110928.tar.xz 2498680 RMD160 290413ad9ebf61584beb350f4fd5fd3b6b5d2cba SHA1 fe60dfdb860db39e95b59798aea84cb3c9b4cf83 SHA256 c86d0a868c0cda2a86893a1dfe0eb5a00d61e4da0a4e63928a5146df843ba702
-DIST emul-linux-x86-xlibs-20120127.tar.xz 2471124 RMD160 6015c93f07039e6d62efb0171ae3e738c9345518 SHA1 9503d21c31c17a076b06650e254c85b04a2379df SHA256 63f1997536015acee9f6b0d28cc3e472c8d985709f53d08da86a4ea4e30c8aa3
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110129.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110129.ebuild
new file mode 100644
index 000000000000..d1aef33714a3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110129.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110129.ebuild,v 1.2 2011/02/12 20:21:16 hwoarang Exp $
+
+inherit emul-linux-x86
+
+LICENSE="FTL GPL-2 MIT"
+
+KEYWORDS="-* amd64"
+IUSE="${IUSE} opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ x11-libs/libX11
+ opengl? ( app-emulation/emul-linux-x86-opengl )"
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild
new file mode 100644
index 000000000000..f3493e2beac1
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20110722.ebuild,v 1.2 2011/08/24 09:57:47 chainsaw Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="FTL GPL-2 MIT"
+
+KEYWORDS="-* amd64"
+IUSE="opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ x11-libs/libX11
+ opengl? ( app-emulation/emul-linux-x86-opengl )"
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild
deleted file mode 100644
index 7e642c191c78..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20120127.ebuild,v 1.1 2012/01/27 18:15:13 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-LICENSE="FTL GPL-2 MIT"
-
-KEYWORDS="-* ~amd64"
-IUSE="opengl"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- x11-libs/libX11
- opengl? ( app-emulation/emul-linux-x86-opengl )"
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild
index 467c03648a98..fd068d139ead 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild,v 1.2 2012/02/03 14:47:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti-instance-image/ganeti-instance-image-0.5.1.ebuild,v 1.1 2011/05/26 16:44:29 ramereth Exp $
EAPI=2
@@ -19,7 +19,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
diff --git a/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch b/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch
deleted file mode 100644
index d7e7ebebce47..000000000000
--- a/app-emulation/kqemu/files/kqemu-1.4.0_pre1-remove-smp_lock.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-With BKL gone away from linux.
-
-Patch fixes build failure against stable kernel:
- CC [M] kqemu-1.4.0pre1/kqemu-linux.o
- kqemu-1.4.0pre1/kqemu-linux.c:27:28: error: linux/smp_lock.h: No such file or directory
-
-Bug-URL: http://bugs.gentoo.org/368439
-Reported-by: Ian Abbott
-Patch-by: c.exe@gmx.de
-
-diff --git a/kqemu-linux.c b/kqemu-linux.c
-index f7246f1..c476d28 100644
---- a/kqemu-linux.c
-+++ b/kqemu-linux.c
-@@ -24,7 +24,9 @@
- #include
- #include
- #include
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
- #include
-+#endif
- #include
- #include
- #include
diff --git a/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild
index b6be4bba39cc..4daf70144aba 100644
--- a/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild
+++ b/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild,v 1.6 2012/01/21 20:49:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.4.0_pre1-r1.ebuild,v 1.4 2011/03/24 19:48:14 angelos Exp $
inherit eutils flag-o-matic linux-mod toolchain-funcs
@@ -42,11 +42,10 @@ src_unpack() {
-i common/Makefile
epatch "${FILESDIR}/${P}-missing-sched-header.patch"
epatch "${FILESDIR}"/${P}-init_MUTEX.patch
- epatch "${FILESDIR}"/${P}-remove-smp_lock.patch #368439
}
src_compile() {
- filter-flags -fpie -fstack-protector -ftracer #263837
+ filter-flags -fpie -fstack-protector
./configure --kernel-path="${KV_DIR}" \
--cc="$(tc-getCC)" \
diff --git a/app-emulation/lib765/lib765-0.4.2.ebuild b/app-emulation/lib765/lib765-0.4.2.ebuild
index 79ea3faf3868..1d42aa58bd25 100644
--- a/app-emulation/lib765/lib765-0.4.2.ebuild
+++ b/app-emulation/lib765/lib765-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lib765/lib765-0.4.2.ebuild,v 1.4 2011/12/19 16:57:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lib765/lib765-0.4.2.ebuild,v 1.2 2010/09/28 21:00:32 jer Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.seasip.demon.co.uk/Unix/LibDsk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="libdsk static-libs"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="libdsk? ( app-emulation/libdsk )"
RDEPEND="${DEPEND}"
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 343aaf12c6b9..2564618339de 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,2 +1,2 @@
DIST libguestfs-1.7.18-x86_64.tar.gz 62332840 RMD160 202ac5883d1453d6225b76029290ccebd44c7e84 SHA1 661786c088fad8d2354e8121a2fafb1d598587fc SHA256 07c4f0b4b50df7407327333d9e9b09c310265d056868531c69659659a9f5218d
-DIST libguestfs-1.8.16.tar.gz 5164608 RMD160 eec0d8875f02e007f5dcbce629ddf00c0ee609af SHA1 24a9aa8c2a8226438a6613a9a12a4d467404d1e6 SHA256 7d8fb8529f201d81761bd383ea567d752f54471a1b5b5903fe553440cbe7755f
+DIST libguestfs-1.8.15.tar.gz 5161269 RMD160 09b3f3d22032c3bdaedb813a367676d812c35450 SHA1 4ad8a8875105754834a2c887db39e49800b755bb SHA256 b57dd3d31a6ed78a1aee7b4eaf64a9c476c49ac46602aee7daa6b642cb23fad3
diff --git a/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch b/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch
deleted file mode 100644
index e9103c6d4422..000000000000
--- a/app-emulation/libguestfs/files/1.8/1.8.16/0001-configure_ac_automagic_patch.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-# HG changeset patch
-# User Andreis Vinogradovs
-# Date 1325421041 -7200
-# Node ID ba14909c0a95bf9879e6df25d8128d1cf9a75252
-# Parent c9bc634a526984160a40b70f71895de0a855f4c0
-configure_ac_automagic.patch
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -217,6 +217,10 @@
- if test -f /etc/arch-release; then
- DISTRO=ARCHLINUX
- fi
-+ dnl Slepnoga for Gentoo
-+ if test -f /etc/gentoo-release; then
-+ DISTRO=GENTOO
-+ fi
- AC_MSG_RESULT([$DISTRO])
- AC_SUBST([DISTRO])
- fi
-@@ -461,7 +465,7 @@
- AC_DEFINE([HAVE_LIBMAGIC],[1],[libmagic found at compile time.])
- ], [])
- ],
-- [AC_MSG_WARN([libmagic not found, some core features will be disabled])])
-+ [AC_MSG_FAILURE([libmagic not found, some core features will be disabled])])
-
- dnl Check for PCRE (highly recommended)
- PKG_CHECK_MODULES([PCRE], [libpcre],
-@@ -469,7 +473,7 @@
- AC_SUBST([PCRE_LIBS])
- AC_DEFINE([HAVE_PCRE],[1],[PCRE found at compile time.])
- ],
-- [AC_MSG_WARN([PCRE not found, some core features will be disabled])])
-+ [AC_MSG_FAILURE([PCRE not found, some core features will be disabled])])
-
- dnl libvirt (highly recommended)
- PKG_CHECK_MODULES([LIBVIRT], [libvirt],
-@@ -486,7 +490,7 @@
- AC_SUBST([LIBXML2_LIBS])
- AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
- ],
-- [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
-+ [AC_MSG_FAILURE([libxml2 not found, some core features will be disabled])])
- AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
-
- dnl hivex library (highly recommended)
-@@ -654,13 +658,13 @@
- AM_CONDITIONAL([HAVE_RUBY],
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-
--dnl Check for Java.
--AC_ARG_WITH(java_home,
-- [AS_HELP_STRING([--with-java-home],
-- [specify path to JDK directory @<:@default=check@:>@])],
-- [],
-- [with_java_home=check])
-+AC_ARG_ENABLE([java],
-+ AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
-+ [enable_java=no],
-+ [enable_java=yes])
-
-+AS_IF([test "x$enable_java" = "xyes"],
-+ [
- if test "x$with_java_home" != "xno"; then
- if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
- then
-@@ -756,7 +760,6 @@
- fi
- fi
- AC_MSG_RESULT([$JNI_CFLAGS])
--
- dnl Need extra version flag?
- AC_MSG_CHECKING([extra javac flags])
- JAVAC_FLAGS=
-@@ -791,8 +794,8 @@
- AC_SUBST(JAR_INSTALL_DIR)
- AC_SUBST(JNI_INSTALL_DIR)
- AC_SUBST(JNI_VERSION_INFO)
--
--AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
-+])
-+AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
-
- dnl Check for Haskell (GHC).
- GHC=no
-@@ -849,8 +852,12 @@
-
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+dnl ha-ha, criocamera :) - gentoo kill la files in other way's
-+dnlLIBTOOL='$(SHELL) $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+dnl haha, are stub
-+dnl AC_PROG_LIBTOOL
-+dnl AC_SUBST([LIBTOOL])
-+LT_INIT
-
- dnl Run in subdirs.
- if test "x$enable_daemon" = "xyes"; then
diff --git a/app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch b/app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch
deleted file mode 100644
index 7a83b5a64ec0..000000000000
--- a/app-emulation/libguestfs/files/1.8/1.8.16/0002-disable_php_in_makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Andreis Vinogradovs
-# Date 1325421062 -7200
-# Node ID 8d969d9324fa8f1f5384037627d5478e33be5d47
-# Parent ba14909c0a95bf9879e6df25d8128d1cf9a75252
-disable_php_in_makefile
-
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -57,9 +57,12 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
-+
-+# use Gentoo way to compile/install php extension
-+# due slot system
-+#if HAVE_PHP
-+#SUBDIRS += php
-+#endif
-
- # Unconditional because nothing is built yet.
- SUBDIRS += csharp
diff --git a/app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch b/app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch
deleted file mode 100644
index 1d3dcc628044..000000000000
--- a/app-emulation/libguestfs/files/1.8/1.8.16/0003-hivex_to_hard_error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Andreis Vinogradovs
-# Date 1325421826 -7200
-# Node ID 4bcdef3cca5c867d82c72d4b394b866a3b9f2d95
-# Parent 8d969d9324fa8f1f5384037627d5478e33be5d47
-hivex to hard error
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -501,7 +501,7 @@
- AC_SUBST([HIVEX_LIBS])
- AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
- ],
-- [AC_MSG_WARN([hivex not found, some core features will be disabled])])
-+ [AC_MSG_ERROR([hivex not found, some core features will be disabled])])
-
- dnl FUSE is optional to build the FUSE module.
- AC_ARG_ENABLE([fuse],
diff --git a/app-emulation/libguestfs/libguestfs-1.8.15.ebuild b/app-emulation/libguestfs/libguestfs-1.8.15.ebuild
new file mode 100644
index 000000000000..b4ba3305fafb
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.8.15.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.8.15.ebuild,v 1.2 2011/12/12 03:24:01 mr_bones_ Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="1.11"
+
+JAVA_PKG_OPT_USE="java"
+JAVA_PKG_ALLOW_VM_CHANGE="yes"
+APLANCE_PV="1.7.18"
+PYTHON_DEPEND="python? 2:2.6"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
+PHP_EXT_NAME="guestfs_php"
+USE_PHP="php5-3"
+PHP_EXT_OPTIONAL_USE="php"
+
+inherit autotools bash-completion-r1 confutils versionator java-pkg-opt-2 perl-module python ruby-ng php-ext-source-r2 ghc-package
+
+MY_PV_1="$(get_version_component_range 1-2)"
+MY_PV_2="$(get_version_component_range 2)"
+
+[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Library for accessing and modifying virtual machine (VM) disk images"
+HOMEPAGE="http://libguestfs.org/"
+SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz
+ http://rion-overlay.googlecode.com/files/${PN}-${APLANCE_PV}-x86_64.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Upstream NOT supported 32-bit version, keyword in own risk
+KEYWORDS="~amd64"
+IUSE="fuse +ocaml perl python ruby haskell +readline nls php debug doc nls source javadoc"
+
+COMMON_DEPEND="
+ virtual/perl-Getopt-Long
+ >=dev-perl/Sys-Virt-0.2.4
+ >=app-misc/hivex-1.2.1[perl]
+ dev-perl/libintl-perl
+ dev-perl/String-ShellQuote
+ dev-libs/libpcre
+ app-arch/cpio
+ dev-lang/perl
+ app-cdr/cdrkit
+ >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
+ sys-apps/fakeroot
+ sys-apps/file
+ app-emulation/libvirt
+ dev-libs/libxml2:2
+ =dev-util/febootstrap-3*
+ >=sys-apps/fakechroot-2.8
+ >=app-admin/augeas-0.7.1
+ sys-fs/squashfs-tools
+ perl? ( virtual/perl-ExtUtils-MakeMaker )
+ fuse? ( sys-fs/fuse )
+ readline? ( sys-libs/readline )
+ doc? ( dev-libs/libxml2 )
+ ocaml? ( dev-lang/ocaml
+ dev-ml/findlib
+ dev-ml/xml-light )
+ ruby? ( dev-lang/ruby
+ dev-ruby/rake )
+ java? ( virtual/jre )
+ haskell? ( dev-lang/ghc )"
+
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.6
+ source? ( app-arch/zip ) )
+ doc? ( app-text/po4a )"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.6 )"
+
+PHP_EXT_S="${S}/php/extension"
+
+pkg_setup() {
+ use java && java-pkg-opt-2_pkg_setup
+
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ python_need_rebuild
+ fi
+
+ confutils_use_depend_all source java
+ confutils_use_depend_all javadoc java
+
+ use ruby && ruby-ng_pkg_setup
+ use haskell && ghc-package_pkg_setup
+}
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ cd "${WORKDIR}"
+ mkdir image || die
+ cd image || die
+ unpack libguestfs-${APLANCE_PV}-x86_64.tar.gz
+ cp "${WORKDIR}"/image/usr/local/lib/guestfs/* "${S}"/appliance/ || die
+
+ # part of php-ext-source-r2_src_unpack
+ # whole version cannot be called here as it will attempt to unpack ${A}
+ if use php; then
+ local slot orig_s="${PHP_EXT_S}"
+ for slot in $(php_get_slots); do
+ cp -r "${orig_s}" "${WORKDIR}/${slot}" || die
+ done
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/1.8/${PV}"/configure_ac_automagic.patch
+ epatch "${FILESDIR}/1.8/${PV}"/disable_php_in_makefile.patch
+
+ use java && java-pkg-opt-2_src_prepare
+ eautoreconf
+
+ if use php; then
+ php-ext-source-r2_src_prepare
+ fi
+}
+
+src_configure() {
+
+ # Disable feature test for kvm for more reason
+ # i.e: not loaded module in __build__ time,
+ # build server not supported kvm, etc. ...
+ #
+ # In fact, this feature is virtio support and requires
+ # configured kernel.
+ export vmchannel_test=no
+
+ econf \
+ --with-repo=fedora-12 \
+ --disable-appliance \
+ --disable-daemon \
+ --with-drive-if=virtio \
+ --with-net-if=virtio-net-pci \
+ --disable-rpath \
+ $(use_enable java) \
+ $(use_enable nls) \
+ $(use_with readline) \
+ $(use_enable ocaml ocaml-viewer) \
+ $(use_enable perl) \
+ $(use_enable fuse) \
+ $(use_enable ocaml) \
+ $(use_enable python) \
+ $(use_enable ruby) \
+ $(use_enable haskell) \
+ $(use_with doc po4a)
+
+ if use php; then
+ php-ext-source-r2_src_configure
+ fi
+}
+
+src_compile() {
+ emake || die
+
+ if use php; then
+ php-ext-source-r2_src_compile
+ fi
+}
+
+src_test() {
+ emake -j1 check || die
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install || die
+
+ dodoc BUGS HACKING README RELEASE-NOTES TODO
+
+ dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
+
+ rm -fr "${D}/etc"/bash* || die
+
+ insinto /usr/$(get_libdir)/guestfs/
+ doins "${WORKDIR}/image/usr/local/lib/"guestfs/*
+
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ if use java; then
+ java-pkg_newjar java/${P}.jar ${PN},jar
+ rm -fr "${D}/usr"/share/java
+ rm -fr "${D}/usr"/share/javadoc
+ if use source;then
+ java-pkg_dosrc java/com/redhat/et/libguestfs/*
+ fi
+ if use javadoc;then
+ java-pkg_dojavadoc java/api
+ fi
+ fi
+
+ use perl && fixlocalpod
+ python_clean_installation_image -q
+
+ if use php; then
+ php-ext-source-r2_src_install
+ fi
+}
+
+pkg_preinst() {
+ use java && java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+ use haskell && ghc-package_pkg_postinst
+}
+
+pkg_prerm() {
+ use haskell && ghc-package_pkg_prerm
+}
diff --git a/app-emulation/libguestfs/libguestfs-1.8.16.ebuild b/app-emulation/libguestfs/libguestfs-1.8.16.ebuild
deleted file mode 100644
index 10b4230f7935..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.8.16.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.8.16.ebuild,v 1.2 2012/02/05 01:35:36 floppym Exp $
-
-EAPI="3"
-
-WANT_AUTOMAKE="1.11"
-
-JAVA_PKG_OPT_USE="java"
-JAVA_PKG_ALLOW_VM_CHANGE="yes"
-APLANCE_PV="1.7.18"
-PYTHON_DEPEND="python? 2:2.6"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-PHP_EXT_NAME="guestfs_php"
-USE_PHP="php5-3 php5-4"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit autotools bash-completion-r1 confutils versionator java-pkg-opt-2 perl-module python ruby-ng php-ext-source-r2 ghc-package multilib
-
-MY_PV_1="$(get_version_component_range 1-2)"
-MY_PV_2="$(get_version_component_range 2)"
-
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Library for accessing and modifying virtual machine (VM) disk images"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz
- http://rion-overlay.googlecode.com/files/${PN}-${APLANCE_PV}-x86_64.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Upstream NOT supported 32-bit version, keyword in own risk
-KEYWORDS="~amd64"
-IUSE="fuse +ocaml perl python ruby haskell +readline nls php debug doc nls source javadoc"
-
-COMMON_DEPEND="
- virtual/perl-Getopt-Long
- >=dev-perl/Sys-Virt-0.2.4
- >=app-misc/hivex-1.2.1[perl]
- dev-perl/libintl-perl
- dev-perl/String-ShellQuote
- dev-libs/libpcre
- app-arch/cpio
- dev-lang/perl
- app-cdr/cdrkit
- >=app-emulation/qemu-kvm-0.13[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
- sys-apps/fakeroot
- sys-apps/file
- app-emulation/libvirt
- dev-libs/libxml2:2
- >=sys-apps/fakechroot-2.8
- >=app-admin/augeas-0.7.1
- sys-fs/squashfs-tools
- perl? ( virtual/perl-ExtUtils-MakeMaker )
- fuse? ( sys-fs/fuse )
- readline? ( sys-libs/readline )
- doc? ( dev-libs/libxml2 )
- ocaml? ( dev-lang/ocaml
- dev-ml/findlib
- dev-ml/xml-light )
- ruby? ( dev-lang/ruby
- dev-ruby/rake )
- java? ( virtual/jre )
- haskell? ( dev-lang/ghc )"
-
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.6
- source? ( app-arch/zip ) )
- doc? ( app-text/po4a )"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-PHP_EXT_S="${S}/php/extension"
-
-pkg_setup() {
- use java && java-pkg-opt-2_pkg_setup
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- python_need_rebuild
- fi
-
- confutils_use_depend_all source java
- confutils_use_depend_all javadoc java
-
- use ruby && ruby-ng_pkg_setup
- use haskell && ghc-package_pkg_setup
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
-
- cd "${WORKDIR}"
- mkdir image || die
- cd image || die
- unpack libguestfs-${APLANCE_PV}-x86_64.tar.gz
- cp "${WORKDIR}"/image/usr/local/lib/guestfs/* "${S}"/appliance/ || die
-
- # part of php-ext-source-r2_src_unpack
- # whole version cannot be called here as it will attempt to unpack ${A}
- if use php; then
- local slot orig_s="${PHP_EXT_S}"
- for slot in $(php_get_slots); do
- cp -r "${orig_s}" "${WORKDIR}/${slot}" || die
- done
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/1.8/${PV}"/000*.patch
-
- use java && java-pkg-opt-2_src_prepare
- eautoreconf
-
- if use php; then
- php-ext-source-r2_src_prepare
- fi
-}
-
-src_configure() {
-
- # Disable feature test for kvm for more reason
- # i.e: not loaded module in __build__ time,
- # build server not supported kvm, etc. ...
- #
- # In fact, this feature is virtio support and requires
- # configured kernel.
- export vmchannel_test=no
-
- econf \
- --with-repo=fedora-12 \
- --disable-appliance \
- --disable-daemon \
- --with-drive-if=virtio \
- --with-net-if=virtio-net-pci \
- --disable-rpath \
- $(use_enable java) \
- $(use_enable nls) \
- $(use_with readline) \
- $(use_enable ocaml ocaml-viewer) \
- $(use_enable perl) \
- $(use_enable fuse) \
- $(use_enable ocaml) \
- $(use_enable python) \
- $(use_enable ruby) \
- $(use_enable haskell) \
- $(use_with doc po4a)
-
- if use php; then
- php-ext-source-r2_src_configure
- fi
-}
-
-src_compile() {
- emake || die
-
- if use php; then
- php-ext-source-r2_src_compile
- fi
-}
-
-src_test() {
- emake -j1 check || die
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install || die
-
- dodoc BUGS HACKING README RELEASE-NOTES TODO
-
- dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
-
- rm -fr "${D}/etc"/bash* || die
-
- insinto /usr/$(get_libdir)/guestfs/
- doins "${WORKDIR}/image/usr/local/lib/"guestfs/*
-
- find "${D}" -name '*.la' -exec rm -f '{}' +
- if use java; then
- java-pkg_newjar java/${P}.jar ${PN},jar
- rm -fr "${D}/usr"/share/java
- rm -fr "${D}/usr"/share/javadoc
- if use source;then
- java-pkg_dosrc java/com/redhat/et/libguestfs/*
- fi
- if use javadoc;then
- java-pkg_dojavadoc java/api
- fi
- fi
-
- use perl && fixlocalpod
- python_clean_installation_image -q
-
- if use php; then
- php-ext-source-r2_src_install
- fi
-}
-
-pkg_preinst() {
- use java && java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
- use haskell && ghc-package_pkg_postinst
-}
-
-pkg_prerm() {
- use haskell && ghc-package_pkg_prerm
-}
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 567ca05cb58a..2421701d0fd7 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -3,7 +3,7 @@
proxy-maintainers
- andreis.vinogradovs@gmail.com
+ spamslepnoga@inbox.ru
Andreis Vinogradovs
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 70491dc798b8..e3139d7bbf47 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1 +1 @@
-DIST libvirt-glib-0.0.4.tar.gz 530282 RMD160 c5096405f2228029c5ddd56ea3b85501a4b93fe5 SHA1 fe75b70e47957d4e2810bfb271e4d16537211882 SHA256 28e9785a5329ef9ebd97c70ce018d3810a79a495a7a2ae52fe6d1bbdeeb5b7c3
+DIST libvirt-glib-0.0.1.tar.gz 461603 RMD160 e19557f9b93c7c402cf7646ccb6eaa7c58e3f85f SHA1 d3853fd357ff1f0b28da16db6ec6247ab4ad1567 SHA256 58ad71082579b6fc0b42da0c65a8fe1e7e6ce3dcc1b0a92549616aa1d88fbb2a
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.0.1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.0.1.ebuild
new file mode 100644
index 000000000000..3f091f0e7605
--- /dev/null
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.0.1.ebuild,v 1.3 2011/11/18 19:17:54 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 python
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
+SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection python +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ dev-libs/libxml2:2
+ >=app-emulation/libvirt-0.9.4
+ >=dev-libs/glib-2.10:2
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ vala? ( dev-lang/vala:0.14 )"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ G2CONF="--disable-test-coverage
+ VAPIGEN=$(type -P vapigen-0.14)
+ $(use_enable introspection)
+ $(use_enable vala)
+ $(use_with python)"
+
+ python_set_active_version 2
+ python_pkg_setup
+}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.0.4.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.0.4.ebuild
deleted file mode 100644
index a66db85d7980..000000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-0.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.0.4.ebuild,v 1.1 2012/01/15 04:26:54 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection python +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# 0.9.8 is needed for VIR_DOMAIN_EVENT_SHUTDOWN
-RDEPEND="
- dev-libs/libxml2:2
- >=app-emulation/libvirt-0.9.8
- >=dev-libs/glib-2.10:2
- introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.10 )
- vala? ( dev-lang/vala:0.14 )"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="--disable-test-coverage
- VAPIGEN=$(type -P vapigen-0.14)
- $(use_enable introspection)
- $(use_enable vala)
- $(use_with python)"
-
- python_set_active_version 2
- python_pkg_setup
-}
diff --git a/app-emulation/libvirt-sandbox/Manifest b/app-emulation/libvirt-sandbox/Manifest
deleted file mode 100644
index ff6fdda44f38..000000000000
--- a/app-emulation/libvirt-sandbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libvirt-sandbox-0.0.2.tar.gz 428164 RMD160 0b2271be03e73f309931926b8d3084ad2260c6e3 SHA1 734191966668101ca06b0b38c79c885a7917efbb SHA256 323160948e5f797a1bb159890cc5c8a456e6549ae404641474376a7a3affb310
diff --git a/app-emulation/libvirt-sandbox/libvirt-sandbox-0.0.2.ebuild b/app-emulation/libvirt-sandbox/libvirt-sandbox-0.0.2.ebuild
deleted file mode 100644
index 016043dfd753..000000000000
--- a/app-emulation/libvirt-sandbox/libvirt-sandbox-0.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-sandbox/libvirt-sandbox-0.0.2.ebuild,v 1.1 2012/01/26 07:54:58 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library for building application sandboxes using libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-sandbox.git"
-SRC_URI="ftp://libvirt.org/libvirt/sandbox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection static-libs"
-
-RDEPEND="
- >=dev-libs/glib-2.28:2
- >=app-emulation/libvirt-glib-0.0.4
- introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- sys-devel/gettext
- doc? ( >=dev-util/gtk-doc-1.10 )"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="--disable-test-coverage
- $(use_enable static-libs static)
- $(use_enable introspection)"
-}
diff --git a/app-emulation/libvirt-sandbox/metadata.xml b/app-emulation/libvirt-sandbox/metadata.xml
deleted file mode 100644
index 0b6b5da045eb..000000000000
--- a/app-emulation/libvirt-sandbox/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-gnome
-
- Use dev-libs/gobject-introspection
- for introspection
-
-
diff --git a/app-emulation/libvirt/files/libvirtd.init-r1 b/app-emulation/libvirt/files/libvirtd.init-r1
old mode 100644
new mode 100755
diff --git a/app-emulation/open-vm-tools-kmod/files/fragsize.patch b/app-emulation/open-vm-tools-kmod/files/fragsize.patch
deleted file mode 100644
index 1f85df500884..000000000000
--- a/app-emulation/open-vm-tools-kmod/files/fragsize.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/modules/linux/vmxnet/vmxnet.c b/modules/linux/vmxnet/vmxnet.c
-index a6f5740..3c75bb2 100644
---- a/modules/linux/vmxnet/vmxnet.c
-+++ b/modules/linux/vmxnet/vmxnet.c
-@@ -989,7 +989,7 @@ vmxnet_probe_device(struct pci_dev *pdev, // IN: vmxnet PCI device
- .ndo_start_xmit = &vmxnet_start_tx,
- .ndo_stop = &vmxnet_close,
- .ndo_get_stats = &vmxnet_get_stats,
-- .ndo_set_multicast_list = &vmxnet_set_multicast_list,
-+ .ndo_set_rx_mode = &vmxnet_set_multicast_list,
- .ndo_change_mtu = &vmxnet_change_mtu,
- # ifdef VMW_HAVE_POLL_CONTROLLER
- .ndo_poll_controller = vmxnet_netpoll,
-@@ -2033,21 +2033,23 @@ vmxnet_map_pkt(struct sk_buff *skb,
- offset -= skb_headlen(skb);
-
- for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++){
-+ int fragSize;
- frag = &skb_shinfo(skb)->frags[nextFrag];
-+ fragSize = skb_frag_size(frag);
-
- // skip those frags that are completely copied
-- if (offset >= frag->size){
-- offset -= frag->size;
-+ if (offset >= fragSize){
-+ offset -= fragSize;
- } else {
- // map the part of the frag that is not copied
- dma = pci_map_page(lp->pdev,
-- frag->page,
-+ frag->page.p,
- frag->page_offset + offset,
-- frag->size - offset,
-+ fragSize - offset,
- PCI_DMA_TODEVICE);
-- VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size - offset);
-+ VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize - offset);
- VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d]+%u (%uB)\n",
-- dd->txDriverNext, nextSg, nextFrag, offset, frag->size - offset);
-+ dd->txDriverNext, nextSg, nextFrag, offset, fragSize - offset);
- nextSg++;
- nextFrag++;
-
-@@ -2058,11 +2060,14 @@ vmxnet_map_pkt(struct sk_buff *skb,
-
- // map the remaining frags, we might need to use additional tx entries
- for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++) {
-+ int fragSize;
- frag = &skb_shinfo(skb)->frags[nextFrag];
-+ fragSize = skb_frag_size(frag);
-+
- dma = pci_map_page(lp->pdev,
-- frag->page,
-+ frag->page.p,
- frag->page_offset,
-- frag->size,
-+ fragSize,
- PCI_DMA_TODEVICE);
-
- if (nextSg == VMXNET2_SG_DEFAULT_LENGTH) {
-@@ -2091,9 +2096,9 @@ vmxnet_map_pkt(struct sk_buff *skb,
-
- nextSg = 0;
- }
-- VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size);
-+ VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize);
- VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d] (%uB)\n",
-- dd->txDriverNext, nextSg, nextFrag, frag->size);
-+ dd->txDriverNext, nextSg, nextFrag, fragSize);
- nextSg++;
- }
-
-@@ -2548,7 +2553,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
- if (UNLIKELY(newPage == NULL)) {
- skb_shinfo(skb)->nr_frags = numFrags;
- skb->len += skb->data_len;
-- skb->truesize += skb->data_len;
-+ skb->truesize += PAGE_SIZE;
-
- compat_dev_kfree_skb(skb, FREE_WRITE);
-
-@@ -2558,10 +2563,12 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
- }
-
- pci_unmap_page(pdev, rre2->paddr, PAGE_SIZE, PCI_DMA_FROMDEVICE);
-- skb_shinfo(skb)->frags[numFrags].page = lp->rxPages[dd->rxDriverNext2];
-+ __skb_frag_set_page(&skb_shinfo(skb)->frags[numFrags],
-+ lp->rxPages[dd->rxDriverNext2]);
- skb_shinfo(skb)->frags[numFrags].page_offset = 0;
- skb_shinfo(skb)->frags[numFrags].size = rre2->actualLength;
- skb->data_len += rre2->actualLength;
-+ skb->truesize += PAGE_SIZE;
- numFrags++;
-
- /* refill the buffer */
-@@ -2579,7 +2586,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
- VMXNET_ASSERT(numFrags > 0);
- skb_shinfo(skb)->nr_frags = numFrags;
- skb->len += skb->data_len;
-- skb->truesize += skb->data_len;
-+ skb->truesize += PAGE_SIZE;
- VMXNET_LOG("vmxnet_rx: %dB from rxRing[%d](%dB)+rxRing2[%d, %d)(%dB)\n",
- skb->len, dd->rxDriverNext, skb_headlen(skb),
- firstFrag, dd->rxDriverNext2, skb->data_len);
diff --git a/app-emulation/open-vm-tools-kmod/files/moduleparam.patch b/app-emulation/open-vm-tools-kmod/files/moduleparam.patch
deleted file mode 100644
index 6589705a3a1c..000000000000
--- a/app-emulation/open-vm-tools-kmod/files/moduleparam.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/modules/linux/vmhgfs/tcp.c b/modules/linux/vmhgfs/tcp.c
-index c7070a6..31a40df 100644
---- a/modules/linux/vmhgfs/tcp.c
-+++ b/modules/linux/vmhgfs/tcp.c
-@@ -32,6 +32,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
-
diff --git a/app-emulation/open-vm-tools-kmod/files/setnlink.patch b/app-emulation/open-vm-tools-kmod/files/setnlink.patch
deleted file mode 100644
index 9ae4fe7a4fef..000000000000
--- a/app-emulation/open-vm-tools-kmod/files/setnlink.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/modules/linux/vmhgfs/fsutil.c b/modules/linux/vmhgfs/fsutil.c
-index 0c5102b..a978005 100644
---- a/modules/linux/vmhgfs/fsutil.c
-+++ b/modules/linux/vmhgfs/fsutil.c
-@@ -62,6 +62,31 @@ static int HgfsPackGetattrRequest(HgfsReq *req,
- * Private function implementations.
- */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-+/*
-+ *----------------------------------------------------------------------------
-+ *
-+ * set_nlink --
-+ *
-+ * Set an inode's link count.
-+ *
-+ * Results:
-+ * None
-+ *
-+ * Side effects:
-+ * None
-+ *
-+ *----------------------------------------------------------------------------
-+ */
-+
-+static inline void
-+set_nlink(struct inode *inode, unsigned int nlink)
-+{
-+ inode->i_nlink = nlink;
-+}
-+#endif
-+
-+
- /*
- *----------------------------------------------------------------------
- *
-@@ -607,7 +632,7 @@ HgfsChangeFileAttributes(struct inode *inode, // IN/OUT: Inode
- * account for '.' and ".."), and find printed a hard link error. So until
- * we have getattr support for nlink, everyone gets 1.
- */
-- inode->i_nlink = 1;
-+ set_nlink(inode, 1);
-
- /*
- * Use the stored uid and gid if we were given them at mount-time, or if
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
index 902728e29563..bf6b93ddd1eb 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild,v 1.2 2012/02/04 16:34:59 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2011.11.20.535097.ebuild,v 1.1 2011/12/03 18:33:48 vadimk Exp $
EAPI="4"
@@ -51,9 +51,6 @@ pkg_setup() {
src_prepare() {
sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
|| die "Sed failed."
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/moduleparam.patch"
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/setnlink.patch"
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch"
}
src_configure() {
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
index 1d0def00d634..214fa645a686 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild,v 1.2 2012/02/04 16:34:59 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.1.528969.ebuild,v 1.1 2011/12/03 18:33:48 vadimk Exp $
EAPI="4"
@@ -51,9 +51,6 @@ pkg_setup() {
src_prepare() {
sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
|| die "Sed failed."
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/moduleparam.patch"
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/setnlink.patch"
- kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch"
}
src_configure() {
diff --git a/app-emulation/q4wine/q4wine-0.121.ebuild b/app-emulation/q4wine/q4wine-0.121.ebuild
index e1f33e38f82b..a9b51c49856f 100644
--- a/app-emulation/q4wine/q4wine-0.121.ebuild
+++ b/app-emulation/q4wine/q4wine-0.121.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-0.121.ebuild,v 1.3 2012/01/15 15:16:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-0.121.ebuild,v 1.1 2011/06/21 13:54:24 hwoarang Exp $
EAPI="2"
inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug +icoutils +wineappdb -dbus gnome kde"
DEPEND="x11-libs/qt-gui:4
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 8c8b40ab92e5..19e7ba41b57b 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,4 +1,6 @@
+DIST qemu-kvm-0.13.0.tar.gz 5153895 RMD160 7b8f4d8cdbb9730bb9d7fbf4cec165a8703696c4 SHA1 b8cfb8e8dbd403281a98a41f7d3eeaecc0aac8f1 SHA256 6db2600d7e3c1ed12feb6dc7596c23324bc2036a72f101cf580cef252ea9be53
DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
+DIST qemu-kvm-0.15.0-backports-1.tar.bz2 1174 RMD160 4ec6259824f18e7704e88b1c348cb21756345ea3 SHA1 c8788c8d9788fe868ece37c00100a17fe402eb84 SHA256 337810cd52fb8002ae39fcc1d486a224419664a064040c887ce66fe889360969
+DIST qemu-kvm-0.15.0.tar.gz 5916130 RMD160 71e32e95368b84e9441a9a1d051b03ed9b04d3ed SHA1 b009c05461fed20f3f3c3a03b153c457e33683d4 SHA256 828e771bffa540b0fbfe6fa5250adc92d5416720134d1f55a45c7926d83a4478
DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e
-DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e
diff --git a/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules b/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules
deleted file mode 100644
index c2f7317aacca..000000000000
--- a/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/app-emulation/qemu-kvm/files/qemu-ifup b/app-emulation/qemu-kvm/files/qemu-ifup
deleted file mode 100644
index 284b176c19d6..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-ifup
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-switch=$(/sbin/ip route list | awk '/^default / { print $5 }')
-/sbin/ifconfig $1 0.0.0.0 up
-/usr/sbin/brctl addif ${switch} $1
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
deleted file mode 100644
index bd2bdc7425df..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
-From: Anthony Liguori
-Date: Mon, 23 Jan 2012 07:30:43 -0600
-Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
-
-Otherwise we can write beyond the buffer and corrupt memory. This is tracked
-as CVE-2012-0029.
-
-Signed-off-by: Anthony Liguori
----
- hw/e1000.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index 986ed9c..e164d79 100644
---- a/hw/e1000.c
-+++ b/hw/e1000.c
-@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- bytes = split_size;
- if (tp->size + bytes > msh)
- bytes = msh - tp->size;
-+
-+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
- pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes);
- if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
- memmove(tp->header, tp->data, hdr);
-@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, "TCP segmentaion Error\n");
- } else {
-+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
- pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);
- tp->size += split_size;
- }
---
-1.7.7.6
-
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch
deleted file mode 100644
index d66a99135921..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-nonkvm-arches.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix build failure caused by KVM-specific code in arches not supporting KVM:
- LINK alpha-softmmu/qemu-system-alpha
-i8259.o: In function `kvm_i8259_set_irq':
-/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
-diff --git a/hw/i8259.c b/hw/i8259.c
-index 0632ea2..2f6789d 100644
---- a/hw/i8259.c
-+++ b/hw/i8259.c
-@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
-
- static void kvm_i8259_set_irq(void *opaque, int irq, int level)
- {
-+#ifdef CONFIG_KVM
- int pic_ret;
- if (kvm_set_irq(irq, level, &pic_ret)) {
- if (pic_ret != 0)
- apic_set_irq_delivered();
- return;
- }
-+#endif
- }
-
- device_init(pic_register)
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-qemu-system-ppc.patch b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-qemu-system-ppc.patch
deleted file mode 100644
index bd611a305c9b..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-fix-qemu-system-ppc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix the following build failure:
- LINK ppc64-softmmu/qemu-system-ppc64
-../libhw64/i8259.o: In function `pic_read_irq':
-/tmp/portage/app-emulation/qemu-kvm-1.0/work/qemu-kvm-1.0/hw/i8259.c:240: undefined reference to `timer_acks'
-/tmp/portage/app-emulation/qemu-kvm-1.0/work/qemu-kvm-1.0/hw/i8259.c:240: undefined reference to `timer_acks'
-/tmp/portage/app-emulation/qemu-kvm-1.0/work/qemu-kvm-1.0/hw/i8259.c:241: undefined reference to `timer_ints_to_push'
-/tmp/portage/app-emulation/qemu-kvm-1.0/work/qemu-kvm-1.0/hw/i8259.c:242: undefined reference to `timer_ints_to_push'
-/tmp/portage/app-emulation/qemu-kvm-1.0/work/qemu-kvm-1.0/hw/i8259.c:242: undefined reference to `timer_ints_to_push'
-diff --git a/Makefile.target b/Makefile.target
-index 0b610ad..d8b1740 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -275,7 +275,7 @@ obj-ppc-y += virtex_ml507.o
- obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
- obj-ppc-$(CONFIG_FDT) += device_tree.o
- # PowerPC OpenPIC
--obj-ppc-y += openpic.o
-+obj-ppc-y += openpic.o i8254.o
-
- # Xilinx PPC peripherals
- obj-ppc-y += xilinx_intc.o
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-per-target-i8259.patch b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-per-target-i8259.patch
deleted file mode 100644
index ff33898642b8..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-per-target-i8259.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Allows i8259 building on per-target basis to use
-target-specific configuration (like CONFIG_KVM).
-
-Reported-by: Marc Schiffbauer
-Status: upstream
-Bug-URL: http://bugs.gentoo.org/400597
-
-commit 372951014b5008ca047e4dfbfaf4003bc27a2f6b
-Author: Jan Kiszka
-Date: Wed Dec 14 13:15:54 2011 +0100
-
- qemu-kvm: Fix save/restore of in-kernel i8259
-
- As the qemu-kvm version of the i8259 contains KVM bits, it still has to
- be compiled per target. This unbreaks migration of the i8259.
-
- Signed-off-by: Jan Kiszka
- Signed-off-by: Marcelo Tosatti
-
-diff --git a/Makefile.objs b/Makefile.objs
-index 77fea3b..70b118b 100644
---- a/Makefile.objs
-+++ b/Makefile.objs
-@@ -222,7 +222,7 @@ hw-obj-$(CONFIG_APPLESMC) += applesmc.o
- hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
- hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
- hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o
--hw-obj-$(CONFIG_I8259) += i8259.o
-+# hw-obj-$(CONFIG_I8259) += i8259.o
-
- # PPC devices
- hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o
-diff --git a/Makefile.target b/Makefile.target
-index a4777c8..4da5712 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -228,7 +228,7 @@ obj-$(CONFIG_IVSHMEM) += ivshmem.o
-
- # Hardware support
- obj-i386-y += vga.o
--obj-i386-y += mc146818rtc.o pc.o
-+obj-i386-y += mc146818rtc.o pc.o i8259.o
- obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o
- obj-i386-y += vmport.o
- obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
-@@ -247,7 +247,7 @@ obj-i386-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
- obj-ppc-y = ppc.o ppc_booke.o
- obj-ppc-y += vga.o
- # PREP target
--obj-ppc-y += mc146818rtc.o
-+obj-ppc-y += mc146818rtc.o i8259.o
- obj-ppc-y += ppc_prep.o
- # OldWorld PowerMac
- obj-ppc-y += ppc_oldworld.o
-@@ -303,7 +303,7 @@ obj-mips-y += acpi.o acpi_piix4.o
- obj-mips-y += mips_addr.o mips_timer.o mips_int.o
- obj-mips-y += vga.o
- obj-mips-y += jazz_led.o
--obj-mips-y += gt64xxx.o mc146818rtc.o
-+obj-mips-y += gt64xxx.o mc146818rtc.o i8259.o
- obj-mips-y += cirrus_vga.o
- obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
-
-@@ -383,7 +383,7 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o
-
- obj-s390x-y = s390-virtio-bus.o s390-virtio.o
-
--obj-alpha-y = mc146818rtc.o
-+obj-alpha-y = mc146818rtc.o i8259.o
- obj-alpha-y += vga.o cirrus_vga.o
- obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
-
-diff --git a/hw/i8259.c b/hw/i8259.c
-index f2b18af..7e17071 100644
---- a/hw/i8259.c
-+++ b/hw/i8259.c
-@@ -697,8 +697,6 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
- return 0;
- }
-
--extern void apic_set_irq_delivered(void);
--
- static void kvm_i8259_set_irq(void *opaque, int irq, int level)
- {
- int pic_ret;
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
deleted file mode 100644
index 2fd4ec7ec648..000000000000
--- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix build failure caused by KVM-specific code in arches not supporting KVM:
- LINK alpha-softmmu/qemu-system-alpha
-i8259.o: In function `kvm_i8259_set_irq':
-/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
-diff --git a/hw/i8259.c b/hw/i8259.c
-index 21a4efc..bb3bb18 100644
---- a/hw/i8259.c
-+++ b/hw/i8259.c
-@@ -21,6 +21,7 @@
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-+#include "apic.h"
- #include "hw.h"
- #include "pc.h"
- #include "isa.h"
-@@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s)
-
- static void kvm_i8259_set_irq(void *opaque, int irq, int level)
- {
-+#ifdef CONFIG_KVM
- int pic_ret;
- if (kvm_set_irq(irq, level, &pic_ret)) {
- apic_report_irq_delivered(pic_ret);
- return;
- }
-+#endif
- }
-
- device_init(pic_register)
diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml
index 7cc82187aaec..f1714a0f6439 100644
--- a/app-emulation/qemu-kvm/metadata.xml
+++ b/app-emulation/qemu-kvm/metadata.xml
@@ -19,8 +19,6 @@
Enable the SDL-based console
Enable Spice protocol support via app-emulation/spice
Enable TLS support for the VNC console server
- Use sys-apps/usbredir to redirect USB
- devices to another machine over TCP
Enable VDE-based networking
Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet
@@ -28,5 +26,5 @@
sys-apps/attr. Requisite for the virtfs backend.
Enables support for Xen backends
-
+
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild
new file mode 100644
index 000000000000..a3eb5504b977
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.13.0-r2.ebuild,v 1.5 2011/03/28 03:31:46 flameeyes Exp $
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+ GIT_ECLASS="git"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
+
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 ~ppc ~ppc64 x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup sasl sdl ssl static vde"
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+ IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+ IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+ !app-emulation/kqemu
+ !app-emulation/qemu
+ !app-emulation/qemu-softmmu
+ !app-emulation/qemu-user
+ !app-emulation/qemu-kvm-spice
+ sys-apps/pciutils
+ >=sys-apps/util-linux-2.16.0
+ sys-libs/zlib
+ aio? ( dev-libs/libaio )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bluetooth? ( net-wireless/bluez )
+ brltty? ( app-accessibility/brltty )
+ curl? ( net-misc/curl )
+ esd? ( media-sound/esound )
+ fdt? ( >=sys-apps/dtc-1.2.0 )
+ jpeg? ( virtual/jpeg )
+ ncurses? ( sys-libs/ncurses )
+ png? ( media-libs/libpng )
+ pulseaudio? ( media-sound/pulseaudio )
+ qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+ sasl? ( dev-libs/cyrus-sasl )
+ sdl? ( >=media-libs/libsdl-1.2.11[X] )
+ ssl? ( net-libs/gnutls )
+ vde? ( net-misc/vde )
+"
+
+DEPEND="${RDEPEND}
+ app-text/texi2html
+ >=sys-kernel/linux-headers-2.6.29
+ ssl? ( dev-util/pkgconfig )
+"
+
+kvm_kern_warn() {
+ eerror "Please enable KVM support in your kernel, found at:"
+ eerror
+ eerror " Virtualization"
+ eerror " Kernel-based Virtual Machine (KVM) support"
+ eerror
+}
+
+pkg_setup() {
+ use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+ if kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ eerror "Either upgrade your kernel"
+ else
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ kvm_kern_warn
+ elif ! linux_chkconfig_present KVM; then
+ kvm_kern_warn
+ fi
+ fi
+
+ enewgroup kvm
+}
+
+src_prepare() {
+ # prevent docs to get automatically installed
+ sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+ # append CFLAGS while linking
+ sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
+
+ # remove part to make udev happy
+ sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
+
+ # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
+ # to the qemu-devel ml - bug 337988
+ epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" \
+ "${FILESDIR}/${PN}-0.12.3-include-madvise-defines.patch"
+# "${FILESDIR}/${PN}-guest-hang-on-usb-add.patch"
+}
+
+src_configure() {
+ local conf_opts audio_opts user_targets
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ use "qemu_softmmu_targets_${target}" && \
+ softmmu_targets="${softmmu_targets} ${target}-softmmu"
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ use "qemu_user_targets_${target}" && \
+ user_targets="${user_targets} ${target}-linux-user"
+ done
+
+ if [ -z "${softmmu_targets}" ]; then
+ conf_opts="${conf_opts} --disable-system"
+ else
+ einfo "Building the following softmmu targets: ${softmmu_targets}"
+ fi
+
+ if [ ! -z "${user_targets}" ]; then
+ einfo "Building the following user targets: ${user_targets}"
+ conf_opts="${conf_opts} --enable-linux-user"
+ else
+ conf_opts="${conf_opts} --disable-linux-user"
+ fi
+
+ # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+ conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+ # Add support for static builds
+ use static && conf_opts="${conf_opts} --static"
+
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=/etc"
+
+ #config options
+ conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
+ conf_opts="${conf_opts} $(use_enable curl)"
+ conf_opts="${conf_opts} $(use_enable fdt)"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+# conf_opts="${conf_opts} $(use_enable xen)"
+ conf_opts="${conf_opts} --disable-xen"
+ conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+
+ # audio options
+ audio_opts="oss"
+ use alsa && audio_opts="alsa ${audio_opts}"
+ use esd && audio_opts="esd ${audio_opts}"
+ use pulseaudio && audio_opts="pa ${audio_opts}"
+ use sdl && audio_opts="sdl ${audio_opts}"
+ ./configure --prefix=/usr \
+ --disable-strip \
+ --disable-werror \
+ --enable-kvm \
+ --enable-nptl \
+ --enable-uuid \
+ ${conf_opts} \
+ --audio-drv-list="${audio_opts}" \
+ --target-list="${softmmu_targets} ${user_targets}" \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ || die "configure failed"
+
+ # this is for qemu upstream's threaded support which is
+ # in development and broken
+ # the kvm project has its own support for threaded IO
+ # which is always on and works
+ # --enable-io-thread \
+}
+
+src_compile() {
+ # Restricting parallel build until we get a patch to fix this
+ emake -j1 || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ if [ ! -z "${softmmu_targets}" ]; then
+ insinto /$(get_libdir)/udev/rules.d/
+ doins kvm/scripts/65-kvm.rules || die
+
+ if use qemu-ifup; then
+ insinto /etc/qemu/
+ insopts -m0755
+ doins kvm/scripts/qemu-ifup || die
+ fi
+
+ if use qemu_softmmu_targets_x86_64 ; then
+ dobin "${FILESDIR}"/qemu-kvm
+ dosym /usr/bin/qemu-kvm /usr/bin/kvm
+ else
+ elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+ elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+ fi
+ fi
+
+ dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+ newdoc pc-bios/README README.pc-bios || die
+ dohtml qemu-doc.html qemu-tech.html || die
+}
+
+pkg_postinst() {
+
+ if [ ! -z "${softmmu_targets}" ]; then
+ elog "If you don't have kvm compiled into the kernel, make sure you have"
+ elog "the kernel module loaded before running kvm. The easiest way to"
+ elog "ensure that the kernel module is loaded is to load it on boot."
+ elog "For AMD CPUs the module is called 'kvm-amd'"
+ elog "For Intel CPUs the module is called 'kvm-intel'"
+ elog "Please review /etc/conf.d/modules for how to load these"
+ elog
+ elog "Make sure your user is in the 'kvm' group"
+ elog "Just run 'gpasswd -a kvm', then have re-login."
+ elog
+ elog "You will need the Universal TUN/TAP driver compiled into your"
+ elog "kernel or loaded as a module to use the virtual network device"
+ elog "if using -net tap. You will also need support for 802.1d"
+ elog "Ethernet Bridging and a configured bridge if using the provided"
+ elog "kvm-ifup script from /etc/kvm."
+ elog
+ elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
+ fi
+}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
index 72e126602f02..1b459a9e6422 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild,v 1.5 2012/01/22 21:23:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild,v 1.4 2011/12/04 16:47:10 hwoarang Exp $
BACKPORTS=2
@@ -83,7 +83,7 @@ RDEPEND="
spice? ( app-emulation/spice )
ssl? ( net-libs/gnutls )
vde? ( net-misc/vde )
- xen? ( app-emulation/xen-tools )
+ xen? ( app-emulation/xen )
"
DEPEND="${RDEPEND}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
new file mode 100644
index 000000000000..919fbb1d8718
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.5 2011/08/14 13:40:51 flameeyes Exp $
+
+BACKPORTS=1
+
+EAPI="3"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+ GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
+
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+ ${BACKPORTS:+
+ http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
+ http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
+png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
++vhost-net xattr xen"
+# static, depends on libsdl being built with USE=static-libs, which can not
+# be expressed in current EAPI's
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+ if [ "x${target}" = "xx86_64" ]; then
+ continue
+ fi
+ IUSE="${IUSE} qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+ IUSE="${IUSE} qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+ !app-emulation/kqemu
+ !app-emulation/qemu
+ !app-emulation/qemu-softmmu
+ !app-emulation/qemu-user
+ !app-emulation/qemu-kvm-spice
+ >=dev-libs/glib-2.0
+ sys-apps/pciutils
+ >=sys-apps/util-linux-2.16.0
+ sys-libs/zlib
+ aio? ( dev-libs/libaio )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bluetooth? ( net-wireless/bluez )
+ brltty? ( app-accessibility/brltty )
+ curl? ( >=net-misc/curl-7.15.4 )
+ esd? ( media-sound/esound )
+ fdt? ( >=sys-apps/dtc-1.2.0 )
+ jpeg? ( virtual/jpeg )
+ ncurses? ( sys-libs/ncurses )
+ nss? ( dev-libs/nss )
+ png? ( media-libs/libpng )
+ pulseaudio? ( media-sound/pulseaudio )
+ qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ sdl? ( >=media-libs/libsdl-1.2.11[X] )
+ spice? ( >=app-emulation/spice-0.6.0 )
+ ssl? ( net-libs/gnutls )
+ vde? ( net-misc/vde )
+ xattr? ( sys-apps/attr )
+ xen? ( app-emulation/xen )
+"
+
+DEPEND="${RDEPEND}
+ app-text/texi2html
+ >=sys-kernel/linux-headers-2.6.35
+ ssl? ( dev-util/pkgconfig )
+"
+
+kvm_kern_warn() {
+ eerror "Please enable KVM support in your kernel, found at:"
+ eerror
+ eerror " Virtualization"
+ eerror " Kernel-based Virtual Machine (KVM) support"
+ eerror
+}
+
+pkg_setup() {
+ if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
+ eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+ fi
+
+ if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
+ eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+ fi
+
+ if kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ eerror "Either upgrade your kernel"
+ else
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ kvm_kern_warn
+ elif ! linux_chkconfig_present KVM; then
+ kvm_kern_warn
+ fi
+ if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
+ ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
+ ewarn "to have vhost-net support."
+ fi
+ fi
+
+ enewgroup kvm
+}
+
+src_prepare() {
+ # prevent docs to get automatically installed
+ sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+ # append CFLAGS while linking
+ sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
+
+ # remove part to make udev happy
+ sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
+
+ # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
+ # to the qemu-devel ml - bug 337988
+ epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
+}
+
+src_configure() {
+ local conf_opts audio_opts user_targets
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ use "qemu_softmmu_targets_${target}" && \
+ softmmu_targets="${softmmu_targets} ${target}-softmmu"
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ use "qemu_user_targets_${target}" && \
+ user_targets="${user_targets} ${target}-linux-user"
+ done
+
+ if [ -z "${softmmu_targets}" ]; then
+ eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
+ die "At least 1 SoftMMU target must be enabled"
+ else
+ einfo "Building the following softmmu targets: ${softmmu_targets}"
+ fi
+
+ if [ ! -z "${user_targets}" ]; then
+ einfo "Building the following user targets: ${user_targets}"
+ conf_opts="${conf_opts} --enable-linux-user"
+ else
+ conf_opts="${conf_opts} --disable-linux-user"
+ fi
+
+ # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+ conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+ # Add support for static builds
+ #use static && conf_opts="${conf_opts} --static"
+
+ # Support debug USE flag
+ use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
+
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=/etc"
+
+ #config options
+ conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
+ conf_opts="${conf_opts} $(use_enable curl)"
+ conf_opts="${conf_opts} $(use_enable fdt)"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable rbd)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable spice)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+ conf_opts="${conf_opts} $(use_enable vhost-net)"
+ conf_opts="${conf_opts} $(use_enable xen)"
+ conf_opts="${conf_opts} $(use_enable xattr attr)"
+ conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+
+ # audio options
+ audio_opts="oss"
+ use alsa && audio_opts="alsa ${audio_opts}"
+ use esd && audio_opts="esd ${audio_opts}"
+ use pulseaudio && audio_opts="pa ${audio_opts}"
+ use sdl && audio_opts="sdl ${audio_opts}"
+ ./configure --prefix=/usr \
+ --disable-strip \
+ --disable-werror \
+ --enable-kvm \
+ --enable-nptl \
+ --enable-uuid \
+ ${conf_opts} \
+ --audio-drv-list="${audio_opts}" \
+ --target-list="${softmmu_targets} ${user_targets}" \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ || die "configure failed"
+
+ # this is for qemu upstream's threaded support which is
+ # in development and broken
+ # the kvm project has its own support for threaded IO
+ # which is always on and works
+ # --enable-io-thread \
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ if [ ! -z "${softmmu_targets}" ]; then
+ insinto /$(get_libdir)/udev/rules.d/
+ doins kvm/scripts/65-kvm.rules || die
+
+ if use qemu-ifup; then
+ insinto /etc/qemu/
+ insopts -m0755
+ doins kvm/scripts/qemu-ifup || die
+ fi
+
+ if use qemu_softmmu_targets_x86_64 ; then
+ dobin "${FILESDIR}"/qemu-kvm
+ dosym /usr/bin/qemu-kvm /usr/bin/kvm
+ else
+ elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+ elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+ fi
+ fi
+
+ dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+ newdoc pc-bios/README README.pc-bios || die
+ dohtml qemu-doc.html qemu-tech.html || die
+}
+
+pkg_postinst() {
+
+ if [ ! -z "${softmmu_targets}" ]; then
+ elog "If you don't have kvm compiled into the kernel, make sure you have"
+ elog "the kernel module loaded before running kvm. The easiest way to"
+ elog "ensure that the kernel module is loaded is to load it on boot."
+ elog "For AMD CPUs the module is called 'kvm-amd'"
+ elog "For Intel CPUs the module is called 'kvm-intel'"
+ elog "Please review /etc/conf.d/modules for how to load these"
+ elog
+ elog "Make sure your user is in the 'kvm' group"
+ elog "Just run 'gpasswd -a kvm', then have re-login."
+ elog
+ elog "You will need the Universal TUN/TAP driver compiled into your"
+ elog "kernel or loaded as a module to use the virtual network device"
+ elog "if using -net tap. You will also need support for 802.1d"
+ elog "Ethernet Bridging and a configured bridge if using the provided"
+ elog "kvm-ifup script from /etc/kvm."
+ elog
+ elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
+ fi
+}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
index 3186290c3932..0a8190a8aed2 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.5 2012/01/22 21:23:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1-r1.ebuild,v 1.2 2011/11/21 18:11:11 jmbsvicetto Exp $
#BACKPORTS=1
@@ -21,7 +21,7 @@ else
${BACKPORTS:+
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
- KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -88,13 +88,14 @@ RDEPEND="
ssl? ( net-libs/gnutls )
vde? ( net-misc/vde )
xattr? ( sys-apps/attr )
- xen? ( app-emulation/xen-tools )
+ xen? ( app-emulation/xen )
"
DEPEND="${RDEPEND}
app-text/texi2html
- dev-util/pkgconfig
- >=sys-kernel/linux-headers-2.6.35"
+ >=sys-kernel/linux-headers-2.6.35
+ ssl? ( dev-util/pkgconfig )
+"
kvm_kern_warn() {
eerror "Please enable KVM support in your kernel, found at:"
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild
deleted file mode 100644
index d35b6afdd125..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild,v 1.1 2012/01/25 06:29:42 cardoe Exp $
-
-#BACKPORTS=1
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-# EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
- EGIT_REPO_URI="git://github.com/avikivity/kvm.git"
- GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python
-
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
- ${BACKPORTS:+
- http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
- http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
-+vhost-net xattr xen"
-# static, depends on libsdl being built with USE=static-libs, which can not
-# be expressed in current EAPI's
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets. x86_64 should be the only
-# defaults on for qemu-kvm
-IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
- if [ "x${target}" = "xx86_64" ]; then
- continue
- fi
- IUSE="${IUSE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
- IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
- !app-emulation/kqemu
- !app-emulation/qemu
- !app-emulation/qemu-user
- >=dev-libs/glib-2.0
- sys-apps/pciutils
- >=sys-apps/util-linux-2.16.0
- sys-libs/zlib
- amd64? ( sys-apps/seabios
- sys-apps/vgabios )
- x86? ( sys-apps/seabios
- sys-apps/vgabios )
- aio? ( dev-libs/libaio )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bluetooth? ( net-wireless/bluez )
- brltty? ( app-accessibility/brltty )
- curl? ( >=net-misc/curl-7.15.4 )
- esd? ( media-sound/esound )
- fdt? ( >=sys-apps/dtc-1.2.0 )
- jpeg? ( virtual/jpeg )
- ncurses? ( sys-libs/ncurses )
- nss? ( dev-libs/nss )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng )
- pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? ( >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1 )
- ssl? ( net-libs/gnutls )
- vde? ( net-misc/vde )
- xattr? ( sys-apps/attr )
- xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
- app-text/texi2html
- dev-util/pkgconfig
- >=sys-kernel/linux-headers-2.6.35"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
- usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus"
-
-kvm_kern_warn() {
- eerror "Please enable KVM support in your kernel, found at:"
- eerror
- eerror " Virtualization"
- eerror " Kernel-based Virtual Machine (KVM) support"
- eerror
-}
-
-pkg_pretend() {
- if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
- eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
- fi
-
- if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
- eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
- fi
-
- if kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- eerror "Either upgrade your kernel"
- else
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- kvm_kern_warn
- elif ! linux_chkconfig_present KVM; then
- kvm_kern_warn
- fi
- if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
- ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
- ewarn "to have vhost-net support."
- fi
- fi
-}
-
-pkg_setup() {
-
- python_set_active_version 2
-
- enewgroup kvm
-}
-
-src_prepare() {
- # prevent docs to get automatically installed
- sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
- # append CFLAGS while linking
- sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
- # remove part to make udev happy
- sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
- # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
- # to the qemu-devel ml - bug 337988
- epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-
- epatch "${FILESDIR}"/${PN}-1.0-per-target-i8259.patch #400597
- epatch "${FILESDIR}"/${PN}-1.0-fix-nonkvm-arches.patch
- epatch "${FILESDIR}"/${PN}-1.0-fix-qemu-system-ppc.patch
-
- # bug #400595 / CVE-2012-0029
- epatch "${FILESDIR}"/${P}-e1000-bounds-packet-size-against-buffer-size.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-}
-
-src_configure() {
- local conf_opts audio_opts user_targets
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" && \
- softmmu_targets="${softmmu_targets} ${target}-softmmu"
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" && \
- user_targets="${user_targets} ${target}-linux-user"
- done
-
- if [ -z "${softmmu_targets}" ]; then
- eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
- die "At least 1 SoftMMU target must be enabled"
- else
- einfo "Building the following softmmu targets: ${softmmu_targets}"
- fi
-
- if [ ! -z "${user_targets}" ]; then
- einfo "Building the following user targets: ${user_targets}"
- conf_opts="${conf_opts} --enable-linux-user"
- else
- conf_opts="${conf_opts} --disable-linux-user"
- fi
-
- # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
- conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
- # Add support for static builds
- #use static && conf_opts="${conf_opts} --static"
-
- # Support debug USE flag
- use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
-
- # Fix the $(prefix)/etc issue
- conf_opts="${conf_opts} --sysconfdir=/etc"
-
- #config options
- conf_opts="${conf_opts} $(use_enable aio linux-aio)"
- conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
- conf_opts="${conf_opts} $(use_enable brltty brlapi)"
- conf_opts="${conf_opts} $(use_enable curl)"
- conf_opts="${conf_opts} $(use_enable fdt)"
- conf_opts="${conf_opts} $(use_enable hardened pie)"
- conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
- conf_opts="${conf_opts} $(use_enable ncurses curses)"
- conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
- conf_opts="${conf_opts} $(use_enable opengl)"
- conf_opts="${conf_opts} $(use_enable png vnc-png)"
- conf_opts="${conf_opts} $(use_enable rbd)"
- conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
- conf_opts="${conf_opts} $(use_enable sdl)"
- conf_opts="${conf_opts} $(use_enable spice)"
- conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
- conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
- conf_opts="${conf_opts} $(use_enable vde)"
- conf_opts="${conf_opts} $(use_enable vhost-net)"
- conf_opts="${conf_opts} $(use_enable xen)"
- conf_opts="${conf_opts} $(use_enable xattr attr)"
- conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
- # audio options
- audio_opts="oss"
- use alsa && audio_opts="alsa ${audio_opts}"
- use esd && audio_opts="esd ${audio_opts}"
- use pulseaudio && audio_opts="pa ${audio_opts}"
- use sdl && audio_opts="sdl ${audio_opts}"
- ./configure --prefix=/usr \
- --disable-strip \
- --disable-werror \
- --enable-kvm \
- --enable-nptl \
- --enable-uuid \
- ${conf_opts} \
- --audio-drv-list="${audio_opts}" \
- --target-list="${softmmu_targets} ${user_targets}" \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- || die "configure failed"
-
- # this is for qemu upstream's threaded support which is
- # in development and broken
- # the kvm project has its own support for threaded IO
- # which is always on and works
- # --enable-io-thread \
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- if [ ! -z "${softmmu_targets}" ]; then
- insinto /lib/udev/rules.d/
- doins kvm/scripts/65-kvm.rules || die
-
- if use qemu-ifup; then
- insinto /etc/qemu/
- insopts -m0755
- doins kvm/scripts/qemu-ifup || die
- fi
-
- if use qemu_softmmu_targets_x86_64 ; then
- dobin "${FILESDIR}"/qemu-kvm
- dosym /usr/bin/qemu-kvm /usr/bin/kvm
- else
- elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
- elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
- fi
- fi
-
- dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
- newdoc pc-bios/README README.pc-bios || die
- dohtml qemu-doc.html qemu-tech.html || die
-
- # FIXME: Need to come up with a solution for non-x86 based systems
- if use x86 || use amd64; then
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${D}/usr/share/qemu/bios.bin"
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
- # Remove vgabios since we're using the vgabios packaged one
- rm "${D}/usr/share/qemu/vgabios.bin"
- rm "${D}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${D}/usr/share/qemu/vgabios-qxl.bin"
- rm "${D}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${D}/usr/share/qemu/vgabios-vmware.bin"
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-}
-
-pkg_postinst() {
-
- if [ ! -z "${softmmu_targets}" ]; then
- elog "If you don't have kvm compiled into the kernel, make sure you have"
- elog "the kernel module loaded before running kvm. The easiest way to"
- elog "ensure that the kernel module is loaded is to load it on boot."
- elog "For AMD CPUs the module is called 'kvm-amd'"
- elog "For Intel CPUs the module is called 'kvm-intel'"
- elog "Please review /etc/conf.d/modules for how to load these"
- elog
- elog "Make sure your user is in the 'kvm' group"
- elog "Just run 'gpasswd -a kvm', then have re-login."
- elog
- elog "You will need the Universal TUN/TAP driver compiled into your"
- elog "kernel or loaded as a module to use the virtual network device"
- elog "if using -net tap. You will also need support for 802.1d"
- elog "Ethernet Bridging and a configured bridge if using the provided"
- elog "kvm-ifup script from /etc/kvm."
- elog
- elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
- fi
-}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 1c9816200c81..a97a4c27bf46 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.33 2012/01/29 12:44:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.25 2011/11/21 18:11:11 jmbsvicetto Exp $
#BACKPORTS=1
@@ -29,15 +29,16 @@ HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads usbredir vde
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
+png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
+vhost-net xattr xen"
# static, depends on libsdl being built with USE=static-libs, which can not
# be expressed in current EAPI's
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
# Setup the default SoftMMU targets, while using the loops
# below to setup the other targets. x86_64 should be the only
@@ -45,7 +46,7 @@ IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
for target in ${IUSE_SOFTMMU_TARGETS}; do
- if [[ ${target} = x86_64 ]]; then
+ if [ "x${target}" = "xx86_64" ]; then
continue
fi
IUSE="${IUSE} qemu_softmmu_targets_${target}"
@@ -65,80 +66,35 @@ RDEPEND="
sys-apps/pciutils
>=sys-apps/util-linux-2.16.0
sys-libs/zlib
- amd64? ( sys-apps/seabios
- sys-apps/vgabios )
- x86? ( sys-apps/seabios
- sys-apps/vgabios )
+ amd64? ( sys-apps/seabios )
+ x86? ( sys-apps/seabios )
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
- curl? ( net-misc/curl )
+ curl? ( >=net-misc/curl-7.15.4 )
esd? ( media-sound/esound )
fdt? ( >=sys-apps/dtc-1.2.0 )
jpeg? ( virtual/jpeg )
ncurses? ( sys-libs/ncurses )
nss? ( dev-libs/nss )
- opengl? (
- virtual/opengl
- x11-libs/libX11
- )
png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? (
- sys-apps/iproute2
- net-misc/bridge-utils
- )
+ qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? (
- >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1
- )
+ spice? ( >=app-emulation/spice-0.6.0 )
ssl? ( net-libs/gnutls )
- usbredir? ( sys-apps/usbredir )
vde? ( net-misc/vde )
xattr? ( sys-apps/attr )
- xen? ( app-emulation/xen-tools )
+ xen? ( app-emulation/xen )
"
DEPEND="${RDEPEND}
app-text/texi2html
- dev-util/pkgconfig
- >=sys-kernel/linux-headers-2.6.35"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-armeb
- usr/bin/qemu-cris
- usr/bin/qemu-i386
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-sparc64
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32
- usr/bin/qemu-x86_64
+ >=sys-kernel/linux-headers-2.6.35
+ ssl? ( dev-util/pkgconfig )
"
kvm_kern_warn() {
@@ -149,8 +105,8 @@ kvm_kern_warn() {
eerror
}
-pkg_pretend() {
- if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
+pkg_setup() {
+ if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
fi
@@ -173,9 +129,6 @@ pkg_pretend() {
ewarn "to have vhost-net support."
fi
fi
-}
-
-pkg_setup() {
python_set_active_version 2
@@ -185,24 +138,22 @@ pkg_setup() {
src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+ # append CFLAGS while linking
+ sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
- # drop '-g' by default as it tends to eat
- # A LOT (~2GB) of ram for each job #355861
- sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
- -i configure || die
+ # remove part to make udev happy
+ sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
# to the qemu-devel ml - bug 337988
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
- epatch "${FILESDIR}"/${PN}-9999-fix-nonkvm-arches.patch
-
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
- # Fix underlinking.
- # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
- sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
}
src_configure() {
@@ -218,14 +169,14 @@ src_configure() {
user_targets="${user_targets} ${target}-linux-user"
done
- if [[ -z ${softmmu_targets} ]]; then
+ if [ -z "${softmmu_targets}" ]; then
eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
die "At least 1 SoftMMU target must be enabled"
else
einfo "Building the following softmmu targets: ${softmmu_targets}"
fi
- if [[ -n ${user_targets} ]]; then
+ if [ ! -z "${user_targets}" ]; then
einfo "Building the following user targets: ${user_targets}"
conf_opts="${conf_opts} --enable-linux-user"
else
@@ -241,31 +192,31 @@ src_configure() {
# Support debug USE flag
use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=/etc"
+
#config options
- conf_opts="${conf_opts}
- $(use_enable aio linux-aio)
- $(use_enable bluetooth bluez)
- $(use_enable brltty brlapi)
- $(use_enable curl)
- $(use_enable fdt)
- $(use_enable hardened pie)
- $(use_enable jpeg vnc-jpeg)
- $(use_enable ncurses curses)
- $(use_enable nss smartcard-nss)
- $(use_enable opengl)
- $(use_enable png vnc-png)
- $(use_enable rbd)
- $(use_enable sasl vnc-sasl)
- $(use_enable sdl)
- $(use_enable spice)
- $(use_enable ssl vnc-tls)
- $(use_enable threads vnc-thread)
- $(use_enable vde)
- $(use_enable vhost-net)
- $(use_enable xen)
- $(use_enable xattr attr)
- --disable-darwin-user --disable-bsd-user
- "
+ conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
+ conf_opts="${conf_opts} $(use_enable curl)"
+ conf_opts="${conf_opts} $(use_enable fdt)"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable rbd)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable spice)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+ conf_opts="${conf_opts} $(use_enable vhost-net)"
+ conf_opts="${conf_opts} $(use_enable xen)"
+ conf_opts="${conf_opts} $(use_enable xattr attr)"
+ conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
# audio options
audio_opts="oss"
@@ -273,32 +224,38 @@ src_configure() {
use esd && audio_opts="esd ${audio_opts}"
use pulseaudio && audio_opts="pa ${audio_opts}"
use sdl && audio_opts="sdl ${audio_opts}"
-
- set -- --prefix="${EPREFIX}"/usr \
- --sysconfdir="${EPREFIX}"/etc \
+ ./configure --prefix=/usr \
--disable-strip \
--disable-werror \
--enable-kvm \
- --disable-libiscsi \
--enable-nptl \
--enable-uuid \
${conf_opts} \
- --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
--audio-drv-list="${audio_opts}" \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)"
-
- echo ./configure "$@" # show actual options
- ./configure "$@" || die "configure failed"
+ --host-cc="$(tc-getBUILD_CC)" \
+ || die "configure failed"
+
+ # this is for qemu upstream's threaded support which is
+ # in development and broken
+ # the kvm project has its own support for threaded IO
+ # which is always on and works
+ # --enable-io-thread \
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
- if [[ -n ${softmmu_targets} ]]; then
- insinto /lib/udev/rules.d/
- doins "${FILESDIR}"/65-gentoo-kvm.rules || die
+ if [ ! -z "${softmmu_targets}" ]; then
+ insinto /$(get_libdir)/udev/rules.d/
+ doins kvm/scripts/65-kvm.rules || die
+
+ if use qemu-ifup; then
+ insinto /etc/qemu/
+ insopts -m0755
+ doins kvm/scripts/qemu-ifup || die
+ fi
if use qemu_softmmu_targets_x86_64 ; then
dobin "${FILESDIR}"/qemu-kvm
@@ -307,12 +264,6 @@ src_install() {
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
fi
-
- if use qemu-ifup; then
- insinto /etc/qemu/
- insopts -m0755
- doins "${FILESDIR}"/qemu-ifup || die
- fi
fi
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
@@ -324,24 +275,12 @@ src_install() {
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${D}/usr/share/qemu/bios.bin"
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
- # Remove vgabios since we're using the vgabios packaged one
- rm "${D}/usr/share/qemu/vgabios.bin"
- rm "${D}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${D}/usr/share/qemu/vgabios-qxl.bin"
- rm "${D}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${D}/usr/share/qemu/vgabios-vmware.bin"
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
}
pkg_postinst() {
- if [[ -n ${softmmu_targets} ]]; then
+ if [ ! -z "${softmmu_targets}" ]; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
elog "ensure that the kernel module is loaded is to load it on boot."
@@ -356,7 +295,7 @@ pkg_postinst() {
elog "kernel or loaded as a module to use the virtual network device"
elog "if using -net tap. You will also need support for 802.1d"
elog "Ethernet Bridging and a configured bridge if using the provided"
- elog "qemu-ifup script from /etc/qemu."
+ elog "kvm-ifup script from /etc/kvm."
elog
elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
fi
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 87ca25b3ccfe..55a247a816e2 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1,2 @@
DIST qemu-0.11.1.tar.gz 3830070 RMD160 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3 SHA1 7b983cd18f44c6e7627532b662f010389d3bcdff SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de53fc929484bedee1d6e7893a
-DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737
+DIST qemu-0.14.0.tar.gz 5439695 RMD160 1409264387e4cfe45143e10dd77b2574935e2d78 SHA1 cf8d916436d4b8775289399648e1f0ca9d867d18 SHA256 ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108
diff --git a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch b/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch
deleted file mode 100644
index d8935e31c3b5..000000000000
--- a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Backported upstream patch:
-> From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
-> From: Anthony Liguori
-> Date: Mon, 23 Jan 2012 07:30:43 -0600
-> Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
->
-> Otherwise we can write beyond the buffer and corrupt memory. This is tracked
-> as CVE-2012-0029.
->
-> Signed-off-by: Anthony Liguori
----
- hw/e1000.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index b0542d7..54ade40 100644
---- a/hw/e1000.c
-+++ b/hw/e1000.c
-@@ -447,6 +447,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- bytes = split_size;
- if (tp->size + bytes > msh)
- bytes = msh - tp->size;
-+
-+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
- cpu_physical_memory_read(addr, tp->data + tp->size, bytes);
- if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
- memmove(tp->header, tp->data, hdr);
-@@ -462,6 +464,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, "TCP segmentaion Error\n");
- } else {
-+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
- cpu_physical_memory_read(addr, tp->data + tp->size, split_size);
- tp->size += split_size;
- }
diff --git a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
deleted file mode 100644
index bd2bdc7425df..000000000000
--- a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
-From: Anthony Liguori
-Date: Mon, 23 Jan 2012 07:30:43 -0600
-Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
-
-Otherwise we can write beyond the buffer and corrupt memory. This is tracked
-as CVE-2012-0029.
-
-Signed-off-by: Anthony Liguori
----
- hw/e1000.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index 986ed9c..e164d79 100644
---- a/hw/e1000.c
-+++ b/hw/e1000.c
-@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- bytes = split_size;
- if (tp->size + bytes > msh)
- bytes = msh - tp->size;
-+
-+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
- pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes);
- if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
- memmove(tp->header, tp->data, hdr);
-@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, "TCP segmentaion Error\n");
- } else {
-+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
- pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);
- tp->size += split_size;
- }
---
-1.7.7.6
-
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index d01eb3f6caa2..a02b242e3279 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -1,45 +1,26 @@
- qemu
-
- lu_zero@gentoo.org
-
-
- slyfox@gentoo.org
- Sergei Trofimovich
-
-
- Enables support for Linux's Async IO
+qemu
+
+ lu_zero@gentoo.org
+
+
+ Enables support for Linux's Async IO
Adds support for braille displays using brltty
- Adds support for read-only block device emulation based on files
- located on http and ftp servers
- Enable esound output for sound emulation
Enables firmware device tree support
- Enable TLS support for the VNC console server
- Enables the kernel acceleration module on a x86/x86-64 cpu
- Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware
- Enable the ncurses-based console
- Build support for Smartcard devices emulation using dev-libs/nss
- Enable opengl/x11 output for lm32 target.
- Enable pulseaudio output for sound emulation
- Provides the qemu-ifup script for use with
- QEMU's built in bridging
- Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD
- Enable the SDL-based console
- Enable static build, useful to chroot in user-mode
- emulation
- Enable Spice protocol support via app-emulation/spice
- Enable TLS support for the VNC console server
- Use sys-apps/usbredir to redirect USB
- devices to another machine over TCP
- Enable Virtual Distributed Ethernet (VDE) based networking
- Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet
-
- Add support for getting and setting POSIX extended attributes, through
- sys-apps/attr. Requisite for the virtfs backend.
-
- Support specific optimizations when files are stored on XFS filesystem.
- Enables support for Xen backends
-
+ Enables the kernel acceleration module on a x86/x86-64 cpu
+ Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware
+ Enable alsa output for sound emulation
+ Enable esound output for sound emulation
+ Enable TLS support for the VNC console server
+ Enable the ncurses-based console
+ Enable pulseaudio output for sound emulation
+ Provides the qemu-ifup script for use with
+ QEMU's built in bridging
+ Enable the SDL-based console
+ Enable static build, useful to chroot in user-mode
+ emulation
+ Enable Virtual Distributed Ethernet (VDE) based networking
+
diff --git a/app-emulation/qemu/qemu-0.11.1-r1.ebuild b/app-emulation/qemu/qemu-0.11.1-r1.ebuild
deleted file mode 100644
index 1a9b65e50f5a..000000000000
--- a/app-emulation/qemu/qemu-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1-r1.ebuild,v 1.1 2012/01/28 11:45:00 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc"
-
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
- IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
- IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RDEPEND="
- !app-emulation/qemu-user
- sys-libs/zlib
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- esd? ( media-sound/esound )
- pulseaudio? ( media-sound/pulseaudio )
- gnutls? ( net-libs/gnutls )
- ncurses? ( sys-libs/ncurses )
- sasl? ( dev-libs/cyrus-sasl )
- sdl? ( >=media-libs/libsdl-1.2.11 )
- vde? ( net-misc/vde )
- kvm? ( >=sys-kernel/linux-headers-2.6.29 )
- bluetooth? ( net-wireless/bluez )
- kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
-# fdt? ( sys-apps/dtc )
-
-DEPEND="${RDEPEND}
- gnutls? ( dev-util/pkgconfig )
- app-text/texi2html"
-
-src_prepare() {
- # avoid fdt till an updated release appears
- sed -i -e 's:fdt="yes":fdt="no":' configure
- # prevent docs to get automatically installed
- sed -i '/$(DESTDIR)$(docdir)/d' Makefile
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target tests/Makefile
- [[ -x /sbin/paxctl ]] && \
- sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
- Makefile.target
- # Append CFLAGS while linking
- sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
- epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
- epatch "${FILESDIR}/qemu-0.11.1-CVE-2012-0029-backport.patch"
-}
-
-src_configure() {
- local mycc conf_opts audio_opts softmmu_targets user_targets target_list
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" && \
- softmmu_targets="${softmmu_targets} ${target}-softmmu"
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" && \
- user_targets="${user_targets} ${target}-linux-user"
- done
-
- conf_opts="--disable-darwin-user --disable-bsd-user --disable-strip"
-
- if test ! -z "${softmmu_targets}" ; then
- einfo "Building following softmmu targets: ${softmmu_targets}"
- use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
- use ncurses || conf_opts="$conf_opts --disable-curses"
- use sasl || conf_opts="$conf_opts --disable-vnc-sasl"
- use sdl || conf_opts="$conf_opts --disable-sdl"
- use vde || conf_opts="$conf_opts --disable-vde"
- use bluetooth || conf_opts="$conf_opts --disable-bluez"
- use kqemu || conf_opts="$conf_opts --disable-kqemu"
- use kvm || conf_opts="$conf_opts --disable-kvm"
-
- audio_opts="oss"
- use alsa && audio_opts="alsa $audio_opts"
- use esd && audio_opts="esd $audio_opts"
- use pulseaudio && audio_opts="pa $audio_opts"
- use sdl && audio_opts="sdl $audio_opts"
- else
- einfo "Disabling softmmu emulation (no softmmu targets specified)"
- conf_opts="$conf_opts --disable-system --disable-vnc-tls \
- --disable-curses --disable-sdl --disable-vde \
- --disable-kqemu --disable-kvm"
- fi
-
- if test ! -z "${user_targets}" ; then
- einfo "Building following user targets: ${user_targets}"
- conf_opts="$conf_opts --enable-linux-user"
- else
- einfo "Disabling usermode emulation (no usermode targets specified)"
- conf_opts="$conf_opts --disable-linux-user"
- fi
-
-# use fdt || conf_opts="$conf_opts --disable-fdt"
-
- conf_opts="$conf_opts --prefix=/usr"
-
- target_list="${softmmu_targets} ${user_targets}"
-
- filter-flags -fPIE
-
- ./configure ${conf_opts} \
- --audio-drv-list="$audio_opts" \
- --cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \
- --target-list="${target_list}" \
- || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- exeinto /etc/qemu
- doexe \
- "${FILESDIR}/qemu-ifup" \
- "${FILESDIR}/qemu-ifdown" \
- || die "qemu interface scripts failed"
-
- dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
- newdoc pc-bios/README README.pc-bios || die
- dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
- elog "You will need the Universal TUN/TAP driver compiled into your"
- elog "kernel or loaded as a module to use the virtual network device"
- elog "if using -net tap. You will also need support for 802.1d"
- elog "Ethernet Bridging and a configured bridge if using the provided"
- elog "qemu-ifup script from /etc/qemu."
- echo
-}
diff --git a/app-emulation/qemu/qemu-0.11.1.ebuild b/app-emulation/qemu/qemu-0.11.1.ebuild
index be5385ae057e..7b5adc95dae9 100644
--- a/app-emulation/qemu/qemu-0.11.1.ebuild
+++ b/app-emulation/qemu/qemu-0.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.6 2012/01/22 08:00:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.5 2011/03/24 19:50:14 angelos Exp $
EAPI="2"
@@ -28,8 +28,9 @@ for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} +qemu_user_targets_${target}"
done
-RDEPEND="
+RDEPEND="!app-emulation/qemu-softmmu
!app-emulation/qemu-user
+ !=media-libs/alsa-lib-1.0.13 )
esd? ( media-sound/esound )
diff --git a/app-emulation/qemu/qemu-0.14.0.ebuild b/app-emulation/qemu/qemu-0.14.0.ebuild
new file mode 100644
index 000000000000..d49c521e9a7f
--- /dev/null
+++ b/app-emulation/qemu/qemu-0.14.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.14.0.ebuild,v 1.3 2011/02/20 22:07:37 zmedico Exp $
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+ GIT_ECLASS="git"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup sasl sdl ssl static vde"
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+ IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+ IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+ !app-emulation/qemu-kvm
+ !app-emulation/qemu-softmmu
+ !app-emulation/qemu-user
+ !app-emulation/qemu-kvm-spice
+ sys-apps/pciutils
+ >=sys-apps/util-linux-2.16.0
+ sys-libs/zlib
+ aio? ( dev-libs/libaio )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bluetooth? ( net-wireless/bluez )
+ brltty? ( app-accessibility/brltty )
+ curl? ( net-misc/curl )
+ esd? ( media-sound/esound )
+ fdt? ( >=sys-apps/dtc-1.2.0 )
+ jpeg? ( virtual/jpeg )
+ ncurses? ( sys-libs/ncurses )
+ png? ( media-libs/libpng )
+ pulseaudio? ( media-sound/pulseaudio )
+ qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+ sasl? ( dev-libs/cyrus-sasl )
+ sdl? ( >=media-libs/libsdl-1.2.11[X] )
+ ssl? ( net-libs/gnutls )
+ vde? ( net-misc/vde )
+"
+
+DEPEND="${RDEPEND}
+ app-text/texi2html
+ >=sys-kernel/linux-headers-2.6.29
+ ssl? ( dev-util/pkgconfig )
+"
+
+pkg_setup() {
+ use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+}
+
+src_prepare() {
+ # prevent docs to get automatically installed
+ sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+ # append CFLAGS while linking
+ sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
+}
+
+src_configure() {
+ local conf_opts audio_opts user_targets
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ use "qemu_softmmu_targets_${target}" && \
+ softmmu_targets="${softmmu_targets} ${target}-softmmu"
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ use "qemu_user_targets_${target}" && \
+ user_targets="${user_targets} ${target}-linux-user"
+ done
+
+ if [ -z "${softmmu_targets}" ]; then
+ conf_opts="${conf_opts} --disable-system"
+ else
+ einfo "Building the following softmmu targets: ${softmmu_targets}"
+ fi
+
+ if [ ! -z "${user_targets}" ]; then
+ einfo "Building the following user targets: ${user_targets}"
+ conf_opts="${conf_opts} --enable-linux-user"
+ else
+ conf_opts="${conf_opts} --disable-linux-user"
+ fi
+
+ # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+ conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+ # Add support for static builds
+ use static && conf_opts="${conf_opts} --static"
+
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=/etc"
+
+ #config options
+ conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
+ conf_opts="${conf_opts} $(use_enable curl)"
+ conf_opts="${conf_opts} $(use_enable fdt)"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+ conf_opts="${conf_opts} --disable-xen"
+ conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+
+ # audio options
+ audio_opts="oss"
+ use alsa && audio_opts="alsa ${audio_opts}"
+ use esd && audio_opts="esd ${audio_opts}"
+ use pulseaudio && audio_opts="pa ${audio_opts}"
+ use sdl && audio_opts="sdl ${audio_opts}"
+ ./configure --prefix=/usr \
+ --disable-strip \
+ --disable-werror \
+ --disable-kvm \
+ --enable-nptl \
+ --enable-uuid \
+ ${conf_opts} \
+ --audio-drv-list="${audio_opts}" \
+ --target-list="${softmmu_targets} ${user_targets}" \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ || die "configure failed"
+
+ # this is for qemu upstream's threaded support which is
+ # in development and broken
+ # the kvm project has its own support for threaded IO
+ # which is always on and works
+ # --enable-io-thread \
+}
+
+src_compile() {
+ # Restricting parallel build until we get a patch to fix this
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ if [ ! -z "${softmmu_targets}" ]; then
+ exeinto /etc/qemu
+ use qemu-ifup && { doexe \
+ "${FILESDIR}/qemu-ifup" \
+ "${FILESDIR}/qemu-ifdown" \
+ || die "qemu interface scripts missing" ; }
+ fi
+
+ dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+ newdoc pc-bios/README README.pc-bios || die
+ dohtml qemu-doc.html qemu-tech.html || die
+}
+
+pkg_postinst() {
+ use qemu-ifup || return
+ elog "You will need the Universal TUN/TAP driver compiled into your"
+ elog "kernel or loaded as a module to use the virtual network device"
+ elog "if using -net tap. You will also need support for 802.1d"
+ elog "Ethernet Bridging and a configured bridge if using the provided"
+ elog "qemu-ifup script from /etc/qemu."
+ echo
+}
diff --git a/app-emulation/qemu/qemu-1.0-r2.ebuild b/app-emulation/qemu/qemu-1.0-r2.ebuild
deleted file mode 100644
index 5bbdb5886da9..000000000000
--- a/app-emulation/qemu/qemu-1.0-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r2.ebuild,v 1.1 2012/01/26 19:01:15 slyfox Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git
- http://git.qemu.org/git/qemu.git"
- GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
- IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
- IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
- !app-emulation/qemu-kvm
- !app-emulation/qemu-user
- >=dev-libs/glib-2.0
- sys-apps/pciutils
- >=sys-apps/util-linux-2.16.0
- sys-libs/zlib
- aio? ( dev-libs/libaio )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bluetooth? ( net-wireless/bluez )
- brltty? ( app-accessibility/brltty )
- curl? ( net-misc/curl )
- esd? ( media-sound/esound )
- fdt? ( >=sys-apps/dtc-1.2.0 )
- jpeg? ( virtual/jpeg )
- ncurses? ( sys-libs/ncurses )
- nss? ( dev-libs/nss )
- opengl? (
- virtual/opengl
- x11-libs/libX11
- )
- png? ( media-libs/libpng )
- pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? (
- sys-apps/iproute2
- net-misc/bridge-utils
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? (
- >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1
- )
- ssl? ( net-libs/gnutls )
- usbredir? ( sys-apps/usbredir )
- vde? ( net-misc/vde )
- xattr? ( sys-apps/attr )
- xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
- app-text/texi2html
- dev-util/pkgconfig
- >=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-armeb
- usr/bin/qemu-cris
- usr/bin/qemu-i386
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-sparc64
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32
- usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
- use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-}
-
-src_prepare() {
- # bug #400595 / CVE-2012-0029
- epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
-
- # prevent docs to get automatically installed
- sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
- # append CFLAGS while linking
- sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
- # Fix underlinking.
- # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
- sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
- local conf_opts audio_opts user_targets
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" && \
- softmmu_targets="${softmmu_targets} ${target}-softmmu"
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" && \
- user_targets="${user_targets} ${target}-linux-user"
- done
-
- if [[ -z ${softmmu_targets} ]]; then
- conf_opts="${conf_opts} --disable-system"
- else
- einfo "Building the following softmmu targets: ${softmmu_targets}"
- fi
-
- if [[ -n ${user_targets} ]]; then
- einfo "Building the following user targets: ${user_targets}"
- conf_opts="${conf_opts} --enable-linux-user"
- else
- conf_opts="${conf_opts} --disable-linux-user"
- fi
-
- # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
- conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
- # Add support for static builds
- use static && conf_opts="${conf_opts} --static"
-
- #config options
- conf_opts="${conf_opts}
- $(use_enable aio linux-aio)
- $(use_enable bluetooth bluez)
- $(use_enable brltty brlapi)
- $(use_enable curl)
- $(use_enable fdt)
- $(use_enable hardened pie)
- $(use_enable jpeg vnc-jpeg)
- $(use_enable ncurses curses)
- $(use_enable nss smartcard-nss)
- $(use_enable opengl)
- $(use_enable png vnc-png)
- $(use_enable rbd)
- $(use_enable sasl vnc-sasl)
- $(use_enable sdl)
- $(use_enable spice)
- $(use_enable ssl vnc-tls)
- $(use_enable threads vnc-thread)
- $(use_enable vde)
- $(use_enable vhost-net)
- $(use_enable xen)
- $(use_enable xattr attr)
- --disable-darwin-user --disable-bsd-user
- "
-
- # audio options
- audio_opts="oss"
- use alsa && audio_opts="alsa ${audio_opts}"
- use esd && audio_opts="esd ${audio_opts}"
- use pulseaudio && audio_opts="pa ${audio_opts}"
- use sdl && audio_opts="sdl ${audio_opts}"
-
- set -- --prefix="${EPREFIX}"/usr \
- --sysconfdir="${EPREFIX}"/etc \
- --disable-strip \
- --disable-werror \
- --disable-kvm \
- --disable-libiscsi \
- --enable-nptl \
- --enable-uuid \
- ${conf_opts} \
- --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
- --audio-drv-list="${audio_opts}" \
- --target-list="${softmmu_targets} ${user_targets}" \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)"
-
- echo ./configure "$@" # show actual options
- ./configure "$@" || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- if [[ -n ${softmmu_targets} ]]; then
- if use qemu-ifup; then
- exeinto /etc/qemu
- doexe "${FILESDIR}"/qemu-if{up,down}
- fi
- fi
-
- dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
- newdoc pc-bios/README README.pc-bios || die
- dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
- use qemu-ifup || return
- elog "You will need the Universal TUN/TAP driver compiled into your"
- elog "kernel or loaded as a module to use the virtual network device"
- elog "if using -net tap. You will also need support for 802.1d"
- elog "Ethernet Bridging and a configured bridge if using the provided"
- elog "qemu-ifup script from /etc/qemu."
- echo
-}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 27bdd582aa51..40743bc5c08d 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.15 2012/01/29 12:18:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.2 2011/09/20 22:34:01 mgorny Exp $
-EAPI=4
+EAPI="2"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git
@@ -12,8 +12,11 @@ fi
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
@@ -22,13 +25,13 @@ HOMEPAGE="http://www.qemu.org"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen xfs"
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup sasl sdl ssl static vde"
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -42,8 +45,9 @@ RESTRICT="test"
RDEPEND="
!app-emulation/qemu-kvm
+ !app-emulation/qemu-softmmu
!app-emulation/qemu-user
- >=dev-libs/glib-2.0
+ !app-emulation/qemu-kvm-spice
sys-apps/pciutils
>=sys-apps/util-linux-2.16.0
sys-libs/zlib
@@ -56,90 +60,33 @@ RDEPEND="
fdt? ( >=sys-apps/dtc-1.2.0 )
jpeg? ( virtual/jpeg )
ncurses? ( sys-libs/ncurses )
- nss? ( dev-libs/nss )
- opengl? (
- virtual/opengl
- x11-libs/libX11
- )
png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? (
- sys-apps/iproute2
- net-misc/bridge-utils
- )
- rbd? ( sys-cluster/ceph )
+ qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? (
- >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1
- )
ssl? ( net-libs/gnutls )
- usbredir? ( sys-apps/usbredir )
vde? ( net-misc/vde )
- xattr? ( sys-apps/attr )
- xen? ( app-emulation/xen-tools )
- xfs? ( sys-fs/xfsprogs )
"
DEPEND="${RDEPEND}
app-text/texi2html
- dev-util/pkgconfig
- >=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-armeb
- usr/bin/qemu-cris
- usr/bin/qemu-i386
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-sparc64
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32
- usr/bin/qemu-x86_64
+ >=sys-kernel/linux-headers-2.6.29
+ ssl? ( dev-util/pkgconfig )
"
pkg_setup() {
use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-
- use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
}
src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-
- # drop '-g' by default as it tends to eat
- # A LOT (~2GB) of ram for each job #355861
- sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
- -i configure || die
-
- # Fix underlinking.
- # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
- sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+ # append CFLAGS while linking
+ sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
}
src_configure() {
@@ -155,13 +102,13 @@ src_configure() {
user_targets="${user_targets} ${target}-linux-user"
done
- if [[ -z ${softmmu_targets} ]]; then
+ if [ -z "${softmmu_targets}" ]; then
conf_opts="${conf_opts} --disable-system"
else
einfo "Building the following softmmu targets: ${softmmu_targets}"
fi
- if [[ -n ${user_targets} ]]; then
+ if [ ! -z "${user_targets}" ]; then
einfo "Building the following user targets: ${user_targets}"
conf_opts="${conf_opts} --enable-linux-user"
else
@@ -174,32 +121,25 @@ src_configure() {
# Add support for static builds
use static && conf_opts="${conf_opts} --static"
+ # Fix the $(prefix)/etc issue
+ conf_opts="${conf_opts} --sysconfdir=/etc"
+
#config options
- conf_opts="${conf_opts}
- $(use_enable aio linux-aio)
- $(use_enable bluetooth bluez)
- $(use_enable brltty brlapi)
- $(use_enable curl)
- $(use_enable fdt)
- $(use_enable hardened pie)
- $(use_enable jpeg vnc-jpeg)
- $(use_enable ncurses curses)
- $(use_enable nss smartcard-nss)
- $(use_enable opengl)
- $(use_enable png vnc-png)
- $(use_enable rbd)
- $(use_enable sasl vnc-sasl)
- $(use_enable sdl)
- $(use_enable spice)
- $(use_enable ssl vnc-tls)
- $(use_enable threads vnc-thread)
- $(use_enable vde)
- $(use_enable vhost-net)
- $(use_enable xen)
- $(use_enable xattr attr)
- $(use_enable xfs xfsctl)
- --disable-darwin-user --disable-bsd-user
- "
+ conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
+ conf_opts="${conf_opts} $(use_enable curl)"
+ conf_opts="${conf_opts} $(use_enable fdt)"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+ conf_opts="${conf_opts} --disable-xen"
+ conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
# audio options
audio_opts="oss"
@@ -207,39 +147,45 @@ src_configure() {
use esd && audio_opts="esd ${audio_opts}"
use pulseaudio && audio_opts="pa ${audio_opts}"
use sdl && audio_opts="sdl ${audio_opts}"
-
- set -- --prefix="${EPREFIX}"/usr \
- --sysconfdir="${EPREFIX}"/etc \
+ ./configure --prefix=/usr \
--disable-strip \
--disable-werror \
- $(use_enable kvm) \
- --disable-libiscsi \
+ --disable-kvm \
--enable-nptl \
--enable-uuid \
${conf_opts} \
- --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
--audio-drv-list="${audio_opts}" \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)"
+ --host-cc="$(tc-getBUILD_CC)" \
+ || die "configure failed"
+
+ # this is for qemu upstream's threaded support which is
+ # in development and broken
+ # the kvm project has its own support for threaded IO
+ # which is always on and works
+ # --enable-io-thread \
+}
- echo ./configure "$@" # show actual options
- ./configure "$@" || die "configure failed"
+src_compile() {
+ # Restricting parallel build until we get a patch to fix this
+ emake || die
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
- if [[ -n ${softmmu_targets} ]]; then
- if use qemu-ifup; then
- exeinto /etc/qemu
- doexe "${FILESDIR}"/qemu-if{up,down}
- fi
+ if [ ! -z "${softmmu_targets}" ]; then
+ exeinto /etc/qemu
+ use qemu-ifup && { doexe \
+ "${FILESDIR}/qemu-ifup" \
+ "${FILESDIR}/qemu-ifdown" \
+ || die "qemu interface scripts missing" ; }
fi
- dodoc Changelog MAINTAINERS TODO pci-ids.txt
- newdoc pc-bios/README README.pc-bios
- dohtml qemu-doc.html qemu-tech.html
+ dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+ newdoc pc-bios/README README.pc-bios || die
+ dohtml qemu-doc.html qemu-tech.html || die
}
pkg_postinst() {
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index 7fe9f4c61dd1..c690eb31ea77 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,3 +1,2 @@
DIST spice-protocol-0.10.0.tar.bz2 65811 RMD160 82f4e9e6847947be139de02bd1ede745cdb0e8fc SHA1 6ca37bc05521feccdb624c8d7f42fbc19b1d08a9 SHA256 05fa0e3133d288289282741a58975daf6d340a2bc9af2e72602a91801afa5899
-DIST spice-protocol-0.10.1.tar.bz2 66014 RMD160 abdef903bb5c075e1ddb68bd63d9172bd72029d7 SHA1 9f6ed3a6ab4c830a4c65b857a48f6b579e8b994d SHA256 e5f6cbb679febc840eb530a5195d2625f900f7d21a5aefbadc95e3a3b9f03537
DIST spice-protocol-0.8.1.tar.bz2 65879 RMD160 e041a4c7de1004ec4dda9e62c1d88804110f1d2c SHA1 8deaa873b05f6a54d2a8cc003d75c3473cdbd2dd SHA256 cefeb574e243104bd1bb85bc0af17a313ba9902dae8ad016f9c853e6b06e69d9
diff --git a/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild b/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild
index b7c87c9fd521..d67edbeb2730 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild,v 1.3 2012/01/28 15:17:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-protocol/spice-protocol-0.10.0.ebuild,v 1.1 2011/11/14 08:40:46 dev-zero Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.10.1.ebuild b/app-emulation/spice-protocol/spice-protocol-0.10.1.ebuild
deleted file mode 100644
index caffa9eae1b2..000000000000
--- a/app-emulation/spice-protocol/spice-protocol-0.10.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-protocol/spice-protocol-0.10.1.ebuild,v 1.1 2012/01/19 17:59:43 dev-zero Exp $
-
-EAPI=4
-
-DESCRIPTION="Headers defining the SPICE protocol."
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/vice/vice-2.3.ebuild b/app-emulation/vice/vice-2.3.ebuild
index 9216bdab1f5b..ed96271c2336 100644
--- a/app-emulation/vice/vice-2.3.ebuild
+++ b/app-emulation/vice/vice-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.6 2012/01/13 17:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.5 2011/12/13 18:23:07 mr_bones_ Exp $
EAPI=2
-inherit autotools eutils games toolchain-funcs
+inherit autotools eutils games
DESCRIPTION="The Versatile Commodore 8-bit Emulator"
HOMEPAGE="http://vice-emu.sourceforge.net/"
@@ -81,7 +81,7 @@ src_prepare() {
src_configure() {
# don't try to actually run fc-cache (bug #280976)
FCCACHE=/bin/true \
- PKG_CONFIG=$(tc-getPKG_CONFIG) \
+ PKG_CONFIG=pkg-config \
egamesconf \
--disable-dependency-tracking \
--enable-fullscreen \
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index ea13224d7fb4..d4d177d11ef4 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1,3 @@
DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5
DIST virt-manager-0.9.0-bp-1.tar.bz2 707 RMD160 e4614dd36bd1a334080dcb712d731665944ef705 SHA1 dc007460bb721eb385c02de671045820926626b6 SHA256 823ae2aea4515e47db9791e3edda78530223a48ba2fa0bdb33a328e85e64f284
-DIST virt-manager-0.9.0-bp-4.tar.bz2 18460 RMD160 2705ec182bab62722a6f6d0b4243e1835eaff053 SHA1 12eb90591a44b4f3479b0c910c06ca298be8073d SHA256 91039fb4039499de87b17d67f5083f86ae6c8e6949585bc2336c0490071654a1
DIST virt-manager-0.9.0.tar.gz 1951176 RMD160 f3af53591babe3d95c4017d19a292fd6c1bfee97 SHA1 e937b9aedc7c4ebc84fbfa48c622d1918cf7a335 SHA256 db0de808efa5d6bae0bdc2db796e58ea79f9e1db20d9a5a5977b28b4b85d4321
diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild
deleted file mode 100644
index bffc1a4094bb..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild,v 1.3 2012/01/20 09:33:31 jlec Exp $
-
-BACKPORTS=4
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
- GIT_ECLASS="git-2 autotools"
-fi
-
-PYTHON_DEPEND="2:2.4"
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
- VIRTINSTDEP=">=app-emulation/virtinst-9999"
-else
- SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
- ${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
- http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
- VIRTINSTDEP=">=app-emulation/virtinst-0.600.0-r2"
-fi
-
-DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
-HOMEPAGE="http://virt-manager.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring policykit sasl spice"
-RDEPEND=">=dev-python/pygtk-1.99.12
- >=app-emulation/libvirt-0.7.0[python,sasl?]
- >=dev-libs/libxml2-2.6.23[python]
- ${VIRTINSTDEP}
- >=gnome-base/librsvg-2
- >=x11-libs/vte-0.12.2:0[python]
- >=net-libs/gtk-vnc-0.3.8[python,sasl?]
- >=dev-python/dbus-python-0.61
- >=dev-python/gconf-python-1.99.11
- dev-python/urlgrabber
- gnome-keyring? ( dev-python/gnome-keyring-python )
- policykit? ( sys-auth/polkit )
- spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
-# tui? ( >=dev-python/new_syrup-0.1.2 )"
-DEPEND="${RDEPEND}
- app-text/rarian
- dev-util/intltool"
-
-pkg_setup() {
- G2CONF="--without-tui"
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- sed -e "s/python/python2/" -i src/virt-manager.in || \
- die "python2 update failed"
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- if [[ ${PV} = *9999* ]]; then
- # virt-manager's autogen.sh touches this and eautoreconf fails
- # unless we do this
- touch config.rpath
-
- rm -rf config.status || die
- intltoolize --automake --copy --force || die
- perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
- perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
- po/Makefile.in.in || die
- eautoreconf
- fi
-
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
- gnome2_pkg_postrm
-}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 8ac09780daa3..486b2c492858 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.8 2012/01/20 09:33:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.7 2011/07/27 15:37:30 cardoe Exp $
#BACKPORTS=
-EAPI=4
+EAPI=2
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
@@ -26,7 +26,7 @@ else
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
KEYWORDS="~amd64 ~x86"
- VIRTINSTDEP=">=app-emulation/virtinst-0.600.0-r2"
+ VIRTINSTDEP=">=app-emulation/virtinst-0.500.6"
fi
DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
@@ -47,16 +47,13 @@ RDEPEND=">=dev-python/pygtk-1.99.12
gnome-keyring? ( dev-python/gnome-keyring-python )
policykit? ( sys-auth/polkit )
spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
-# tui? ( >=dev-python/new_syrup-0.1.2 )"
DEPEND="${RDEPEND}
app-text/rarian
dev-util/intltool"
-pkg_setup() {
+# The TUI (terminal UI) requires newt_syrup which is not packaged on
+# Gentoo. bug #356711
G2CONF="--without-tui"
- python_set_active_version 2
- python_pkg_setup
-}
src_prepare() {
sed -e "s/python/python2/" -i src/virt-manager.in || \
@@ -71,23 +68,33 @@ src_prepare() {
# unless we do this
touch config.rpath
- rm -rf config.status || die
- intltoolize --automake --copy --force || die
- perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
+ rm -rf config.status
+ intltoolize --automake --copy --force
+ perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
- po/Makefile.in.in || die
+ po/Makefile.in.in
eautoreconf
fi
gnome2_src_prepare
}
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
- gnome2_pkg_postinst
-}
+src_install() {
+ gnome2_src_install
+
+ insinto /usr/share/virt-manager/pixmaps/
+ doins "${S}"/pixmaps/*.png
+ doins "${S}"/pixmaps/*.svg
+
+ insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
+ doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
+
+ insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
+ doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
+
+ insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
+ doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
- gnome2_pkg_postrm
+ insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
+ doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
}
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 74d21823cc44..1a781ed5527e 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1 +1 @@
-DIST virt-viewer-0.4.2.tar.gz 442244 RMD160 f1094a374b0d808af77ba992fd12ba38c25a0623 SHA1 3b1d253c3c5f9cc89786e601e40a6ac72e52d4ee SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c
+DIST virt-viewer-0.2.0.tar.gz 329012 RMD160 0426c11c7430580fff089ccecb5e46d5dc515555 SHA1 65a0928cee2177decb68767f9f5ab8c4cb4f1af0 SHA256 9772a9e2b55f7d4eeae012964c594c4f96129b130ed34004fa42033bc9ad1352
diff --git a/app-emulation/virt-viewer/files/virt-viewer-0.2.0-xulrunner-1.9.1.patch b/app-emulation/virt-viewer/files/virt-viewer-0.2.0-xulrunner-1.9.1.patch
new file mode 100644
index 000000000000..7e015d07e0b1
--- /dev/null
+++ b/app-emulation/virt-viewer/files/virt-viewer-0.2.0-xulrunner-1.9.1.patch
@@ -0,0 +1,24 @@
+diff -Naur virt-viewer-0.2.0.orig/plugin/npshell.c virt-viewer-0.2.0/plugin/npshell.c
+--- virt-viewer-0.2.0.orig/plugin/npshell.c 2009-08-03 16:31:59.413536402 +0200
++++ virt-viewer-0.2.0/plugin/npshell.c 2009-08-03 16:28:27.682285745 +0200
+@@ -84,7 +84,7 @@
+ #include
+
+ #include
+-#include
++#include
+
+ #include "virt-viewer-plugin.h"
+
+diff -Naur virt-viewer-0.2.0.orig/plugin/npunix.c virt-viewer-0.2.0/plugin/npunix.c
+--- virt-viewer-0.2.0.orig/plugin/npunix.c 2009-08-03 16:32:05.906537077 +0200
++++ virt-viewer-0.2.0/plugin/npunix.c 2009-08-03 16:27:53.100384815 +0200
+@@ -57,7 +57,7 @@
+
+ #include
+ #include
+-#include
++#include
+
+ #include /* just for G_GNUC_UNUSED */
+
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 7df3f1058c06..8806b08f13f2 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -1,14 +1,5 @@
- virtualization
-
- Link against x11-libs/gtk+:3 instead of
- x11-libs/gtk+:2
- Support connecting to SPICE-enabled virtual
- machines.
- Support connecting to VNC-enabled virtual
- machines.
-
+virtualization
-
diff --git a/app-emulation/virt-viewer/virt-viewer-0.2.0-r1.ebuild b/app-emulation/virt-viewer/virt-viewer-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..62585324d613
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-0.2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.2.0-r1.ebuild,v 1.2 2011/03/27 10:34:20 nirbheek Exp $
+
+EAPI=2
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nsplugin"
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=gnome-base/libglade-2.6.0:2.0
+ >=app-emulation/libvirt-0.6.0
+ >=net-libs/gtk-vnc-0.3.8
+ >=dev-libs/libxml2-2.6.0:2
+ nsplugin? ( >=dev-libs/nspr-4.0.0
+ >=net-libs/xulrunner-1.9.0:1.9 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf $(use_enable nsplugin plugin)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/app-emulation/virt-viewer/virt-viewer-0.2.0-r2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..1f3067da5c75
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-0.2.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.2.0-r2.ebuild,v 1.2 2011/03/27 10:34:20 nirbheek Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nsplugin"
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+ >=gnome-base/libglade-2.6.0:2.0
+ >=app-emulation/libvirt-0.6.0
+ >=net-libs/gtk-vnc-0.3.8
+ >=dev-libs/libxml2-2.6.0:2
+ nsplugin? ( >=dev-libs/nspr-4.0.0
+ >=net-libs/xulrunner-1.9.1:1.9 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-xulrunner-1.9.1.patch
+}
+
+src_configure() {
+ econf $(use_enable nsplugin plugin)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
deleted file mode 100644
index 2d66fb47ece3..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.3 2012/01/19 20:20:39 cardoe Exp $
-
-EAPI=4
-
-inherit eutils gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk3 nsplugin sasl spice +vnc"
-RDEPEND=">=app-emulation/libvirt-0.6.0
- >=dev-libs/libxml2-2.6.0:2
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.10.0:2
- >=gnome-base/libglade-2.6.0:2.0 )
- nsplugin? ( >=dev-libs/nspr-4.0.0
- >=net-libs/xulrunner-1.9.1:1.9
- >=x11-libs/gtk+-2.10.0:2
- >=gnome-base/libglade-2.6.0:2.0 )
- spice? ( >=net-misc/spice-gtk-0.6[sasl?,gtk3?] )
- vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if ! use spice && ! use vnc; then
- eerror "You must have USE=vnc or USE=spice enabled."
- die "You must have USE=vnc or USE=spice enabled."
- fi
-}
-
-pkg_setup() {
- G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
- G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
- use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
- use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
-}
diff --git a/app-emulation/virtinst/Manifest b/app-emulation/virtinst/Manifest
index 63d6d9f1820d..9bdd4ca639d4 100644
--- a/app-emulation/virtinst/Manifest
+++ b/app-emulation/virtinst/Manifest
@@ -1,3 +1,2 @@
DIST virtinst-0.500.6.tar.gz 549365 RMD160 3f2d5865216208326c9ad8b5f6777a6317d189ee SHA1 50a55d34e5f46777e7446254262b30904eb0adc3 SHA256 ed824870f7ec8be1c499065a04c9de04977ef62a2e527db0151fc7a13bf1ce7b
-DIST virtinst-0.600.0-bp-2.tar.bz2 12398 RMD160 38bcfc6574b28c43a3c0ecf328728cd82330db4f SHA1 f06d789b71d2682dbd648bb258a54c5cdad89a4e SHA256 ff682503c2258de9c2e5b285bca6e2cb42acded7fa2bc7da76a12793fcbf89af
DIST virtinst-0.600.0.tar.gz 576764 RMD160 6efb6ce5ad6d6c4d5ffbc95e1695ac125d1ee249 SHA1 c7b14287927969e20ce60e3726bfe7e3dc57a4fe SHA256 92dc8f14d31ffb0e79479fab982203027c45c83d25e73af7627f589f92ca797a
diff --git a/app-emulation/virtinst/virtinst-0.600.0-r2.ebuild b/app-emulation/virtinst/virtinst-0.600.0-r2.ebuild
deleted file mode 100644
index 1056ea9b7c88..000000000000
--- a/app-emulation/virtinst/virtinst-0.600.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.0-r2.ebuild,v 1.1 2012/01/18 17:32:51 cardoe Exp $
-
-BACKPORTS=2
-
-EAPI=3
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="http://git.fedorahosted.org/git/python-virtinst.git"
- GIT_ECLASS="git-2"
-fi
-
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
- ${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
- http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Python modules for starting virtualized guest installations"
-HOMEPAGE="http://virt-manager.et.redhat.com/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND=">=app-emulation/libvirt-0.7.0[python]
- dev-python/urlgrabber
- dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="virtconv virtinst"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- distutils_src_prepare
-}
diff --git a/app-emulation/virtinst/virtinst-0.600.0.ebuild b/app-emulation/virtinst/virtinst-0.600.0.ebuild
index 56dc8258f29d..800d578460da 100644
--- a/app-emulation/virtinst/virtinst-0.600.0.ebuild
+++ b/app-emulation/virtinst/virtinst-0.600.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.0.ebuild,v 1.4 2012/01/28 15:25:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.0.ebuild,v 1.2 2011/07/28 19:20:30 cardoe Exp $
#BACKPORTS=1
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Python modules for starting virtualized guest installations"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 93d53723b89a..8f218561302b 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,3 +1,3 @@
+DIST VBoxGuestAdditions_4.0.12.iso 40755200 RMD160 148f84317d0161c4757b5d1d2c75f6491b94bec2 SHA1 542e6a0495306deab3e80d58e2274208ff296cad SHA256 8f3d0129609b01b27ffaa96dd967e1adab851b13f7c2261adfa005f6c7a5cce0
DIST VBoxGuestAdditions_4.1.4.iso 44716032 RMD160 af6062dcf625c82ec2184921d91ffdd2e326f1a6 SHA1 5d4b1d0ed5745f54b7aa9f709bc9a129c6e41e38 SHA256 75796a780f35c697c752d754b100d61afed7ee858ee49f34710c2d79ad50dc32
DIST VBoxGuestAdditions_4.1.6.iso 44761088 RMD160 3c640f68e7d681052872977d7b854f8331639b88 SHA1 082e1cc631fb2aeec26d728166e693b7c5014079 SHA256 f544516a7443da759632a4a1345f0ed7e894065eb834f339bc7490f5d7908b3d
-DIST VBoxGuestAdditions_4.1.8.iso 45471744 RMD160 8730184e30ff856ad09f75ea3e6886f872339ba0 SHA1 92b5bedf25619f976a49391bb1998c3dbc8efca9 SHA256 2265aa350de2d62021e91ae6bbd1438c291a74494778bb443926e9b7b962c63d
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.0.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.0.12.ebuild
new file mode 100644
index 000000000000..3ab3fb2d10e8
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.0.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.0.12.ebuild,v 1.3 2011/07/22 16:57:38 hwoarang Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+ !=app-emulation/virtualbox-9999"
+
+src_unpack() {
+ return 0
+}
+
+src_install() {
+ insinto /usr/share/${PN/-additions}
+ newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
deleted file mode 100644
index 6e31bc746b4d..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild,v 1.1 2011/12/20 13:24:40 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
- !=app-emulation/virtualbox-9999"
-
-src_unpack() {
- return 0
-}
-
-src_install() {
- insinto /usr/share/${PN/-additions}
- newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index b9f9e810d201..1d5b02359c2b 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,12 +1,12 @@
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.0.12-72916.tar.gz 3531739 RMD160 d6db6e9d8515b3274b6b9ac206b4582ea137db4f SHA1 3b9a734ee0e8a0ab07459fd8985da999f309f53e SHA256 0290d4e1580f638b6e49fa47fb1047f884d0aaff88a7d7356296f7d4f03267ce
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.tar.gz 9585392 RMD160 7e35093c06edf3956c0edb77e2dd1fb1b439a7d8 SHA1 4db22b5720557f4d42447891174bc7e34a6dca3d SHA256 67311c407eac2db94c29ab8a4baf47f51ddaea0423d3fac3b409728cd6ada80c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
+DIST VirtualBox-4.0.12-72916-Linux_amd64.run 68167122 RMD160 34664eb0d633344b5055e393260fde9ae6ee624c SHA1 cb501480e5698e24d6a40471d16b15e1df2aa9f4 SHA256 88fadd701c0955249f0da9ca2b0bbd3bc969a1e5125031a9e4b3100d4293d76d
+DIST VirtualBox-4.0.12-72916-Linux_x86.run 67788238 RMD160 794aa31b97064ed484d39e3483b0a22cf4c45f5a SHA1 f716009cdd3408466c8267488a2f658171c5d5c2 SHA256 faf308e5010cae2be3fccf24106d5b69b6d57717bd3cdb6a82dfcf1a93688307
DIST VirtualBox-4.1.4-74291-Linux_amd64.run 73235921 RMD160 d9d067ea922a358062b9fe1e8d17216974cff400 SHA1 3d6ee4c217ab936eb6acf175fcc408133f201507 SHA256 b079b311f6aa662332cd5118bbe01d47589595849c4dd53f4b65af25de923a0a
DIST VirtualBox-4.1.4-74291-Linux_x86.run 73020877 RMD160 1a12db57d13286690a7b2a06d3d09d14a9f9d91e SHA1 87b9536b0d309bb2fdf549ff5d0db3e17945a7b9 SHA256 a907733bf41c32896a211b146b066aadaa1a3e11afb9e9c80ef3ed642cc3c94d
DIST VirtualBox-4.1.6-74727-Linux_amd64.run 73297360 RMD160 e81e043e63a09e567aab2675714e4d96562914fb SHA1 4932555b366618b50e6341c1fc6d34938d42cd82 SHA256 9c7464c7b59b9491e3fc1ea51697b766fc6bb2130bc677ed0e3c66a6cff6f868
DIST VirtualBox-4.1.6-74727-Linux_x86.run 73113036 RMD160 37e72d2e3eac1aacf7bcd60576b609867af4d073 SHA1 b950b3a0a9ebd42d23c91298ed963b325a29b830 SHA256 84f1cecb3fca09f8b13df0372b20e8f78b7f2f7f2365e811438a33e0d07ae4f0
-DIST VirtualBox-4.1.8-75467-Linux_amd64.run 75027920 RMD160 5bc2f47d870be78ec201d77971b4914f4b019c50 SHA1 bb9e80ddfc812d99cd27135c05304e20b6a28535 SHA256 7d0d45dfc8e4ef27a817c017c6589d5204a6515d86f0c874843cb99ccfe319ee
-DIST VirtualBox-4.1.8-75467-Linux_x86.run 75007436 RMD160 58ea91a06f030893676805097f403c0fd0419fb2 SHA1 8833fc8de41f9a3bbaee05b6c27750fffdccf919 SHA256 7780d8fc171ccfa3047a3d6373f9965b8c2896b11137817314f29cf5a3bc514f
+DIST VirtualBoxSDK-4.0.12-72916.zip 6495305 RMD160 44273b7b2dd9c5c18dda48573a63f3556264dd26 SHA1 97eea86033df045c0a459c6dabbc0ac41fc19202 SHA256 b042515431cd5b686ba21170996b0eed53c2e8b28e1ec9246d88fb9d55f88f7e
DIST VirtualBoxSDK-4.1.4-74291.zip 8803983 RMD160 a8a925a3d61c7a6fe03bfcdbfb2ff4c2c8e754f0 SHA1 77436fe0d22d58f371123df7402b556330e82bf9 SHA256 c0a5855a921611ae3264d70cfde64a3c2fb5ff3a1cd564716a1de0b23e7e9d3d
DIST VirtualBoxSDK-4.1.6-74713.zip 8804355 RMD160 e635f4727575bae927bedb02ccca063ec1207d47 SHA1 2253614f56300c821de7a0a7a8674a2d2dda264e SHA256 19fb30c04c8a979ee275205a8aaf8867d1435885d8bcfe5fa2c49d9b285d0621
-DIST VirtualBoxSDK-4.1.8-75467.zip 8805659 RMD160 13e73b31cdd452a8c9262aea62afa3fbdf4a6f06 SHA1 f57fb944b1ea143ffc3130671e7c90b4d554957e SHA256 116d855456fa8661c6d7a3178fcd604d6994d1c8365e697368c25f638e588aff
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.0.12.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.12.ebuild
new file mode 100644
index 000000000000..c2ee4dd095f5
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.0.12.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.0.12.ebuild,v 1.3 2011/07/22 16:57:58 hwoarang Exp $
+
+EAPI=2
+
+inherit eutils fdo-mime pax-utils
+
+MY_PV=${PV}-72916
+SDK_PV=${MY_PV}
+EXTP_PV=${MY_PV}
+MY_P=VirtualBox-${MY_PV}-Linux
+EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
+ x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
+ sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
+ http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="!!app-emulation/virtualbox
+ !app-emulation/virtualbox-additions
+ ~app-emulation/virtualbox-modules-${PV}
+ !headless? (
+ x11-libs/libXcursor
+ media-libs/libsdl[X]
+ x11-libs/libXrender
+ x11-libs/libXfixes
+ media-libs/libpng
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXinerama
+ x11-libs/libXft
+ media-libs/freetype
+ media-libs/fontconfig
+ x11-libs/libXext
+ dev-libs/glib
+ chm? ( dev-libs/expat )
+ )
+ x11-libs/libXt
+ dev-libs/libxml2
+ x11-libs/libXau
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libXdmcp
+ python? ( || (
+ dev-lang/python:2.7
+ dev-lang/python:2.6
+ dev-lang/python:2.5
+ dev-lang/python:2.4
+ ) )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+ opt/VirtualBox/VBoxSDL.so
+ opt/VirtualBox/VBoxDbg.so
+ opt/VirtualBox/VBoxSharedFolders.so
+ opt/VirtualBox/VBoxDD2.so
+ opt/VirtualBox/VBoxOGLrenderspu.so
+ opt/VirtualBox/VBoxPython.so
+ opt/VirtualBox/VBoxPython2_3.so
+ opt/VirtualBox/VBoxPython2_4.so
+ opt/VirtualBox/VBoxPython2_5.so
+ opt/VirtualBox/VBoxPython2_6.so
+ opt/VirtualBox/VBoxPython2_7.so
+ opt/VirtualBox/VBoxPython3_0.so
+ opt/VirtualBox/VBoxPython3_1.so
+ opt/VirtualBox/VBoxDD.so
+ opt/VirtualBox/VBoxVRDP.so
+ opt/VirtualBox/VBoxDDU.so
+ opt/VirtualBox/VBoxREM64.so
+ opt/VirtualBox/VBoxSharedClipboard.so
+ opt/VirtualBox/VBoxHeadless.so
+ opt/VirtualBox/VBoxRT.so
+ opt/VirtualBox/VRDPAuth.so
+ opt/VirtualBox/VBoxREM.so
+ opt/VirtualBox/VBoxSettings.so
+ opt/VirtualBox/VBoxKeyboard.so
+ opt/VirtualBox/VBoxSharedCrOpenGL.so
+ opt/VirtualBox/VBoxVMM.so
+ opt/VirtualBox/VirtualBox.so
+ opt/VirtualBox/VBoxOGLhosterrorspu.so
+ opt/VirtualBox/components/VBoxC.so
+ opt/VirtualBox/components/VBoxSVCM.so
+ opt/VirtualBox/VBoxREM32.so
+ opt/VirtualBox/VBoxPython2_5.so
+ opt/VirtualBox/VBoxXPCOMC.so
+ opt/VirtualBox/VBoxOGLhostcrutil.so
+ opt/VirtualBox/VBoxNetDHCP.so
+ opt/VirtualBox/VBoxGuestControlSvc.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+ opt/VirtualBox/VBoxDD2.so
+ opt/VirtualBox/VBoxDDU.so
+ opt/VirtualBox/VBoxDbg.so
+ opt/VirtualBox/VBoxGuestControlSvc.so
+ opt/VirtualBox/VBoxGuestPropSvc.so
+ opt/VirtualBox/VBoxHeadless
+ opt/VirtualBox/VBoxHeadless.so
+ opt/VirtualBox/VBoxKeyboard.so
+ opt/VirtualBox/VBoxManage
+ opt/VirtualBox/VBoxNetAdpCtl
+ opt/VirtualBox/VBoxNetDHCP
+ opt/VirtualBox/VBoxNetDHCP.so
+ opt/VirtualBox/VBoxOGLhostcrutil.so
+ opt/VirtualBox/VBoxOGLhosterrorspu.so
+ opt/VirtualBox/VBoxOGLrenderspu.so
+ opt/VirtualBox/VBoxPython.so
+ opt/VirtualBox/VBoxPython2_3.so
+ opt/VirtualBox/VBoxPython2_4.so
+ opt/VirtualBox/VBoxPython2_5.so
+ opt/VirtualBox/VBoxPython2_6.so
+ opt/VirtualBox/VBoxPython2_7.so
+ opt/VirtualBox/VBoxPython3_0.so
+ opt/VirtualBox/VBoxPython3_1.so
+ opt/VirtualBox/VBoxREM.so
+ opt/VirtualBox/VBoxREM32.so
+ opt/VirtualBox/VBoxREM64.so
+ opt/VirtualBox/VBoxRT.so
+ opt/VirtualBox/VBoxSDL
+ opt/VirtualBox/VBoxSDL.so
+ opt/VirtualBox/VBoxSVC
+ opt/VirtualBox/VBoxSettings.so
+ opt/VirtualBox/VBoxSharedClipboard.so
+ opt/VirtualBox/VBoxSharedCrOpenGL.so
+ opt/VirtualBox/VBoxSharedFolders.so
+ opt/VirtualBox/VBoxTestOGL
+ opt/VirtualBox/VBoxTunctl
+ opt/VirtualBox/VBoxVMM.so
+ opt/VirtualBox/VBoxVRDP.so
+ opt/VirtualBox/VBoxXPCOM.so
+ opt/VirtualBox/VBoxXPCOMC.so
+ opt/VirtualBox/VBoxXPCOMIPCD
+ opt/VirtualBox/VRDPAuth.so
+ opt/VirtualBox/VirtualBox
+ opt/VirtualBox/VirtualBox.so
+ opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+ opt/VirtualBox/components/VBoxC.so
+ opt/VirtualBox/components/VBoxSVCM.so
+ opt/VirtualBox/components/VBoxXPCOMIPCC.so
+ opt/VirtualBox/kchmviewer
+ opt/VirtualBox/libQtCoreVBox.so.4
+ opt/VirtualBox/libQtGuiVBox.so.4
+ opt/VirtualBox/libQtNetworkVBox.so.4
+ opt/VirtualBox/libQtOpenGLVBox.so.4
+ opt/VirtualBox/vboxwebsrv"
+
+src_unpack() {
+ unpack_makeself ${MY_P}_${ARCH}.run
+ unpack ./VirtualBox.tar.bz2
+
+ mkdir "${S}"/${EXTP_PN} || die
+ pushd "${S}"/${EXTP_PN} &>/dev/null || die
+ unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+ popd &>/dev/null || die
+
+ if use sdk; then
+ unpack VirtualBoxSDK-${SDK_PV}.zip
+ fi
+}
+
+src_install() {
+ # create virtualbox configurations files
+ insinto /etc/vbox
+ newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+ if ! use headless ; then
+ newicon VBox.png ${PN}.png
+ newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+ fi
+
+ pushd "${S}"/${EXTP_PN} &>/dev/null || die
+ insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+ doins -r linux.${ARCH}
+ doins ExtPack* PXE-Intel.rom
+ popd &>/dev/null || die
+ rm -rf "${S}"/${EXTP_PN}
+
+ insinto /opt/VirtualBox
+ dodir /opt/bin
+
+ doins UserManual.pdf
+
+ if use sdk ; then
+ doins -r sdk || die
+ fi
+
+ if use additions; then
+ doins -r additions || die
+ fi
+
+ if use vboxwebsrv; then
+ doins vboxwebsrv || die
+ fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+ fperms 0750 /opt/VirtualBox/vboxwebsrv
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+ newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+ newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+ fi
+
+ if use rdesktop-vrdp; then
+ doins rdesktop-vrdp || die
+ doins -r rdesktop-vrdp-keymaps || die
+ fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+ dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+ fi
+
+ if ! use headless && use chm; then
+ doins kchmviewer VirtualBox.chm || die
+ fowners root:vboxusers /opt/VirtualBox/kchmviewer
+ fperms 0750 /opt/VirtualBox/kchmviewer
+ fi
+
+ if use python; then
+ local pyver
+ for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
+ if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
+ doins VBoxPython${pyver/./_}.so || die
+ fi
+ done
+ fi
+
+ rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+ vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+ VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+ webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+ 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+ VBoxPython?_*.so
+
+ if use headless ; then
+ rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+ fi
+
+ doins -r * || die
+
+ # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+ dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+ dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+ dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+ dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+ dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+ local each
+ for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
+ fowners root:vboxusers /opt/VirtualBox/${each}
+ fperms 0750 /opt/VirtualBox/${each}
+ pax-mark -m "${D}"/opt/VirtualBox/${each}
+ done
+ # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+ fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+ fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+
+ if ! use headless ; then
+ # Hardened build: Mark selected binaries set-user-ID-on-execution
+ for each in VBox{SDL,Headless} VirtualBox; do
+ fowners root:vboxusers /opt/VirtualBox/${each}
+ fperms 4510 /opt/VirtualBox/${each}
+ pax-mark -m "${D}"/opt/VirtualBox/${each}
+ done
+
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+ else
+ # Hardened build: Mark selected binaries set-user-ID-on-execution
+ fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+ fperms 4510 /opt/VirtualBox/VBoxHeadless
+ pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+ fi
+
+ exeinto /opt/VirtualBox
+ newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
+ fowners root:vboxusers /opt/VirtualBox/VBox.sh
+ fperms 0750 /opt/VirtualBox/VBox.sh
+
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+ dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+ dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+ # set an env-variable for 3rd party tools
+ echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+ doenvd "${T}/90virtualbox"
+
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}"/10-virtualbox.rules
+ # move udev scripts into /lib/udev (bug #372491)
+ mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
+ fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+ elog ""
+ if ! use headless ; then
+ elog "To launch VirtualBox just type: \"VirtualBox\""
+ elog ""
+ fi
+ elog "You must be in the vboxusers group to use VirtualBox."
+ elog ""
+ elog "For advanced networking setups you should emerge:"
+ elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+ elog ""
+ elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+ elog "an overview about the different features of ${PN}"
+ elog "and virtualbox-ose"
+ if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+ elog ""
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "or else USB in ${PN} won't work."
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
index 2c554ff89a7c..09c22b174279 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.4 2012/02/05 05:25:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.3 2011/12/07 17:27:51 phajdan.jr Exp $
EAPI=2
-inherit eutils unpacker fdo-mime pax-utils
+inherit eutils fdo-mime pax-utils
MY_PV=${PV}-74291
SDK_PV=${MY_PV}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
index bae0e209a78d..8aca0a902852 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild,v 1.2 2012/02/05 05:25:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild,v 1.1 2011/11/06 23:39:18 polynomial-c Exp $
EAPI=2
-inherit eutils unpacker fdo-mime pax-utils
+inherit eutils fdo-mime pax-utils
MY_PV=${PV}-74727
SDK_PV=${PV}-74713
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
deleted file mode 100644
index 303dd3726e3d..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild,v 1.3 2012/02/05 05:25:37 vapier Exp $
-
-EAPI=2
-
-inherit eutils unpacker fdo-mime gnome2 pax-utils
-
-MY_PV=${PV}-75467
-SDK_PV=${MY_PV}
-EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
- x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
- sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
- http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="!!app-emulation/virtualbox
- !app-emulation/virtualbox-additions
- ~app-emulation/virtualbox-modules-${PV}
- !headless? (
- x11-libs/libXcursor
- media-libs/libsdl[X]
- x11-libs/libXrender
- x11-libs/libXfixes
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXinerama
- x11-libs/libXft
- media-libs/freetype
- media-libs/fontconfig
- x11-libs/libXext
- dev-libs/glib
- chm? ( dev-libs/expat )
- )
- x11-libs/libXt
- dev-libs/libxml2
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXdmcp
- python? ( || (
- dev-lang/python:2.7
- dev-lang/python:2.6
- dev-lang/python:2.5
- dev-lang/python:2.4
- ) )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
- opt/VirtualBox/VBoxSDL.so
- opt/VirtualBox/VBoxDbg.so
- opt/VirtualBox/VBoxSharedFolders.so
- opt/VirtualBox/VBoxDD2.so
- opt/VirtualBox/VBoxOGLrenderspu.so
- opt/VirtualBox/VBoxPython.so
- opt/VirtualBox/VBoxPython2_3.so
- opt/VirtualBox/VBoxPython2_4.so
- opt/VirtualBox/VBoxPython2_5.so
- opt/VirtualBox/VBoxPython2_6.so
- opt/VirtualBox/VBoxPython2_7.so
- opt/VirtualBox/VBoxPython3_0.so
- opt/VirtualBox/VBoxPython3_1.so
- opt/VirtualBox/VBoxDD.so
- opt/VirtualBox/VBoxVRDP.so
- opt/VirtualBox/VBoxDDU.so
- opt/VirtualBox/VBoxREM64.so
- opt/VirtualBox/VBoxSharedClipboard.so
- opt/VirtualBox/VBoxHeadless.so
- opt/VirtualBox/VBoxRT.so
- opt/VirtualBox/VRDPAuth.so
- opt/VirtualBox/VBoxREM.so
- opt/VirtualBox/VBoxSettings.so
- opt/VirtualBox/VBoxKeyboard.so
- opt/VirtualBox/VBoxSharedCrOpenGL.so
- opt/VirtualBox/VBoxVMM.so
- opt/VirtualBox/VirtualBox.so
- opt/VirtualBox/VBoxOGLhosterrorspu.so
- opt/VirtualBox/components/VBoxC.so
- opt/VirtualBox/components/VBoxSVCM.so
- opt/VirtualBox/VBoxREM32.so
- opt/VirtualBox/VBoxPython2_5.so
- opt/VirtualBox/VBoxXPCOMC.so
- opt/VirtualBox/VBoxOGLhostcrutil.so
- opt/VirtualBox/VBoxNetDHCP.so
- opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
- opt/VirtualBox/VBoxDD2.so
- opt/VirtualBox/VBoxDDU.so
- opt/VirtualBox/VBoxDbg.so
- opt/VirtualBox/VBoxGuestControlSvc.so
- opt/VirtualBox/VBoxGuestPropSvc.so
- opt/VirtualBox/VBoxHeadless
- opt/VirtualBox/VBoxHeadless.so
- opt/VirtualBox/VBoxKeyboard.so
- opt/VirtualBox/VBoxManage
- opt/VirtualBox/VBoxNetAdpCtl
- opt/VirtualBox/VBoxNetDHCP
- opt/VirtualBox/VBoxNetDHCP.so
- opt/VirtualBox/VBoxOGLhostcrutil.so
- opt/VirtualBox/VBoxOGLhosterrorspu.so
- opt/VirtualBox/VBoxOGLrenderspu.so
- opt/VirtualBox/VBoxPython.so
- opt/VirtualBox/VBoxPython2_3.so
- opt/VirtualBox/VBoxPython2_4.so
- opt/VirtualBox/VBoxPython2_5.so
- opt/VirtualBox/VBoxPython2_6.so
- opt/VirtualBox/VBoxPython2_7.so
- opt/VirtualBox/VBoxPython3_0.so
- opt/VirtualBox/VBoxPython3_1.so
- opt/VirtualBox/VBoxREM.so
- opt/VirtualBox/VBoxREM32.so
- opt/VirtualBox/VBoxREM64.so
- opt/VirtualBox/VBoxRT.so
- opt/VirtualBox/VBoxSDL
- opt/VirtualBox/VBoxSDL.so
- opt/VirtualBox/VBoxSVC
- opt/VirtualBox/VBoxSettings.so
- opt/VirtualBox/VBoxSharedClipboard.so
- opt/VirtualBox/VBoxSharedCrOpenGL.so
- opt/VirtualBox/VBoxSharedFolders.so
- opt/VirtualBox/VBoxTestOGL
- opt/VirtualBox/VBoxTunctl
- opt/VirtualBox/VBoxVMM.so
- opt/VirtualBox/VBoxVRDP.so
- opt/VirtualBox/VBoxXPCOM.so
- opt/VirtualBox/VBoxXPCOMC.so
- opt/VirtualBox/VBoxXPCOMIPCD
- opt/VirtualBox/VRDPAuth.so
- opt/VirtualBox/VirtualBox
- opt/VirtualBox/VirtualBox.so
- opt/VirtualBox/accessible/libqtaccessiblewidgets.so
- opt/VirtualBox/components/VBoxC.so
- opt/VirtualBox/components/VBoxSVCM.so
- opt/VirtualBox/components/VBoxXPCOMIPCC.so
- opt/VirtualBox/kchmviewer
- opt/VirtualBox/libQtCoreVBox.so.4
- opt/VirtualBox/libQtGuiVBox.so.4
- opt/VirtualBox/libQtNetworkVBox.so.4
- opt/VirtualBox/libQtOpenGLVBox.so.4
- opt/VirtualBox/vboxwebsrv"
-
-src_unpack() {
- unpack_makeself ${MY_P}_${ARCH}.run
- unpack ./VirtualBox.tar.bz2
-
- mkdir "${S}"/${EXTP_PN} || die
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
- popd &>/dev/null || die
-
- if use sdk; then
- unpack VirtualBoxSDK-${SDK_PV}.zip
- fi
-}
-
-src_configure() {
- :;
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- # create virtualbox configurations files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-config" vbox.cfg
-
- if ! use headless ; then
- pushd "${S}"/icons &>/dev/null || die
- for size in * ; do
- if [ -f "${size}/virtualbox.png" ] ; then
- insinto "/usr/share/icons/hicolor/${size}/apps"
- newins "${size}/virtualbox.png" ${PN}.png
- fi
- done
- dodir /usr/share/pixmaps
- cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
- || die
- popd &>/dev/null || die
-
- newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
- fi
-
- pushd "${S}"/${EXTP_PN} &>/dev/null || die
- insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
- popd &>/dev/null || die
- rm -rf "${S}"/${EXTP_PN}
-
- insinto /opt/VirtualBox
- dodir /opt/bin
-
- doins UserManual.pdf
-
- if use sdk ; then
- doins -r sdk || die
- fi
-
- if use additions; then
- doins -r additions || die
- fi
-
- if use vboxwebsrv; then
- doins vboxwebsrv || die
- fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
- fperms 0750 /opt/VirtualBox/vboxwebsrv
- dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- if use rdesktop-vrdp; then
- doins rdesktop-vrdp || die
- doins -r rdesktop-vrdp-keymaps || die
- fperms 0750 /opt/VirtualBox/rdesktop-vrdp
- dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
- fi
-
- if ! use headless && use chm; then
- doins kchmviewer VirtualBox.chm || die
- fowners root:vboxusers /opt/VirtualBox/kchmviewer
- fperms 0750 /opt/VirtualBox/kchmviewer
- fi
-
- if use python; then
- local pyver
- for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
- if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
- doins VBoxPython${pyver/./_}.so || die
- fi
- done
- fi
-
- rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
- vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
- VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
- webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
- 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
- VBoxPython?_*.so
-
- if use headless ; then
- rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
- fi
-
- doins -r * || die
-
- # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
- dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
- dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
- dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
- dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
- dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
- local each
- for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 0750 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
- # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
- fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
- fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-
- if ! use headless ; then
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- for each in VBox{SDL,Headless} VirtualBox; do
- fowners root:vboxusers /opt/VirtualBox/${each}
- fperms 4510 /opt/VirtualBox/${each}
- pax-mark -m "${D}"/opt/VirtualBox/${each}
- done
-
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
- else
- # Hardened build: Mark selected binaries set-user-ID-on-execution
- fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
- fperms 4510 /opt/VirtualBox/VBoxHeadless
- pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
- fi
-
- exeinto /opt/VirtualBox
- newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
- fowners root:vboxusers /opt/VirtualBox/VBox.sh
- fperms 0750 /opt/VirtualBox/VBox.sh
-
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
- dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
- dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/10-virtualbox.rules
- # move udev scripts into /lib/udev (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- gnome2_icon_cache_update
-
- udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
- elog ""
- if ! use headless ; then
- elog "To launch VirtualBox just type: \"VirtualBox\""
- elog ""
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "Please visit http://www.virtualbox.org/wiki/Editions for"
- elog "an overview about the different features of ${PN}"
- elog "and virtualbox-ose"
- if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 4cfa7b77d24b..2bd05f5d747b 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,3 +1,3 @@
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.0.12-72916.tar.gz 3531739 RMD160 d6db6e9d8515b3274b6b9ac206b4582ea137db4f SHA1 3b9a734ee0e8a0ab07459fd8985da999f309f53e SHA256 0290d4e1580f638b6e49fa47fb1047f884d0aaff88a7d7356296f7d4f03267ce
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.6.tar.gz 9585392 RMD160 7e35093c06edf3956c0edb77e2dd1fb1b439a7d8 SHA1 4db22b5720557f4d42447891174bc7e34a6dca3d SHA256 67311c407eac2db94c29ab8a4baf47f51ddaea0423d3fac3b409728cd6ada80c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.0.12.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.0.12.ebuild
new file mode 100644
index 000000000000..8a7e308f8b76
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.0.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.0.12.ebuild,v 1.3 2011/07/24 00:25:28 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils
+
+MY_BUILD="72916"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${PV}"
+
+src_install() {
+ insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+ doins -r linux.${ARCH}
+ doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
deleted file mode 100644
index a3698c4ff570..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild,v 1.1 2011/12/20 13:25:13 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_BUILD="75467"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${PV}"
-
-src_install() {
- insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 35775de6c818..bd4646215575 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,3 +1,3 @@
+DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
-DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
index 7fa8fbbd8593..67097dab7e3f 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd,v 1.2 2012/01/15 19:42:39 tove Exp $
+# $Header:
depend() {
need localmount
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.12.ebuild
new file mode 100644
index 000000000000..ccf047e2b118
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.12.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.0.12.ebuild,v 1.5 2011/10/04 19:30:04 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=VirtualBox-${PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+ ~x11-drivers/xf86-input-virtualbox-${PV}
+ x11-apps/xrandr
+ x11-apps/xrefresh
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM
+ x11-libs/libICE )"
+DEPEND="${RDEPEND}
+ =dev-util/kbuild-0.1.5*
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-devel/dev86
+ sys-libs/pam
+ sys-power/iasl
+ X? ( x11-proto/renderproto )
+ !X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+ vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}_OSE"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+ enewgroup vboxguest
+ enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Create and unpack a tarball with the sources of the Linux guest
+ # kernel modules, to include all the needed files
+ "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+ unpack ./vbox-kmod.tar.gz
+
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ cd "${S}"
+ rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+ # PaX fixes (see bug #298988)
+ pushd "${WORKDIR}" &>/dev/null || die
+ epatch "${FILESDIR}"/vboxguest-log-use-c99.patch
+ popd &>/dev/null || die
+
+ # Disable things unused or splitted into separate ebuilds
+ cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+ # stupid new header references...
+ for vboxheader in {product,revision}-generated.h ; do
+ for mdir in vbox{guest,sf} ; do
+ ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+ "${WORKDIR}/${mdir}/${vboxheader}"
+ done
+ done
+}
+
+src_configure() {
+ # build the user-space tools, warnings are harmless
+ ./configure --nofatal \
+ --disable-xpcom \
+ --disable-sdl-ttf \
+ --disable-pulse \
+ --disable-alsa \
+ --build-headless || die "configure failed"
+}
+
+src_compile() {
+ source ./env.sh
+
+ for each in /src/VBox/{Runtime,Additions/common} \
+ /src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+ cd "${S}"${each}
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \
+ KBUILD_PATH="${S}/kBuild" \
+ || die "kmk VBoxControl failed"
+ done
+
+ if use X; then
+ cd "${S}"/src/VBox/Additions/x11/VBoxClient
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \
+ KBUILD_PATH="${S}/kBuild" \
+ || die "kmk VBoxClient failed"
+ fi
+
+ # Now creating the kernel modules. We must do this _after_
+ # we compiled the user-space tools as we need two of the
+ # automatically generated header files. (>=3.2.0)
+ linux-mod_src_compile
+}
+
+src_install() {
+ linux-mod_src_install
+
+ cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+ insinto /sbin
+ newins mount.vboxsf mount.vboxsf
+ fperms 4755 /sbin/mount.vboxsf
+
+ newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+ insinto /usr/sbin/
+ newins VBoxService vboxguest-service
+ fperms 0755 /usr/sbin/vboxguest-service
+
+ insinto /usr/bin
+ doins VBoxControl
+ fperms 0755 /usr/bin/VBoxControl
+
+ # VBoxClient user service and xrandr wrapper
+ if use X; then
+ doins VBoxClient
+ fperms 0755 /usr/bin/VBoxClient
+
+ cd "${S}"/src/VBox/Additions/x11/Installer
+ newins 98vboxadd-xclient VBoxClient-all
+ fperms 0755 /usr/bin/VBoxClient-all
+ fi
+
+ # udev rule for vboxdrv
+ dodir /lib/udev/rules.d
+ echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+ || die
+ echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+ || die
+
+ # VBoxClient autostart file
+ insinto /etc/xdg/autostart
+ doins "${FILESDIR}"/vboxclient.desktop
+
+ # sample xorg.conf
+ insinto /usr/share/doc/${PF}
+ doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ if ! use X ; then
+ elog "use flag X is off, enable it to install the"
+ elog "X Window System input and video drivers"
+ fi
+ elog ""
+ elog "Please add users to the \"vboxguest\" group so they can"
+ elog "benefit from seamless mode, auto-resize and clipboard."
+ elog ""
+ elog "Please add:"
+ elog "/etc/init.d/${PN}"
+ elog "to the default runlevel in order to start"
+ elog "needed services."
+ elog "To use the VirtualBox X drivers, use the following"
+ elog "file as your /etc/X11/xorg.conf:"
+ elog " /usr/share/doc/${PF}/xorg.conf.xorg"
+ elog ""
+ elog "Also make sure you use the Mesa library for OpenGL:"
+ elog " eselect opengl set xorg-x11"
+ elog ""
+ elog "An autostart .desktop file has been installed to start"
+ elog "VBoxClient in desktop sessions."
+ elog ""
+ elog "You can mount shared folders with:"
+ elog " mount -t vboxsf "
+ elog ""
+ elog "Warning:"
+ elog "this ebuild is only needed if you are running gentoo"
+ elog "inside a VirtualBox Virtual Machine, you don't need"
+ elog "it to run VirtualBox itself."
+ elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
deleted file mode 100644
index 47a23171d7c9..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild,v 1.1 2011/12/20 13:26:49 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
- x11-apps/xrandr
- x11-apps/xrefresh
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM
- x11-libs/libICE )
- !!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.999
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-devel/dev86
- sys-libs/pam
- sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
- vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
- enewgroup vboxguest
- enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
- unpack ${A}
-
- # Create and unpack a tarball with the sources of the Linux guest
- # kernel modules, to include all the needed files
- "${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
- unpack ./vbox-kmod.tar.gz
-
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- cd "${S}"
- rm -rf kBuild/bin tools
-}
-
-src_prepare() {
- # PaX fixes (see bug #298988)
- pushd "${WORKDIR}" &>/dev/null || die
- epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
- popd &>/dev/null || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
- # stupid new header references...
- for vboxheader in {product,revision}-generated.h ; do
- for mdir in vbox{guest,sf} ; do
- ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
- "${WORKDIR}/${mdir}/${vboxheader}"
- done
- done
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- ./configure --nofatal \
- --disable-xpcom \
- --disable-sdl-ttf \
- --disable-pulse \
- --disable-alsa \
- --build-headless || die "configure failed"
-}
-
-src_compile() {
- source ./env.sh
-
- for each in /src/VBox/{Runtime,Additions/common} \
- /src/VBox/Additions/linux/{sharedfolders,daemon} ; do
- cd "${S}"${each}
- MAKE="kmk" emake TOOL_YASM_AS=yasm \
- KBUILD_PATH="${S}/kBuild" \
- || die "kmk VBoxControl failed"
- done
-
- if use X; then
- cd "${S}"/src/VBox/Additions/x11/VBoxClient
- MAKE="kmk" emake TOOL_YASM_AS=yasm \
- KBUILD_PATH="${S}/kBuild" \
- || die "kmk VBoxClient failed"
- fi
-
- # Now creating the kernel modules. We must do this _after_
- # we compiled the user-space tools as we need two of the
- # automatically generated header files. (>=3.2.0)
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-
- cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
- insinto /sbin
- newins mount.vboxsf mount.vboxsf
- fperms 4755 /sbin/mount.vboxsf
-
- newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
- insinto /usr/sbin/
- newins VBoxService vboxguest-service
- fperms 0755 /usr/sbin/vboxguest-service
-
- insinto /usr/bin
- doins VBoxControl
- fperms 0755 /usr/bin/VBoxControl
-
- # VBoxClient user service and xrandr wrapper
- if use X; then
- doins VBoxClient
- fperms 0755 /usr/bin/VBoxClient
-
- cd "${S}"/src/VBox/Additions/x11/Installer
- newins 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- fi
-
- # udev rule for vboxdrv
- dodir /lib/udev/rules.d
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if ! use X ; then
- elog "use flag X is off, enable it to install the"
- elog "X Window System input and video drivers"
- fi
- elog ""
- elog "Please add users to the \"vboxguest\" group so they can"
- elog "benefit from seamless mode, auto-resize and clipboard."
- elog ""
- elog "Please add:"
- elog "/etc/init.d/${PN}"
- elog "to the default runlevel in order to start"
- elog "needed services."
- elog "To use the VirtualBox X drivers, use the following"
- elog "file as your /etc/X11/xorg.conf:"
- elog " /usr/share/doc/${PF}/xorg.conf.xorg"
- elog ""
- elog "Also make sure you use the Mesa library for OpenGL:"
- elog " eselect opengl set xorg-x11"
- elog ""
- elog "An autostart .desktop file has been installed to start"
- elog "VBoxClient in desktop sessions."
- elog ""
- elog "You can mount shared folders with:"
- elog " mount -t vboxsf "
- elog ""
- elog "Warning:"
- elog "this ebuild is only needed if you are running gentoo"
- elog "inside a VirtualBox Virtual Machine, you don't need"
- elog "it to run VirtualBox itself."
- elog ""
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 9e451b8fb594..166ffe2c677f 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,3 @@
+DIST vbox-kernel-module-src-4.0.12.tar.bz2 901005 RMD160 6bc21432d363ec7d92a3c7b784788f3d8b2e60b9 SHA1 b431fd82d1e23cbcab52fcc2461424d896058eff SHA256 de7306958d5e807d5aed0aa401e0cbf6106f7f89c5930a7b04ceb8cd2d7ca5d1
DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
DIST vbox-kernel-module-src-4.1.6.tar.xz 454840 RMD160 f1166c7b2e95276a60beb4c6dbe022826bc21ff2 SHA1 7816f6773f00f28cb287eaf4eb8b31a9b3bbdd37 SHA256 557425714e5d9e1b737c963d5a4d1b67a6e60ec47c2ddf2449dbbfd786c41cdf
-DIST vbox-kernel-module-src-4.1.8.tar.xz 457648 RMD160 2451d2c23e5ab14b70b9b6da79c164499a864eec SHA1 ac97198d3275a338905bb04efffde467bbeff9dc SHA256 565c9d9b193e88679549995d63c5796e19f881f9f95215f8cc6a11d13e749a9f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.0.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.0.12.ebuild
new file mode 100644
index 000000000000..af0d2ce7a386
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.0.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.0.12.ebuild,v 1.3 2011/07/22 16:58:45 hwoarang Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+# package that comes from virtualbox-bin
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+ enewgroup vboxusers
+}
+
+src_prepare() {
+ if kernel_is -ge 2 6 33 ; then
+ # evil patch for new kernels - header moved
+ grep -lR linux/autoconf.h * | xargs sed -i -e 's:::'
+ fi
+}
+
+src_install() {
+ linux-mod_src_install
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ elog "Starting with the 3.x release new kernel modules were added,"
+ elog "be sure to load all the needed modules."
+ elog ""
+ elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+ if has_version sys-apps/openrc; then
+ elog "/etc/conf.d/modules"
+ else
+ elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+ fi
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
deleted file mode 100644
index f1230e461b0c..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild,v 1.1 2011/12/20 12:39:22 polynomial-c Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-# package that comes from virtualbox-bin
-
-EAPI=4
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
- enewgroup vboxusers
-}
-
-src_prepare() {
- if kernel_is -ge 2 6 33 ; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:::'
- fi
-
- if use pax_kernel && kernel_is -ge 3 0 0 ; then
- epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
- fi
-}
-
-src_install() {
- linux-mod_src_install
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- elog "Starting with the 3.x release new kernel modules were added,"
- elog "be sure to load all the needed modules."
- elog ""
- elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
- elog "/etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 35775de6c818..bd4646215575 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,3 @@
+DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
-DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
diff --git a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
new file mode 100644
index 000000000000..9d505ea7b781
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
@@ -0,0 +1,379 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.12.ebuild,v 1.6 2011/10/24 21:57:11 polynomial-c Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
+
+if [[ ${PV} == "9999" ]] ; then
+ # XXX: should finish merging the -9999 ebuild into this one ...
+ ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
+ inherit linux-mod subversion
+else
+ MY_P=VirtualBox-${PV}
+ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+ S="${WORKDIR}/${MY_P}_OSE"
+fi
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+ ~app-emulation/virtualbox-modules-${PV}
+ dev-libs/libIDL
+ >=dev-libs/libxslt-1.1.19
+ net-misc/curl
+ dev-libs/openssl
+ dev-libs/libxml2
+ sys-libs/zlib
+ !headless? (
+ qt4? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-core:4
+ opengl? ( x11-libs/qt-opengl:4 )
+ x11-libs/libXinerama
+ )
+ opengl? ( virtual/opengl media-libs/freeglut )
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ media-libs/libsdl[X,video]
+ )
+ vnc? ( >=net-libs/libvncserver-0.9.7 )
+ java? ( >=virtual/jre-1.5 )"
+DEPEND="${RDEPEND}
+ =dev-util/kbuild-0.1.5*
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-devel/dev86
+ sys-power/iasl
+ media-libs/libpng
+ pam? ( sys-libs/pam )
+ sys-libs/libcap
+ doc? (
+ dev-texlive/texlive-basic
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-fontsextra
+ )
+ java? ( >=virtual/jdk-1.5 )
+ dev-util/pkgconfig
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ !headless? ( x11-libs/libXinerama )
+ pulseaudio? ( media-sound/pulseaudio )
+ vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+ extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+ usr/lib/virtualbox/VBoxSDL.so
+ usr/lib/virtualbox/VBoxSharedFolders.so
+ usr/lib/virtualbox/VBoxDD2.so
+ usr/lib/virtualbox/VBoxOGLrenderspu.so
+ usr/lib/virtualbox/VBoxPython.so
+ usr/lib/virtualbox/VBoxDD.so
+ usr/lib/virtualbox/VBoxDDU.so
+ usr/lib/virtualbox/VBoxREM64.so
+ usr/lib/virtualbox/VBoxSharedClipboard.so
+ usr/lib/virtualbox/VBoxHeadless.so
+ usr/lib/virtualbox/VBoxRT.so
+ usr/lib/virtualbox/VBoxREM.so
+ usr/lib/virtualbox/VBoxSettings.so
+ usr/lib/virtualbox/VBoxKeyboard.so
+ usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+ usr/lib/virtualbox/VBoxVMM.so
+ usr/lib/virtualbox/VirtualBox.so
+ usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+ usr/lib/virtualbox/components/VBoxC.so
+ usr/lib/virtualbox/components/VBoxSVCM.so
+ usr/lib/virtualbox/components/VBoxDDU.so
+ usr/lib/virtualbox/components/VBoxRT.so
+ usr/lib/virtualbox/components/VBoxREM.so
+ usr/lib/virtualbox/components/VBoxVMM.so
+ usr/lib/virtualbox/VBoxREM32.so
+ usr/lib/virtualbox/VBoxPython2_4.so
+ usr/lib/virtualbox/VBoxPython2_5.so
+ usr/lib/virtualbox/VBoxPython2_6.so
+ usr/lib/virtualbox/VBoxPython2_7.so
+ usr/lib/virtualbox/VBoxXPCOMC.so
+ usr/lib/virtualbox/VBoxOGLhostcrutil.so
+ usr/lib/virtualbox/VBoxNetDHCP.so"
+
+REQUIRED_USE="
+ java? ( sdk )
+ python? ( sdk )
+ vboxwebsrv? ( java )
+"
+
+pkg_setup() {
+ if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
+ eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
+ eerror "You must use gcc-config to select a profile without this feature. You may"
+ eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
+ eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
+ eerror "Remember to run \"source /etc/profile\" before continuing. See bug #339914."
+ die
+ fi
+
+ if ! use headless && ! use qt4 ; then
+ einfo "No USE=\"qt4\" selected, this build will not include"
+ einfo "any Qt frontend."
+ elif use headless && use qt4 ; then
+ einfo "You selected USE=\"headless qt4\", defaulting to"
+ einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+ fi
+
+ if ! use opengl ; then
+ einfo "No USE=\"opengl\" selected, this build will lack"
+ einfo "the OpenGL feature."
+ fi
+ java-pkg-opt-2_pkg_setup
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ rm -rf kBuild/bin tools
+
+ # Disable things unused or split into separate ebuilds
+ sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+ "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+ # unset useless/problematic checks in configure
+ epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
+ "${FILESDIR}/${PN}-4-makeself-check.patch" \
+ "${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+ # fix build with --as-needed (bug #249295 and bug #350907)
+ epatch "${FILESDIR}/${PN}-4-asneeded.patch"
+
+ # Respect LDFLAGS
+ sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+ # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
+ epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
+
+ # Use PAM only when pam USE flag is enbaled (bug #376531)
+ if ! use pam ; then
+ elog "Disabling PAM removes the possibility to use the VRDP features."
+ sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
+ sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+ src/VBox/HostServices/Makefile.kmk || die
+ fi
+
+ # add correct java path
+ if use java ; then
+ sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
+ -i "${S}"/Config.kmk || die
+ fi
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ local myconf
+ use alsa || myconf+=" --disable-alsa"
+ use opengl || myconf+=" --disable-opengl"
+ use pulseaudio || myconf+=" --disable-pulse"
+ use python || myconf+=" --disable-python"
+ use java || myconf+=" --disable-java"
+ use vboxwebsrv && myconf+=" --enable-webservice"
+ use vnc && myconf+=" --enable-vnc"
+ use doc || myconf+=" --disable-docs"
+ if ! use headless ; then
+ use qt4 || myconf+=" --disable-qt4"
+ else
+ myconf+=" --build-headless --disable-opengl"
+ fi
+ # not an autoconf script
+ ./configure \
+ --with-gcc="$(tc-getCC)" \
+ --with-g++="$(tc-getCXX)" \
+ --disable-kmods \
+ --disable-dbus \
+ ${myconf} \
+ || die "configure failed"
+}
+
+src_compile() {
+ source ./env.sh
+
+ # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+ # and strip all flags
+ # strip-flags
+
+ MAKE="kmk" emake \
+ VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
+ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+ TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+ VBOX_GCC_OPT="${CXXFLAGS}" \
+ TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+ all || die "kmk failed"
+}
+
+src_install() {
+ cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+ # Create configuration files
+ insinto /etc/vbox
+ newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+ # Set the right libdir
+ sed -i \
+ -e "s/MY_LIBDIR/$(get_libdir)/" \
+ "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+ # Symlink binaries to the shipped wrapper
+ exeinto /usr/$(get_libdir)/${PN}
+ newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+ dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+ # Install binaries and libraries
+ insinto /usr/$(get_libdir)/${PN}
+ doins -r components || die
+
+ if use sdk ; then
+ doins -r sdk || die
+ fi
+
+ if use vboxwebsrv ; then
+ doins vboxwebsrv || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+ fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+ newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+ newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+ fi
+
+ for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
+ doins $each || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+ done
+ # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+
+ if ! use headless ; then
+ for each in VBox{SDL,Headless} ; do
+ doins $each || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+ fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+ done
+
+ if use opengl && use qt4 ; then
+ doins VBoxTestOGL || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+ fi
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+ if use qt4 ; then
+ doins VirtualBox || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+ fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+ dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+ newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+ fi
+
+ newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
+ else
+ doins VBoxHeadless || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+ fi
+
+ # Install EFI Firmware files (bug #320757)
+ pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+ for fwfile in VBoxEFI{32,64}.fd ; do
+ doins ${fwfile} || die
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
+ done
+ popd &>/dev/null || die
+
+ # New way of handling USB device nodes for VBox (bug #356215)
+ insinto /lib/udev
+ doins VBoxCreateUSBNode.sh
+ fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
+ fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+ insinto /lib/udev/rules.d
+ doins "${FILESDIR}"/10-virtualbox.rules
+
+ insinto /usr/share/${PN}
+ if ! use headless && use qt4 ; then
+ doins -r nls
+ fi
+
+ # VRDPAuth only works with this (bug #351949)
+ dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+ # set an env-variable for 3rd party tools
+ echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+ doenvd "${T}/90virtualbox"
+
+ if use java ; then
+ java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+ java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+ if ! use headless && use qt4 ; then
+ elog "To launch VirtualBox just type: \"VirtualBox\"."
+ fi
+ elog "You must be in the vboxusers group to use VirtualBox."
+ elog ""
+ elog "The latest user manual is available for download at:"
+ elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+ elog ""
+ elog "For advanced networking setups you should emerge:"
+ elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+ elog ""
+ elog "IMPORTANT!"
+ elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+ elog "\"env-update\" as root and logout and relogin as the user you wish"
+ elog "to run ${PN} as."
+ elog ""
+ elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+ elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+ elog " app-emulation/virtualbox-extpack-oracle"
+ elog "package."
+ if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+ elog ""
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "or else USB in ${PN} won't work."
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index 857a10b1aefb..3d54ba12e50d 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.6 2011/12/27 21:53:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.4 2011/12/07 17:28:17 phajdan.jr Exp $
EAPI=4
@@ -168,9 +168,6 @@ src_prepare() {
# Don't build vboxpci.ko module (D'oh!)
epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
- # Fixed compilation with yasm-1.2.0 (bug #391189)
- epatch "${FILESDIR}"/${PN}-4.1.6-yasm120-fix.patch
-
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
@@ -183,8 +180,8 @@ src_prepare() {
if use java ; then
sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
fi
+ java-pkg-opt-2_src_prepare
}
src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
index 87d1699ba8f5..e3673d025f86 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.3 2011/12/20 13:14:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.2 2011/11/25 10:25:23 polynomial-c Exp $
EAPI=4
@@ -183,8 +183,8 @@ src_prepare() {
if use java ; then
sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
fi
+ java-pkg-opt-2_src_prepare
}
src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild b/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
deleted file mode 100644
index b18b36396dda..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.8.ebuild,v 1.2 2012/01/09 22:50:22 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-if [[ ${PV} == "9999" ]] ; then
- # XXX: should finish merging the -9999 ebuild into this one ...
- ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
- inherit linux-mod subversion
-else
- MY_P=VirtualBox-${PV}
- SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
- S="${WORKDIR}/${MY_P}_OSE"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
- ~app-emulation/virtualbox-modules-${PV}
- dev-libs/libIDL
- >=dev-libs/libxslt-1.1.19
- net-misc/curl
- dev-libs/openssl
- dev-libs/libxml2
- sys-libs/zlib
- !headless? (
- qt4? (
- x11-libs/qt-gui:4
- x11-libs/qt-core:4
- opengl? ( x11-libs/qt-opengl:4 )
- x11-libs/libXinerama
- )
- opengl? ( virtual/opengl media-libs/freeglut )
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- media-libs/libsdl[X,video]
- )
- vnc? ( >=net-libs/libvncserver-0.9.7 )
- java? ( >=virtual/jre-1.5 )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.999
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-devel/dev86
- sys-power/iasl
- media-libs/libpng
- pam? ( sys-libs/pam )
- sys-libs/libcap
- doc? (
- dev-texlive/texlive-basic
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-fontsextra
- )
- java? ( >=virtual/jdk-1.5 )
- dev-util/pkgconfig
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- !headless? ( x11-libs/libXinerama )
- pulseaudio? ( media-sound/pulseaudio )
- vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
- extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
- usr/lib/virtualbox/VBoxSDL.so
- usr/lib/virtualbox/VBoxSharedFolders.so
- usr/lib/virtualbox/VBoxDD2.so
- usr/lib/virtualbox/VBoxOGLrenderspu.so
- usr/lib/virtualbox/VBoxPython.so
- usr/lib/virtualbox/VBoxDD.so
- usr/lib/virtualbox/VBoxDDU.so
- usr/lib/virtualbox/VBoxREM64.so
- usr/lib/virtualbox/VBoxSharedClipboard.so
- usr/lib/virtualbox/VBoxHeadless.so
- usr/lib/virtualbox/VBoxRT.so
- usr/lib/virtualbox/VBoxREM.so
- usr/lib/virtualbox/VBoxSettings.so
- usr/lib/virtualbox/VBoxKeyboard.so
- usr/lib/virtualbox/VBoxSharedCrOpenGL.so
- usr/lib/virtualbox/VBoxVMM.so
- usr/lib/virtualbox/VirtualBox.so
- usr/lib/virtualbox/VBoxOGLhosterrorspu.so
- usr/lib/virtualbox/components/VBoxC.so
- usr/lib/virtualbox/components/VBoxSVCM.so
- usr/lib/virtualbox/components/VBoxDDU.so
- usr/lib/virtualbox/components/VBoxRT.so
- usr/lib/virtualbox/components/VBoxREM.so
- usr/lib/virtualbox/components/VBoxVMM.so
- usr/lib/virtualbox/VBoxREM32.so
- usr/lib/virtualbox/VBoxPython2_4.so
- usr/lib/virtualbox/VBoxPython2_5.so
- usr/lib/virtualbox/VBoxPython2_6.so
- usr/lib/virtualbox/VBoxPython2_7.so
- usr/lib/virtualbox/VBoxXPCOMC.so
- usr/lib/virtualbox/VBoxOGLhostcrutil.so
- usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
- java? ( sdk )
- python? ( sdk )
- vboxwebsrv? ( java )
-"
-
-pkg_setup() {
- if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
- eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
- eerror "You must use gcc-config to select a profile without this feature. You may"
- eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
- eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
- eerror "Remember to run \"source /etc/profile\" before continuing. See bug #339914."
- die
- fi
-
- if ! use headless && ! use qt4 ; then
- einfo "No USE=\"qt4\" selected, this build will not include"
- einfo "any Qt frontend."
- elif use headless && use qt4 ; then
- einfo "You selected USE=\"headless qt4\", defaulting to"
- einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
- fi
-
- if ! use opengl ; then
- einfo "No USE=\"opengl\" selected, this build will lack"
- einfo "the OpenGL feature."
- fi
- java-pkg-opt-2_pkg_setup
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -rf kBuild/bin tools
-
- # Disable things unused or split into separate ebuilds
- sed -e "s/MY_LIBDIR/$(get_libdir)/" \
- "${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
-
- # unset useless/problematic checks in configure
- epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
- "${FILESDIR}/${PN}-4-makeself-check.patch" \
- "${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
- # fix build with --as-needed (bug #249295 and bug #350907)
- epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
- # Respect LDFLAGS
- sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
- -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
- # We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
- epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
- # Don't build vboxpci.ko module (D'oh!)
- epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
- # Use PAM only when pam USE flag is enbaled (bug #376531)
- if ! use pam ; then
- elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
- sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
- src/VBox/HostServices/Makefile.kmk || die
- fi
-
- # add correct java path
- if use java ; then
- sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
- -i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
- fi
-}
-
-src_configure() {
- local myconf
- use alsa || myconf+=" --disable-alsa"
- use opengl || myconf+=" --disable-opengl"
- use pulseaudio || myconf+=" --disable-pulse"
- use python || myconf+=" --disable-python"
- use java || myconf+=" --disable-java"
- use vboxwebsrv && myconf+=" --enable-webservice"
- use vnc && myconf+=" --enable-vnc"
- use doc || myconf+=" --disable-docs"
- if ! use headless ; then
- use qt4 || myconf+=" --disable-qt4"
- else
- myconf+=" --build-headless --disable-opengl"
- fi
- # not an autoconf script
- ./configure \
- --with-gcc="$(tc-getCC)" \
- --with-g++="$(tc-getCXX)" \
- --disable-kmods \
- --disable-dbus \
- ${myconf} \
- || die "configure failed"
-}
-
-src_compile() {
- source ./env.sh
-
- # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
- # and strip all flags
- # strip-flags
-
- MAKE="kmk" emake \
- VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
- TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
- TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
- TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
- TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
- VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
- all || die "kmk failed"
-}
-
-src_install() {
- cd "${S}"/out/linux.${ARCH}/release/bin || die
-
- # Create configuration files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
- # Set the right libdir
- sed -i \
- -e "s/MY_LIBDIR/$(get_libdir)/" \
- "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
- # Symlink binaries to the shipped wrapper
- exeinto /usr/$(get_libdir)/${PN}
- newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
- fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
- dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
- # Install binaries and libraries
- insinto /usr/$(get_libdir)/${PN}
- doins -r components || die
-
- if use sdk ; then
- doins -r sdk || die
- fi
-
- if use vboxwebsrv ; then
- doins vboxwebsrv || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
- fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
- doins $each || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
- fperms 0750 /usr/$(get_libdir)/${PN}/${each}
- done
- # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
- if ! use headless ; then
- for each in VBox{SDL,Headless} ; do
- doins $each || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
- fperms 4750 /usr/$(get_libdir)/${PN}/${each}
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
- done
-
- if use opengl && use qt4 ; then
- doins VBoxTestOGL || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
- fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
- fi
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
- if use qt4 ; then
- doins VirtualBox || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
- fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
- dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
- newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
- fi
-
- pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
- for size in 16 20 32 40 48 64 128 ; do
- insinto /usr/share/icons/hicolor/${size}x${size}/apps
- newins ${PN}-${size}px.png ${PN}.png
- done
- insinto /usr/share/pixmaps
- newins ${PN}-48px.png ${PN}.png
- popd &>/dev/null || die
- else
- doins VBoxHeadless || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
- fi
-
- insinto /usr/$(get_libdir)/${PN}
- # Install EFI Firmware files (bug #320757)
- pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
- for fwfile in VBoxEFI{32,64}.fd ; do
- doins ${fwfile} || die
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
- done
- popd &>/dev/null || die
-
- # New way of handling USB device nodes for VBox (bug #356215)
- insinto /lib/udev
- doins VBoxCreateUSBNode.sh
- fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/10-virtualbox.rules
-
- insinto /usr/share/${PN}
- if ! use headless && use qt4 ; then
- doins -r nls
- fi
-
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- if use java ; then
- java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
- fi
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
- if ! use headless && use qt4 ; then
- elog "To launch VirtualBox just type: \"VirtualBox\"."
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "IMPORTANT!"
- elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
- elog "\"env-update\" as root and logout and relogin as the user you wish"
- elog "to run ${PN} as."
- elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/vmware-modules/files/238-3.2.0.patch b/app-emulation/vmware-modules/files/238-3.2.0.patch
deleted file mode 100644
index 0416214c3125..000000000000
--- a/app-emulation/vmware-modules/files/238-3.2.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index b0ee013..f0f5c9a 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -36,6 +36,12 @@
- #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf))
- #define PCI_BDF_BUS(bdf) (((bdf) >> 8) & 0xff)
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
- struct pci_dev *pdev;
- VMLinux *vmLinux;
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index b0017d7..6c0687f 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -41,6 +41,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include
-+#endif
-+
- // VNet_FilterLogPacket.action for dropped packets
- #define VNET_FILTER_ACTION_DRP (1)
- #define VNET_FILTER_ACTION_DRP_SHORT (2)
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index b3c752b..79d4896 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev);
- static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- static void VNetNetifSetMulticast(struct net_device *dev);
-+#endif
- #if 0
- static void VNetNetifTxTimeout(struct net_device *dev);
- #endif
-@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- .ndo_stop = VNetNetifClose,
- .ndo_get_stats = VNetNetifGetStats,
- .ndo_set_mac_address = VNetNetifSetMAC,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- .ndo_set_multicast_list = VNetNetifSetMulticast,
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- dev->stop = VNetNetifClose;
- dev->get_stats = VNetNetifGetStats;
- dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -621,11 +627,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
- *----------------------------------------------------------------------
- */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- void
- VNetNetifSetMulticast(struct net_device *dev) // IN: unused
- {
- }
--
-+#endif
-
- /*
- *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 4e65c76..fd12aa9 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -572,10 +572,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb, // IN: skb to copy
- unsigned int tmpCsum;
- const void *vaddr;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ vaddr = kmap(skb_frag_page(frag));
-+#else
- vaddr = kmap(frag->page);
-+#endif
- tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
- curr, frag->size, 0, &err);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ kunmap(skb_frag_page(frag));
-+#else
- kunmap(frag->page);
-+#endif
- if (err) {
- return err;
- }
diff --git a/app-emulation/vmware-modules/files/238-netdevice.patch b/app-emulation/vmware-modules/files/238-netdevice.patch
deleted file mode 100644
index 35231a3205e3..000000000000
--- a/app-emulation/vmware-modules/files/238-netdevice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
-index 7a56304..9ff4548 100644
---- a/vmnet-only/compat_netdevice.h
-+++ b/vmnet-only/compat_netdevice.h
-@@ -47,6 +47,19 @@
- # define net_device device
- #endif
-
-+/* it looks like these have been removed from the kernel 3.1
-+ * probably because the "transition" is considered complete.
-+ * so to keep this source compatible we just redefine them like they were
-+ * previously
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
-+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
-+ functions are available. */
-+#define HAVE_FREE_NETDEV /* free_netdev() */
-+#define HAVE_NETDEV_PRIV /* netdev_priv() */
-+#define HAVE_NETIF_QUEUE
-+#define HAVE_NET_DEVICE_OPS
-+#endif
-
- /*
- * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
deleted file mode 100644
index 5baa61df9e9d..000000000000
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index c692c2d..501d602 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -42,6 +42,12 @@
- #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf))
- #define PCI_BDF_BUS(bdf) (((bdf) >> 8) & 0xff)
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
- uint32 bdf;
- struct pci_dev *pdev;
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index 491add5..74f7a3b 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -40,6 +40,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include
-+#endif
-+
- // VNet_FilterLogPacket.action for dropped packets
- #define VNET_FILTER_ACTION_DRP (1)
- #define VNET_FILTER_ACTION_DRP_SHORT (2)
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 4bdb643..5b71339 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,7 +62,9 @@ static int VNetNetifClose(struct net_device *dev);
- static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- static void VNetNetifSetMulticast(struct net_device *dev);
-+#endif
- #if 0
- static void VNetNetifTxTimeout(struct net_device *dev);
- #endif
-@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- .ndo_stop = VNetNetifClose,
- .ndo_get_stats = VNetNetifGetStats,
- .ndo_set_mac_address = VNetNetifSetMAC,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- .ndo_set_multicast_list = VNetNetifSetMulticast,
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev) // IN:
- dev->stop = VNetNetifClose;
- dev->get_stats = VNetNetifGetStats;
- dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
- /*
- * We cannot stuck... If someone will report problems under
- * low memory conditions or some such, we should enable it.
-@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
- *----------------------------------------------------------------------
- */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- void
- VNetNetifSetMulticast(struct net_device *dev) // IN: unused
- {
- }
--
-+#endif
-
- /*
- *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 541187b..77e0089 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb, // IN: skb to copy
- unsigned int tmpCsum;
- const void *vaddr;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ vaddr = kmap(skb_frag_page(frag));
-+#else
- vaddr = kmap(frag->page);
-+#endif
- tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
- curr, frag->size, 0, &err);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+ kunmap(skb_frag_page(frag));
-+#else
- kunmap(frag->page);
-+#endif
- if (err) {
- return err;
- }
diff --git a/app-emulation/vmware-modules/vmware-modules-238.5.ebuild b/app-emulation/vmware-modules/vmware-modules-238.5.ebuild
index 5f450f51acea..6b77c241fda7 100644
--- a/app-emulation/vmware-modules/vmware-modules-238.5.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5.ebuild,v 1.2 2012/01/10 14:53:41 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.5.ebuild,v 1.1 2011/10/08 18:04:57 vadimk Exp $
EAPI="2"
@@ -64,8 +64,6 @@ src_prepare() {
epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
kernel_is ge 2 6 37 && epatch "${FILESDIR}/${PV_MAJOR}-sema.patch"
kernel_is ge 2 6 39 && epatch "${FILESDIR}/${PV_MAJOR}-2.6.39.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
}
src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild
index a35a17403423..e09b4adec72b 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.1.ebuild,v 1.2 2012/01/06 14:30:38 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.1.ebuild,v 1.1 2011/12/03 20:04:15 vadimk Exp $
EAPI="2"
@@ -63,7 +63,6 @@ src_prepare() {
epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
- epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
}
src_install() {
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 10c4756af677..dba4077cce18 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -31,17 +31,12 @@ DIST wine-1.3.31.tar.bz2 19637263 RMD160 976a48106c347507ab7202ddb1e997a7b19c57a
DIST wine-1.3.32.tar.bz2 19678422 RMD160 b45edf8b0a70c24666a3ed7a701bafb14f734d88 SHA1 6881f41443efc13fd8bbb7cea828cc8e6e7da42b SHA256 fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6
DIST wine-1.3.33.tar.bz2 19809247 RMD160 4f24203fdd8f4bc0c3402f0c184e3bb7a172d280 SHA1 d9ae9efa9543e1467708cf47c991affe87a45cf7 SHA256 d49b96e3f999a7380898c3c09cf3d920c369756cb735d9c05295b5bb73c19f8c
DIST wine-1.3.34.tar.bz2 19846255 RMD160 cf37c130b5682c4012bc97c7583e4be3f3869483 SHA1 f5df0e9dec23375269121cffba5ac7e863259de8 SHA256 ac597a63c289bfedd75dcdc1cfaf342ad816669167868ad97490d0c08b7f1c52
-DIST wine-1.3.35.tar.bz2 19847696 RMD160 1aae89a1d254cfce13784e799ab6639163327844 SHA1 f59ea14a478b5cb5ae00203ae4d7a5e14f020bb7 SHA256 e23e4da5efebc11206198e9cf2a2638851db4e00a1af0abccd8b6369e99c288b
-DIST wine-1.3.36.tar.bz2 19788661 RMD160 e541b1e1b60c65d640c858715d20e84566991b1c SHA1 6ad7d18063fea0fdeb2caf20a21ae53ffba13f24 SHA256 a4a1c5224dbf47f10a2a7c601f610e21c7f7be33639eeb4e68b389d4318e9180
-DIST wine-1.3.37.tar.bz2 19904543 RMD160 56d9d3bd441727e79d2fa88d17f82586f3dc3b3c SHA1 667e203acbaad6ce3452c22cadd022cdd159b632 SHA256 708ac19d59828fbe95c309bb2ee6cff74e564353dd4183565e5cb6a07ba71a71
DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc SHA1 52b151855087dce69a8b3405d2ad93b24f96c6fb SHA256 bb2d44c1ae488b972f03e8f97c44fe1608240984075ccf75952edddf1dd2b79e
DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06 SHA1 247a416b608fc317bce9fe0644a3103c8abf97d6 SHA256 9a4b7b9d8358b81bb32ed376e817ae86a531bce39663537a1f77d4b4cfa44d27
DIST wine-1.3.7.tar.bz2 18379692 RMD160 316535442fc2f29d30a2952ff612cc70ae9f19c9 SHA1 3f46e6d73e4917d13fbc102e6f35aba9b9412a40 SHA256 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025
DIST wine-1.3.8.tar.bz2 18315298 RMD160 1b579d124523fe4698431c8de11f4cdfa3034821 SHA1 d36e7d8c0d8d5e2f86d47b175e197e9623660495 SHA256 6eebf60c143cbe4328a8566331a6b887cf8612000f051e55d4b9d99e6a17bfdb
DIST wine-1.3.9.tar.bz2 18378516 RMD160 07803597faf46e9ac748560642a537b56dd1a845 SHA1 68f2172b3cd7674e0f7bb746eae065a7b542db9f SHA256 a920b0805814d53435fdc575efe618b39c2b18d30af416f80d2fb4763d2587fa
-DIST wine-1.4-rc1.tar.bz2 19901330 RMD160 249f42a1736b405ed11031a9bdc62bb3c55556cf SHA1 aab0c651c018b4861437601af1a7346ab8288c8c SHA256 246618343816ee24ea7be70ac46209ba2a9591717d68af6a22605e6f30ba3bae
-DIST wine-1.4-rc2.tar.bz2 19904340 RMD160 55b5b782395351c3669adad16fccc7efa93dd92c SHA1 294360d2f47f73ea96be1317e92ac0b1ab88cdd7 SHA256 1111274431b0c4a6c0783e5bc1d4759b6795ac822b33c9ef8a53eea5045edd91
DIST wine_gecko-1.0.0-x86.cab 8119486 RMD160 57618dbffa7b7226dcd44f86c3c569ab8a5ff938 SHA1 afa22c52bca4ca77dcb9edb3c9936eb23793de01 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c
DIST wine_gecko-1.1.0-x86.cab 8868851 RMD160 1867734d6ab35f4e66f717789832e69aac06e93b SHA1 1b6c637207b6f032ae8a52841db9659433482714 SHA256 1786e1fd38a0361a3956864f74ebac20452c012316f296ad8d86840e31be0b29
DIST wine_gecko-1.1.0-x86_64.cab 8940997 RMD160 76364b01b6756db79989feea9de14aeec4ba4675 SHA1 55b4b60cd2a48631d6236fb411c3a94d806d9906 SHA256 b8bea5b6400d191c05b2295c79285309fe331283648457bed48f7e2387773b7a
diff --git a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
deleted file mode 100644
index c1a80d3c408a..000000000000
--- a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
-From: Alexandre Julliard
-Date: Thu, 24 Feb 2011 13:11:53 +0100
-Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
- headers.
-
-[Alexandre Rostovtsev : backport to wine-1.2.3]
----
- dlls/msxml3/attribute.c | 6 ++++++
- dlls/msxml3/bsc.c | 6 ++++++
- dlls/msxml3/cdata.c | 5 +++++
- dlls/msxml3/comment.c | 5 +++++
- dlls/msxml3/dispex.c | 5 +++++
- dlls/msxml3/docfrag.c | 5 +++++
- dlls/msxml3/domdoc.c | 11 +++++++++--
- dlls/msxml3/domimpl.c | 5 +++++
- dlls/msxml3/element.c | 5 +++++
- dlls/msxml3/entityref.c | 5 +++++
- dlls/msxml3/factory.c | 5 +++++
- dlls/msxml3/httprequest.c | 6 ++++++
- dlls/msxml3/main.c | 15 +++++++++++++++
- dlls/msxml3/msxml_private.h | 23 -----------------------
- dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++----
- dlls/msxml3/nodelist.c | 5 +++++
- dlls/msxml3/nodemap.c | 5 +++++
- dlls/msxml3/parseerror.c | 5 +++++
- dlls/msxml3/pi.c | 5 +++++
- dlls/msxml3/queryresult.c | 9 +++++++--
- dlls/msxml3/regsvr.c | 4 ++++
- dlls/msxml3/saxreader.c | 10 +++++++---
- dlls/msxml3/schema.c | 12 ++++++++++++
- dlls/msxml3/text.c | 5 +++++
- dlls/msxml3/xmldoc.c | 5 +++++
- dlls/msxml3/xmlelem.c | 5 +++++
- 26 files changed, 174 insertions(+), 34 deletions(-)
-
-diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
-index d78fa47..3df93d6 100644
---- a/dlls/msxml3/attribute.c
-+++ b/dlls/msxml3/attribute.c
-@@ -23,6 +23,12 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
-index b24e04c..01a09a5 100644
---- a/dlls/msxml3/bsc.c
-+++ b/dlls/msxml3/bsc.c
-@@ -23,6 +23,12 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
-index 3fba66c..caf8cd8 100644
---- a/dlls/msxml3/cdata.c
-+++ b/dlls/msxml3/cdata.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
-index e74de07..1cabfa3 100644
---- a/dlls/msxml3/comment.c
-+++ b/dlls/msxml3/comment.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
-index 09b71fe..6b01b15 100644
---- a/dlls/msxml3/dispex.c
-+++ b/dlls/msxml3/dispex.c
-@@ -22,6 +22,11 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
-index fff3f62..bebd252 100644
---- a/dlls/msxml3/docfrag.c
-+++ b/dlls/msxml3/docfrag.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
-index 0007503..e6a61e4 100644
---- a/dlls/msxml3/domdoc.c
-+++ b/dlls/msxml3/domdoc.c
-@@ -25,6 +25,15 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
- #ifdef HAVE_LIBXML2
-
--#include
--
- /* not defined in older versions */
- #define XML_SAVE_FORMAT 1
- #define XML_SAVE_NO_DECL 2
-diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
-index dd518a1..c6794ac 100644
---- a/dlls/msxml3/domimpl.c
-+++ b/dlls/msxml3/domimpl.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
-index 617c008..1b5c693 100644
---- a/dlls/msxml3/element.c
-+++ b/dlls/msxml3/element.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
-index db46193..1baea6e 100644
---- a/dlls/msxml3/entityref.c
-+++ b/dlls/msxml3/entityref.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
-index 3fd229c..45df9f0 100644
---- a/dlls/msxml3/factory.c
-+++ b/dlls/msxml3/factory.c
-@@ -24,6 +24,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
-index 4585484..be1a5f7 100644
---- a/dlls/msxml3/httprequest.c
-+++ b/dlls/msxml3/httprequest.c
-@@ -22,6 +22,12 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
-index 60b0cbd..47a89b1 100644
---- a/dlls/msxml3/main.c
-+++ b/dlls/msxml3/main.c
-@@ -25,6 +25,21 @@
- #define COBJMACROS
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# ifdef SONAME_LIBXSLT
-+# ifdef HAVE_LIBXSLT_PATTERN_H
-+# include
-+# endif
-+# ifdef HAVE_LIBXSLT_TRANSFORM_H
-+# include
-+# endif
-+# include
-+# include
-+# endif
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
-index e0279f1..e1fbb59 100644
---- a/dlls/msxml3/msxml_private.h
-+++ b/dlls/msxml3/msxml_private.h
-@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
-
- #ifdef HAVE_LIBXML2
-
--#ifdef HAVE_LIBXML_PARSER_H
--#include
--#endif
--
- /* constructors */
- extern IUnknown *create_domdoc( xmlNodePtr document );
- extern IUnknown *create_xmldoc( void );
-@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
-
- #endif
-
--void* libxslt_handle;
--#ifdef SONAME_LIBXSLT
--# ifdef HAVE_LIBXSLT_PATTERN_H
--# include
--# endif
--# ifdef HAVE_LIBXSLT_TRANSFORM_H
--# include
--# endif
--# include
--# include
--
--# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
--MAKE_FUNCPTR(xsltApplyStylesheet);
--MAKE_FUNCPTR(xsltCleanupGlobals);
--MAKE_FUNCPTR(xsltFreeStylesheet);
--MAKE_FUNCPTR(xsltParseStylesheetDoc);
--# undef MAKE_FUNCPTR
--#endif
--
- extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
- LONG line, LONG linepos, LONG filepos );
- extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
-diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
-index bbdcb5d..2980566 100644
---- a/dlls/msxml3/node.c
-+++ b/dlls/msxml3/node.c
-@@ -24,6 +24,23 @@
-
- #include
- #include
-+
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+# ifdef SONAME_LIBXSLT
-+# ifdef HAVE_LIBXSLT_PATTERN_H
-+# include
-+# endif
-+# ifdef HAVE_LIBXSLT_TRANSFORM_H
-+# include
-+# endif
-+# include
-+# include
-+# endif
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -33,16 +50,22 @@
-
- #include "msxml_private.h"
-
--#ifdef HAVE_LIBXML2
--# include
--#endif
--
- #include "wine/debug.h"
-
- WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
- #ifdef HAVE_LIBXML2
-
-+#ifdef SONAME_LIBXSLT
-+extern void* libxslt_handle;
-+# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
-+MAKE_FUNCPTR(xsltApplyStylesheet);
-+MAKE_FUNCPTR(xsltCleanupGlobals);
-+MAKE_FUNCPTR(xsltFreeStylesheet);
-+MAKE_FUNCPTR(xsltParseStylesheetDoc);
-+# undef MAKE_FUNCPTR
-+#endif
-+
- static const WCHAR szBinBase64[] = {'b','i','n','.','b','a','s','e','6','4',0};
- static const WCHAR szString[] = {'s','t','r','i','n','g',0};
- static const WCHAR szNumber[] = {'n','u','m','b','e','r',0};
-diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
-index f643c5e..4b2bba9 100644
---- a/dlls/msxml3/nodelist.c
-+++ b/dlls/msxml3/nodelist.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
-index 7d23ec8..d3d9c38 100644
---- a/dlls/msxml3/nodemap.c
-+++ b/dlls/msxml3/nodemap.c
-@@ -23,6 +23,11 @@
- #define COBJMACROS
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
-index 4b0dc57..89f14ca 100644
---- a/dlls/msxml3/parseerror.c
-+++ b/dlls/msxml3/parseerror.c
-@@ -25,6 +25,11 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winerror.h"
-diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
-index 0baefe4..3ebc1bf 100644
---- a/dlls/msxml3/pi.c
-+++ b/dlls/msxml3/pi.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
-index 2c6f23e..8613b20 100644
---- a/dlls/msxml3/queryresult.c
-+++ b/dlls/msxml3/queryresult.c
-@@ -24,6 +24,13 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
- #ifdef HAVE_LIBXML2
-
--#include
--
- typedef struct _queryresult
- {
- DispatchEx dispex;
-diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
-index 415e5af..864d61e 100644
---- a/dlls/msxml3/regsvr.c
-+++ b/dlls/msxml3/regsvr.c
-@@ -24,6 +24,10 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-
- #define COBJMACROS
-
-diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
-index eca9f1d..f2d340e 100644
---- a/dlls/msxml3/saxreader.c
-+++ b/dlls/msxml3/saxreader.c
-@@ -24,6 +24,13 @@
-
- #include
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
- #ifdef HAVE_LIBXML2
-
--#include
--#include
--
- typedef struct _saxreader
- {
- const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
-diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
-index 72d7854..c1465c0 100644
---- a/dlls/msxml3/schema.c
-+++ b/dlls/msxml3/schema.c
-@@ -23,6 +23,18 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+# include
-+# include
-+# include
-+# include
-+# include
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
-index fdcb06b..72b2ffd 100644
---- a/dlls/msxml3/text.c
-+++ b/dlls/msxml3/text.c
-@@ -24,6 +24,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
-index d1a010f..0d1006e 100644
---- a/dlls/msxml3/xmldoc.c
-+++ b/dlls/msxml3/xmldoc.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
-index a71b18b..a818d14 100644
---- a/dlls/msxml3/xmlelem.c
-+++ b/dlls/msxml3/xmlelem.c
-@@ -23,6 +23,11 @@
- #include "config.h"
-
- #include
-+#ifdef HAVE_LIBXML2
-+# include
-+# include
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
---
-1.7.8.3
-
diff --git a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
deleted file mode 100644
index be6ffc56d7cc..000000000000
--- a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=395615
-
-Explicitly add the required -m32/m64 to *FLAGS; this overrides any
-arch-specific -m* flags that may have been appended by multilib-portage.
-
-Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be
-explicitly added to CC and CXX due to wine's build system. For example,
-winegcc saves the build-time value of CC and uses it at runtime.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,12 +133,18 @@
- then
- CC="$CC -m64"
- CXX="$CXX -m64"
-+ CFLAGS="$CFLAGS -m64"
-+ LDFLAGS="$LDFLAGS -m64"
-+ CXXFLAGS="$CXXFLAGS -m64"
- host_cpu="x86_64"
- notice_platform="64-bit "
- AC_SUBST(TARGETFLAGS,"-m64")
- else
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- host_cpu="i386"
- notice_platform="32-bit "
- AC_SUBST(TARGETFLAGS,"-m32")
-@@ -150,6 +156,9 @@
- then
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- AC_MSG_CHECKING([whether $CC works])
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
- [AC_MSG_RESULT([no])
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index a3a8dbe67320..311346b9d7ce 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -16,7 +16,6 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing
- Support dynamic storage devices using sys-fs/udisks
Build a 32bit version of Wine (won't run Win64 binaries)
Build a 64bit version of Wine (won't run Win32 binaries)
diff --git a/app-emulation/wine/wine-1.2.1.ebuild b/app-emulation/wine/wine-1.2.1.ebuild
index 7209372d968c..7d9064ed0636 100644
--- a/app-emulation/wine/wine-1.2.1.ebuild
+++ b/app-emulation/wine/wine-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -67,6 +66,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -134,7 +134,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -163,7 +163,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -184,7 +184,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -193,12 +193,12 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.2.2.ebuild b/app-emulation/wine/wine-1.2.2.ebuild
index dddd32e502ea..0eaf2426af4d 100644
--- a/app-emulation/wine/wine-1.2.2.ebuild
+++ b/app-emulation/wine/wine-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.12 2011/09/18 09:08:12 ssuominen Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -30,8 +30,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,6 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -135,7 +135,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -164,7 +164,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -185,7 +185,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -194,12 +194,12 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
index d7c05ed09ffc..79876c9434e0 100644
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.12 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.10 2011/09/18 09:08:12 ssuominen Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -30,8 +30,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,6 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -117,7 +117,6 @@ src_prepare() {
eautoreconf
fi
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993
epatch_user #282735
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
@@ -136,7 +135,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -165,7 +164,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -186,7 +185,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -195,12 +194,12 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild
index 017b9ffecc1b..721a100094c3 100644
--- a/app-emulation/wine/wine-1.2.ebuild
+++ b/app-emulation/wine/wine-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.16 2011/09/18 09:08:12 ssuominen Exp $
-EAPI="4"
+EAPI="2"
AUTOTOOLS_AUTO_DEPEND="no"
inherit eutils flag-o-matic multilib autotools
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
@@ -53,6 +52,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -131,7 +131,7 @@ src_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -158,17 +158,22 @@ src_configure() {
$(use_with xcomposite) \
$(use_with xinerama) \
$(use_with xml) \
- $(use_with xml xslt)
+ $(use_with xml xslt) \
+ || die "configure failed"
- emake -j1 depend
+ emake -j1 depend || die "depend"
+}
+
+src_compile() {
+ emake all || die "all"
}
src_install() {
- emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install || die
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index fa661dac4f24..d16f6e78c6e7 100644
--- a/app-emulation/wine/wine-1.3.0.ebuild
+++ b/app-emulation/wine/wine-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.18 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -26,8 +26,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -64,6 +63,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -125,7 +125,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -153,7 +153,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -174,7 +174,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -183,12 +183,12 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 1b5bab8583fd..ae8f87d64dc3 100644
--- a/app-emulation/wine/wine-1.3.1.ebuild
+++ b/app-emulation/wine/wine-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.16 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -26,8 +26,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -64,6 +63,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -125,7 +125,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -153,7 +153,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -174,7 +174,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -183,7 +183,7 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
diff --git a/app-emulation/wine/wine-1.3.10.ebuild b/app-emulation/wine/wine-1.3.10.ebuild
index 653bd8ea5a7c..a4bd8f4bbec6 100644
--- a/app-emulation/wine/wine-1.3.10.ebuild
+++ b/app-emulation/wine/wine-1.3.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.17 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -130,7 +130,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -160,7 +160,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -181,7 +181,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -190,13 +190,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.11.ebuild b/app-emulation/wine/wine-1.3.11.ebuild
index d6b50d6ff0e7..4c0232ed01d8 100644
--- a/app-emulation/wine/wine-1.3.11.ebuild
+++ b/app-emulation/wine/wine-1.3.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.18 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.16 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.12.ebuild b/app-emulation/wine/wine-1.3.12.ebuild
index 3d1c4a9a1c9a..4051cabf44ef 100644
--- a/app-emulation/wine/wine-1.3.12.ebuild
+++ b/app-emulation/wine/wine-1.3.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.13.ebuild b/app-emulation/wine/wine-1.3.13.ebuild
index d27b4c6a52b1..8281902a5a24 100644
--- a/app-emulation/wine/wine-1.3.13.ebuild
+++ b/app-emulation/wine/wine-1.3.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.14.ebuild b/app-emulation/wine/wine-1.3.14.ebuild
index e95007955dda..eb44c2688e0e 100644
--- a/app-emulation/wine/wine-1.3.14.ebuild
+++ b/app-emulation/wine/wine-1.3.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.15 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.15.ebuild b/app-emulation/wine/wine-1.3.15.ebuild
index 6f7160f65e77..123d0715dfac 100644
--- a/app-emulation/wine/wine-1.3.15.ebuild
+++ b/app-emulation/wine/wine-1.3.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.16.ebuild b/app-emulation/wine/wine-1.3.16.ebuild
index dba354d4ff26..a278c523fefa 100644
--- a/app-emulation/wine/wine-1.3.16.ebuild
+++ b/app-emulation/wine/wine-1.3.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.15 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.17.ebuild b/app-emulation/wine/wine-1.3.17.ebuild
index 1e03a31d026c..1b459ab86d8a 100644
--- a/app-emulation/wine/wine-1.3.17.ebuild
+++ b/app-emulation/wine/wine-1.3.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.15 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.18.ebuild b/app-emulation/wine/wine-1.3.18.ebuild
index 2367a3aba2c7..9959fb060366 100644
--- a/app-emulation/wine/wine-1.3.18.ebuild
+++ b/app-emulation/wine/wine-1.3.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.15 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.19.ebuild b/app-emulation/wine/wine-1.3.19.ebuild
index afc33fa493a5..2370ec645518 100644
--- a/app-emulation/wine/wine-1.3.19.ebuild
+++ b/app-emulation/wine/wine-1.3.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 6e4c71b5b187..887bf8360e58 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.18 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -67,6 +66,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -128,7 +128,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -156,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -177,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -186,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.20.ebuild b/app-emulation/wine/wine-1.3.20.ebuild
index 0a77d10eeef8..e20a33961c96 100644
--- a/app-emulation/wine/wine-1.3.20.ebuild
+++ b/app-emulation/wine/wine-1.3.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.21.ebuild b/app-emulation/wine/wine-1.3.21.ebuild
index f1b846cab6d8..cdc9ff61ba42 100644
--- a/app-emulation/wine/wine-1.3.21.ebuild
+++ b/app-emulation/wine/wine-1.3.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.22.ebuild b/app-emulation/wine/wine-1.3.22.ebuild
index 986438cecf5b..02a35d7282c1 100644
--- a/app-emulation/wine/wine-1.3.22.ebuild
+++ b/app-emulation/wine/wine-1.3.22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.23.ebuild b/app-emulation/wine/wine-1.3.23.ebuild
index 142d035ea7e5..2aec5bd0378e 100644
--- a/app-emulation/wine/wine-1.3.23.ebuild
+++ b/app-emulation/wine/wine-1.3.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.13 2011/12/02 23:32:06 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.24.ebuild b/app-emulation/wine/wine-1.3.24.ebuild
index cfcf19090970..c937da6656c0 100644
--- a/app-emulation/wine/wine-1.3.24.ebuild
+++ b/app-emulation/wine/wine-1.3.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.24.ebuild,v 1.9 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.24.ebuild,v 1.7 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -131,7 +131,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -162,7 +162,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -183,7 +183,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -192,13 +192,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.25.ebuild b/app-emulation/wine/wine-1.3.25.ebuild
index 4116bf0ee602..f3d44a17259b 100644
--- a/app-emulation/wine/wine-1.3.25.ebuild
+++ b/app-emulation/wine/wine-1.3.25.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.25.ebuild,v 1.10 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.25.ebuild,v 1.8 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.26.ebuild b/app-emulation/wine/wine-1.3.26.ebuild
index 13908985289c..81d0dfdc5160 100644
--- a/app-emulation/wine/wine-1.3.26.ebuild
+++ b/app-emulation/wine/wine-1.3.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.26.ebuild,v 1.10 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.26.ebuild,v 1.8 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.27.ebuild b/app-emulation/wine/wine-1.3.27.ebuild
index 4cc41d2ee583..56eb909fcf67 100644
--- a/app-emulation/wine/wine-1.3.27.ebuild
+++ b/app-emulation/wine/wine-1.3.27.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.6 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.4 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild
index 02c022df4545..0773cf601d08 100644
--- a/app-emulation/wine/wine-1.3.28.ebuild
+++ b/app-emulation/wine/wine-1.3.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.5 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.3 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.29.ebuild b/app-emulation/wine/wine-1.3.29.ebuild
index e99fd7392821..0ec97fe44355 100644
--- a/app-emulation/wine/wine-1.3.29.ebuild
+++ b/app-emulation/wine/wine-1.3.29.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.29.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.29.ebuild,v 1.2 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.3.ebuild b/app-emulation/wine/wine-1.3.3.ebuild
index 0e0338f876fd..9384c3fad075 100644
--- a/app-emulation/wine/wine-1.3.3.ebuild
+++ b/app-emulation/wine/wine-1.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.15 2011/12/02 23:32:06 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -67,6 +66,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -128,7 +128,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -156,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -177,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -186,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.30.ebuild b/app-emulation/wine/wine-1.3.30.ebuild
index 4ac895dcf86f..81cd9bb8da6b 100644
--- a/app-emulation/wine/wine-1.3.30.ebuild
+++ b/app-emulation/wine/wine-1.3.30.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.30.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.30.ebuild,v 1.2 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.31.ebuild b/app-emulation/wine/wine-1.3.31.ebuild
index 709c094acdaf..5ff50229112c 100644
--- a/app-emulation/wine/wine-1.3.31.ebuild
+++ b/app-emulation/wine/wine-1.3.31.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.31.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.31.ebuild,v 1.2 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.32.ebuild b/app-emulation/wine/wine-1.3.32.ebuild
index 16b879d21ded..cea9ebb0574a 100644
--- a/app-emulation/wine/wine-1.3.32.ebuild
+++ b/app-emulation/wine/wine-1.3.32.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.32.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.32.ebuild,v 1.2 2011/12/02 23:32:06 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.33.ebuild b/app-emulation/wine/wine-1.3.33.ebuild
index ca806ac8848b..efc232d5c688 100644
--- a/app-emulation/wine/wine-1.3.33.ebuild
+++ b/app-emulation/wine/wine-1.3.33.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.33.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.33.ebuild,v 1.2 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.34.ebuild b/app-emulation/wine/wine-1.3.34.ebuild
index 4c3491467a09..89f050dc0621 100644
--- a/app-emulation/wine/wine-1.3.34.ebuild
+++ b/app-emulation/wine/wine-1.3.34.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.34.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.34.ebuild,v 1.2 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -157,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -178,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -187,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.35.ebuild b/app-emulation/wine/wine-1.3.35.ebuild
deleted file mode 100644
index 98e0cb518781..000000000000
--- a/app-emulation/wine/wine-1.3.35.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.35.ebuild,v 1.3 2012/01/14 03:20:51 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
- )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=sys-kernel/linux-headers-2.6
- )"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2 )
- fontconfig? ( media-libs/fontconfig )
- gphoto2? ( media-libs/libgphoto2 )
- openal? ( media-libs/openal )
- dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
- gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
- X? (
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-apps/xmessage
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
- gsm? ( media-sound/gsm )
- jpeg? ( virtual/jpeg )
- ldap? ( net-nds/openldap )
- lcms? ( =media-libs/lcms-1* )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- samba? ( >=net-fs/samba-3.0.25 )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends )
- ssl? ( dev-libs/openssl )
- png? ( media-libs/libpng )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- !hardened? ( sys-devel/prelink )
- virtual/yacc
- sys-devel/flex"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch_user #282735
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if ! use perl ; then
- rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-}
-
-pkg_postinst() {
- paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.3.36.ebuild b/app-emulation/wine/wine-1.3.36.ebuild
deleted file mode 100644
index e3a08ea5c5ae..000000000000
--- a/app-emulation/wine/wine-1.3.36.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.2 2012/01/14 03:20:51 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
- )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=sys-kernel/linux-headers-2.6
- )"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2 )
- fontconfig? ( media-libs/fontconfig )
- gphoto2? ( media-libs/libgphoto2 )
- openal? ( media-libs/openal )
- udisks? (
- sys-apps/dbus
- sys-fs/udisks
- )
- gnutls? ( net-libs/gnutls )
- gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
- X? (
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-apps/xmessage
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
- gsm? ( media-sound/gsm )
- jpeg? ( virtual/jpeg )
- ldap? ( net-nds/openldap )
- lcms? ( =media-libs/lcms-1* )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- samba? ( >=net-fs/samba-3.0.25 )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends )
- ssl? ( dev-libs/openssl )
- png? ( media-libs/libpng )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- !hardened? ( sys-devel/prelink )
- virtual/yacc
- sys-devel/flex"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch_user #282735
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with udisks dbus) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if ! use perl ; then
- rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-}
-
-pkg_postinst() {
- paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.3.37.ebuild b/app-emulation/wine/wine-1.3.37.ebuild
deleted file mode 100644
index 0f7c73ebe890..000000000000
--- a/app-emulation/wine/wine-1.3.37.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.37.ebuild,v 1.1 2012/01/14 03:30:58 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
- )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=sys-kernel/linux-headers-2.6
- )"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2 )
- fontconfig? ( media-libs/fontconfig )
- gphoto2? ( media-libs/libgphoto2 )
- openal? ( media-libs/openal )
- udisks? (
- sys-apps/dbus
- sys-fs/udisks
- )
- gnutls? ( net-libs/gnutls )
- gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
- X? (
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-apps/xmessage
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
- gsm? ( media-sound/gsm )
- jpeg? ( virtual/jpeg )
- ldap? ( net-nds/openldap )
- lcms? ( =media-libs/lcms-1* )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- samba? ( >=net-fs/samba-3.0.25 )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends )
- ssl? ( dev-libs/openssl )
- png? ( media-libs/libpng )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- !hardened? ( sys-devel/prelink )
- virtual/yacc
- sys-devel/flex"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch_user #282735
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with udisks dbus) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if ! use perl ; then
- rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-}
-
-pkg_postinst() {
- paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.3.4.ebuild b/app-emulation/wine/wine-1.3.4.ebuild
index 6b9d7b64b170..8a3a19968b3c 100644
--- a/app-emulation/wine/wine-1.3.4.ebuild
+++ b/app-emulation/wine/wine-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.14 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -67,6 +66,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -128,7 +128,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -156,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -177,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -186,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.5.ebuild b/app-emulation/wine/wine-1.3.5.ebuild
index 841bff1fcba9..dbe5b321e308 100644
--- a/app-emulation/wine/wine-1.3.5.ebuild
+++ b/app-emulation/wine/wine-1.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -67,6 +66,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -128,7 +128,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -156,7 +156,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -177,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -186,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.6.ebuild b/app-emulation/wine/wine-1.3.6.ebuild
index 452105aac1b9..d3a69eabea6a 100644
--- a/app-emulation/wine/wine-1.3.6.ebuild
+++ b/app-emulation/wine/wine-1.3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.13 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,6 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -129,7 +129,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -158,7 +158,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -179,7 +179,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -188,13 +188,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.7.ebuild b/app-emulation/wine/wine-1.3.7.ebuild
index b8ce96ba995f..31da4e5f016b 100644
--- a/app-emulation/wine/wine-1.3.7.ebuild
+++ b/app-emulation/wine/wine-1.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.12 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,6 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -129,7 +129,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -158,7 +158,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -179,7 +179,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -188,13 +188,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.8.ebuild b/app-emulation/wine/wine-1.3.8.ebuild
index 96a23b5336c9..8f77de7a0d1e 100644
--- a/app-emulation/wine/wine-1.3.8.ebuild
+++ b/app-emulation/wine/wine-1.3.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.12 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,6 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
opengl? ( virtual/opengl )
@@ -129,7 +129,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -158,7 +158,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -179,7 +179,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -188,13 +188,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.3.9.ebuild b/app-emulation/wine/wine-1.3.9.ebuild
index b0d2543d899f..ea07a38379f0 100644
--- a/app-emulation/wine/wine-1.3.9.ebuild
+++ b/app-emulation/wine/wine-1.3.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.18 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.16 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
inherit eutils flag-o-matic multilib
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jack jpeg lcms ldap mp3 nas ncurses openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -68,9 +67,10 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
+ esd? ( media-sound/esound )
nas? ( media-libs/nas )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -130,7 +130,7 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- --without-esd \
+ $(use_with esd) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -160,7 +160,7 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
@@ -181,7 +181,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -190,13 +190,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/wine/wine-1.4_rc1.ebuild b/app-emulation/wine/wine-1.4_rc1.ebuild
deleted file mode 100644
index dcf85823b176..000000000000
--- a/app-emulation/wine/wine-1.4_rc1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc1.ebuild,v 1.2 2012/01/28 22:53:52 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
- )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=sys-kernel/linux-headers-2.6
- )"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2 )
- fontconfig? ( media-libs/fontconfig )
- gphoto2? ( media-libs/libgphoto2 )
- openal? ( media-libs/openal )
- udisks? (
- sys-apps/dbus
- sys-fs/udisks
- )
- gnutls? ( net-libs/gnutls )
- gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
- X? (
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-apps/xmessage
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
- gsm? ( media-sound/gsm )
- jpeg? ( virtual/jpeg )
- ldap? ( net-nds/openldap )
- lcms? ( =media-libs/lcms-1* )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- samba? ( >=net-fs/samba-3.0.25 )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends )
- ssl? ( dev-libs/openssl )
- png? ( media-libs/libpng )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- !hardened? ( sys-devel/prelink )
- virtual/yacc
- sys-devel/flex"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch_user #282735
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with udisks dbus) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if ! use perl ; then
- rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-}
-
-pkg_postinst() {
- paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.4_rc2.ebuild b/app-emulation/wine/wine-1.4_rc2.ebuild
deleted file mode 100644
index 61ed6b604b50..000000000000
--- a/app-emulation/wine/wine-1.4_rc2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc2.ebuild,v 1.1 2012/02/05 21:15:05 tetromino Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.4"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
- win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
- )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
-RESTRICT="test" #72375
-
-MLIB_DEPS="amd64? (
- truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
- X? (
- >=app-emulation/emul-linux-x86-xlibs-2.1
- >=app-emulation/emul-linux-x86-soundlibs-2.1
- )
- mp3? ( app-emulation/emul-linux-x86-soundlibs )
- openal? ( app-emulation/emul-linux-x86-sdl )
- opengl? ( app-emulation/emul-linux-x86-opengl )
- scanner? ( app-emulation/emul-linux-x86-medialibs )
- v4l? ( app-emulation/emul-linux-x86-medialibs )
- app-emulation/emul-linux-x86-baselibs
- >=sys-kernel/linux-headers-2.6
- )"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2 )
- fontconfig? ( media-libs/fontconfig )
- gphoto2? ( media-libs/libgphoto2 )
- openal? ( media-libs/openal )
- udisks? (
- sys-apps/dbus
- sys-fs/udisks
- )
- gnutls? ( net-libs/gnutls )
- gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
- X? (
- x11-libs/libXcursor
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm
- x11-apps/xmessage
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
- gsm? ( media-sound/gsm )
- jpeg? ( virtual/jpeg )
- ldap? ( net-nds/openldap )
- lcms? ( =media-libs/lcms-1* )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- samba? ( >=net-fs/samba-3.0.25 )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends )
- ssl? ( dev-libs/openssl )
- png? ( media-libs/libpng )
- v4l? ( media-libs/libv4l )
- !win64? ( ${MLIB_DEPS} )
- win32? ( ${MLIB_DEPS} )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- !hardened? ( sys-devel/prelink )
- virtual/yacc
- sys-devel/flex"
-
-src_unpack() {
- if use win64 ; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
- fi
-
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
- epatch_user #282735
- eautoreconf
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
- local builddir="${WORKDIR}/wine$1"
- mkdir -p "${builddir}"
- pushd "${builddir}" >/dev/null
-
- ECONF_SOURCE=${S} \
- econf \
- --sysconfdir=/etc/wine \
- $(use_with alsa) \
- $(use_with capi) \
- $(use_with lcms cms) \
- $(use_with cups) \
- $(use_with ncurses curses) \
- $(use_with udisks dbus) \
- $(use_with fontconfig) \
- $(use_with gnutls) \
- $(use_with gphoto2 gphoto) \
- $(use_with gsm) \
- $(use_with gstreamer) \
- --without-hal \
- $(use_with jpeg) \
- $(use_with ldap) \
- $(use_with mp3 mpg123) \
- $(use_with nls gettext) \
- $(use_with openal) \
- $(use_with opencl) \
- $(use_with opengl) \
- $(use_with ssl openssl) \
- $(use_with oss) \
- $(use_with png) \
- $(use_with threads pthread) \
- $(use_with scanner sane) \
- $(use_enable test tests) \
- $(use_with truetype freetype) \
- $(use_with v4l) \
- $(use_with X x) \
- $(use_with xcomposite) \
- $(use_with xinerama) \
- $(use_with xml) \
- $(use_with xml xslt) \
- $2
-
- emake -j1 depend
-
- popd >/dev/null
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- if use win64 ; then
- do_configure 64 --enable-win64
- use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
- else
- ABI=x86 do_configure 32 --disable-win64
- fi
-}
-
-src_compile() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
- done
-}
-
-src_install() {
- local b
- for b in 64 32 ; do
- local builddir="${WORKDIR}/wine${b}"
- [[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
- done
- dodoc ANNOUNCE AUTHORS README
- if use gecko ; then
- insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if ! use perl ; then
- rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-}
-
-pkg_postinst() {
- paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 74ef0574ac1d..e41977c6c657 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.101 2012/02/05 21:15:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.97 2011/12/02 23:32:04 vapier Exp $
-EAPI="4"
+EAPI="2"
-inherit autotools eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -29,8 +29,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #286560
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
RESTRICT="test" #72375
MLIB_DEPS="amd64? (
@@ -54,10 +53,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
fontconfig? ( media-libs/fontconfig )
gphoto2? ( media-libs/libgphoto2 )
openal? ( media-libs/openal )
- udisks? (
- sys-apps/dbus
- sys-fs/udisks
- )
+ dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
X? (
@@ -71,7 +67,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
- opencl? ( virtual/opencl )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
opengl? ( virtual/opengl )
gsm? ( media-sound/gsm )
jpeg? ( virtual/jpeg )
@@ -114,9 +110,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
- epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
epatch_user #282735
- eautoreconf
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
}
@@ -134,7 +128,6 @@ do_configure() {
$(use_with lcms cms) \
$(use_with cups) \
$(use_with ncurses curses) \
- $(use_with udisks dbus) \
$(use_with fontconfig) \
$(use_with gnutls) \
$(use_with gphoto2 gphoto) \
@@ -163,11 +156,10 @@ do_configure() {
$(use_with xml xslt) \
$2
- emake -j1 depend
+ emake -j1 depend || die "depend"
popd >/dev/null
}
-
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
@@ -185,7 +177,7 @@ src_compile() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" all
+ emake -C "${builddir}" all || die
done
}
@@ -194,13 +186,13 @@ src_install() {
for b in 64 32 ; do
local builddir="${WORKDIR}/wine${b}"
[[ -d ${builddir} ]] || continue
- emake -C "${builddir}" install DESTDIR="${D}"
+ emake -C "${builddir}" install DESTDIR="${D}" || die
done
dodoc ANNOUNCE AUTHORS README
if use gecko ; then
insinto /usr/share/wine/gecko
- doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
+ use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
fi
if ! use perl ; then
rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 5113ae627be2..6ab163f4939d 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,13 +1,13 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.4 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.3 2011/11/28 18:29:19 alexxy Exp $
opts="start stop status restart"
depend() {
- need xenstored
- after dhcp xend xenconsoled
+ need xenstored xenconsoled
+ after dhcp xend
}
get_domname() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index 3ce8a54cf2f1..3d17e4346344 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.2 2011/11/30 19:39:53 mr_bones_ Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -256,8 +256,8 @@ src_install() {
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xenstored.initd xenstored \
+ "${FILESDIR}"/xenconsoled.initd xenconsoled
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
diff --git a/app-forensics/chkrootkit/chkrootkit-0.49.ebuild b/app-forensics/chkrootkit/chkrootkit-0.49.ebuild
index 302bc9efce93..befb4752af6c 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.49.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.49.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.49.ebuild,v 1.10 2012/01/06 17:34:08 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.49.ebuild,v 1.9 2011/10/11 17:33:11 jer Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86"
IUSE="+cron"
RDEPEND="cron? ( virtual/cron )"
diff --git a/app-forensics/foremost/foremost-1.5.7-r1.ebuild b/app-forensics/foremost/foremost-1.5.7-r1.ebuild
index 18a6d0cd6296..c2be31c6444c 100644
--- a/app-forensics/foremost/foremost-1.5.7-r1.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-1.5.7-r1.ebuild,v 1.6 2012/01/09 19:02:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-1.5.7-r1.ebuild,v 1.5 2011/11/28 11:40:34 phajdan.jr Exp $
EAPI=4
@@ -12,7 +12,7 @@ HOMEPAGE="http://foremost.sourceforge.net/"
# starting to hate sf.net ...
SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
LICENSE="public-domain"
SLOT="0"
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 6ca584054f14..2901182237cf 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,2 +1,4 @@
+DIST lynis-1.2.1.tar.gz 72632 RMD160 e6bd6d98ce026e10e326ccfce718447034f9d4b4 SHA1 2df1b86bb13813389eb4f878d86d59e3953dcde6 SHA256 24e256770dbc5a50c2088eda6da9ba21c2136db6233e36af38c033cea4aa347f
+DIST lynis-1.2.5.tar.gz 96717 RMD160 261a154b3cf17c4515c7df58877a8d2699eb037c SHA1 265a1dea76ce583b5b1f2061c186189fc2a1723d SHA256 8ba51a7b6deb1d0097246edab6e9b6e4f76cc8b6ad720faa23866ca5550bc528
+DIST lynis-1.2.6.tar.gz 100254 RMD160 d48a115318140d51dc547ee0fd08fc9d3af030f7 SHA1 bc86f91f9bac5e0f2d64af0189818b3caa7f67c1 SHA256 af94dfcc8909152ca95b233d89bbea2d65c0563b10addf2e84893f8312e82303
DIST lynis-1.2.9.tar.gz 117107 RMD160 cbb803d44e604ef35d09f5cee42f19c1e1be32d6 SHA1 89e45797eb1f88d46337a395cd13812cb33ad066 SHA256 51e69e0d45d6a879a0a22ba1144a49207dad7ed45764172769d67f21f60f5b79
-DIST lynis-1.3.0.tar.gz 119797 RMD160 3445fae1523bbdcb9ca47f8dfe60819d05f7b498 SHA1 b60921420277a969cf862b0e0166fe36451057b9 SHA256 fe265965eb1ce8fac352e0bddea1d5ec6508c319bf88a5f63c2edecf2af6de54
diff --git a/app-forensics/lynis/lynis-1.2.1.ebuild b/app-forensics/lynis/lynis-1.2.1.ebuild
new file mode 100644
index 000000000000..743ca3d52177
--- /dev/null
+++ b/app-forensics/lynis/lynis-1.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.2.1.ebuild,v 1.4 2008/10/11 11:18:27 bluebird Exp $
+
+DESCRIPTION="Security and system auditing tool"
+HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
+SRC_URI="http://www.rootkit.nl/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+src_install() {
+ insinto /usr/share/lynis/db
+ doins db/*.db || die "failed to install lynis db files"
+
+ insinto /usr/share/lynis/include
+ doins include/* || die "failed to install lynis includes"
+
+ insinto /usr/share/lynis/plugins
+ doins plugins/* || die "failed to install lynis plugins"
+
+ dobin lynis || die "failed to install lynis script"
+
+ insinto /etc/lynis
+ doins default.prf || die "failed to install default.prf"
+ keepdir /etc/lynis
+
+ doman lynis.8 || die "doman failed"
+ dodoc CHANGELOG README INSTALL FAQ TODO || die "dodoc failed"
+
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/lynis.cron lynis || die "failed to install cron script"
+}
+
+pkg_postinst() {
+ echo
+ elog "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
+ echo
+}
diff --git a/app-forensics/lynis/lynis-1.2.5.ebuild b/app-forensics/lynis/lynis-1.2.5.ebuild
new file mode 100644
index 000000000000..e035a9d2b24c
--- /dev/null
+++ b/app-forensics/lynis/lynis-1.2.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.2.5.ebuild,v 1.2 2009/07/29 15:54:36 beandog Exp $
+
+DESCRIPTION="Security and system auditing tool"
+HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
+SRC_URI="http://www.rootkit.nl/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r db/ include/ plugins/ || die "failed to install lynis base files"
+
+ dosbin lynis || die "dosbin failed"
+
+ insinto /etc/${PN}
+ doins default.prf || die "failed to install default.prf"
+
+ doman lynis.8 || die "doman failed"
+ dodoc CHANGELOG FAQ README TODO || die "dodoc failed"
+
+ # Remove the old one during the next stabilize progress
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/lynis.cron-new lynis || die "failed to install cron script"
+}
+
+pkg_postinst() {
+ einfo
+ einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
+ einfo
+}
diff --git a/app-forensics/lynis/lynis-1.2.6.ebuild b/app-forensics/lynis/lynis-1.2.6.ebuild
new file mode 100644
index 000000000000..d475cdb048b0
--- /dev/null
+++ b/app-forensics/lynis/lynis-1.2.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.2.6.ebuild,v 1.2 2009/07/29 15:54:36 beandog Exp $
+
+DESCRIPTION="Security and system auditing tool"
+HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
+SRC_URI="http://www.rootkit.nl/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r db/ include/ plugins/ || die "failed to install lynis base files"
+
+ dosbin lynis || die "dosbin failed"
+
+ insinto /etc/${PN}
+ doins default.prf || die "failed to install default.prf"
+
+ doman lynis.8 || die "doman failed"
+ dodoc CHANGELOG FAQ README dev/TODO || die "dodoc failed"
+
+ # Remove the old one during the next stabilize progress
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/lynis.cron-new lynis || die "failed to install cron script"
+}
+
+pkg_postinst() {
+ einfo
+ einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
+ einfo
+}
diff --git a/app-forensics/lynis/lynis-1.3.0.ebuild b/app-forensics/lynis/lynis-1.3.0.ebuild
deleted file mode 100644
index ee92fdf18b67..000000000000
--- a/app-forensics/lynis/lynis-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.3.0.ebuild,v 1.1 2011/12/26 18:40:08 idl0r Exp $
-
-EAPI="4"
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
-SRC_URI="http://www.rootkit.nl/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r db/ include/ plugins/ || die "failed to install lynis base files"
-
- dosbin lynis || die "dosbin failed"
-
- insinto /etc/${PN}
- doins default.prf || die "failed to install default.prf"
-
- doman lynis.8 || die "doman failed"
- dodoc CHANGELOG FAQ README dev/TODO
-
- # Remove the old one during the next stabilize progress
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/lynis.cron-new lynis || die "failed to install cron script"
-}
-
-pkg_postinst() {
- einfo
- einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
- einfo
-}
diff --git a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
index df44b92e087e..14876462f849 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.2 2012/02/03 14:42:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.9.ebuild,v 1.1 2011/05/29 00:26:12 radhermit Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.itu.dk/people/jobr/magicrescue/release/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-forensics/memdump/Manifest b/app-forensics/memdump/Manifest
index e0f2eee35b52..5ddf51999861 100644
--- a/app-forensics/memdump/Manifest
+++ b/app-forensics/memdump/Manifest
@@ -1 +1,2 @@
+DIST memdump-1.0.tar.gz 12669 RMD160 d36e7db9adf7f6362d4236bb9a6c7ec19a3566cc SHA1 a826742d1c3a59c275279065dc86d20f083984e1 SHA256 1b6704bb290c3658b7460a388a9a570e38fe5be5d9498840a44df23b3591f3e8
DIST memdump-1.01.tar.gz 12713 RMD160 437585744012de5c6f88743c05428ca9bc9cf9b1 SHA1 bc5f0a132f41a3606697e874e942e6588398a3a8 SHA256 76de8ff167d0779d6c3b2f2f52ca9d1cc22af179c51e976fe6e3b9a5d1e5799f
diff --git a/app-forensics/memdump/memdump-1.0.ebuild b/app-forensics/memdump/memdump-1.0.ebuild
new file mode 100644
index 000000000000..f32bc763a76c
--- /dev/null
+++ b/app-forensics/memdump/memdump-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.0.ebuild,v 1.7 2009/09/13 22:35:31 patrick Exp $
+
+DESCRIPTION="Simple memory dumper for UNIX-Like systems"
+HOMEPAGE="http://www.porcupine.org/forensics"
+SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+DEPEND="sys-apps/sed
+ sys-apps/grep"
+RDEPEND=""
+IUSE=""
+
+src_compile() {
+ emake XFLAGS="${CFLAGS}" OPT= DEBUG= || die
+}
+
+src_test() {
+ if has userpriv ${FEATURES};
+ then
+ einfo "Cannot test with FEATURES=userpriv"
+ elif [ -x /bin/wc ];
+ then
+ einfo "testing"
+ if [ "`./memdump -s 344 | wc -c`" = "344" ];
+ then
+ einfo "passed test"
+ else
+ die "failed test"
+ fi
+ fi
+}
+
+src_install() {
+ dosbin memdump
+ dodoc README LICENSE
+ doman memdump.1
+}
diff --git a/app-forensics/memdump/memdump-1.01.ebuild b/app-forensics/memdump/memdump-1.01.ebuild
index f65a1be45fae..a36c653a8b12 100644
--- a/app-forensics/memdump/memdump-1.01.ebuild
+++ b/app-forensics/memdump/memdump-1.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.01.ebuild,v 1.4 2012/01/11 20:38:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.01.ebuild,v 1.3 2011/11/11 09:28:56 phajdan.jr Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
LICENSE="IBM"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
src_prepare() {
diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest
index c86de1586c99..38ce597b9cab 100644
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@@ -1,3 +1,2 @@
DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
-DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml
index 8be2af1a9c36..a3016cd59c15 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -3,18 +3,17 @@
proxy-maintainers
-corentin.labbe@geomatys.fr
-LABBE Corentin (Montjoie)
-Maintainer.
-
-
hwoarang@gentoo.org
Markos Chandras
-Proxy maintainer.
+Proxy maintainer. CC him on bugs
+
+
+corentin.labbe@geomatys.fr
+LABBE Corentin (Montjoie)
+Maintainer. Assign bugs to him
Prefer NSS over libgcrypt as the crypto engine
-Compiles the RPM probes
Build the sql independant probes
diff --git a/app-forensics/openscap/openscap-0.8.0.ebuild b/app-forensics/openscap/openscap-0.8.0.ebuild
deleted file mode 100644
index df2a7435c2c9..000000000000
--- a/app-forensics/openscap/openscap-0.8.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.0.ebuild,v 1.2 2011/12/28 14:01:19 swift Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python bash-completion-r1
-
-DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
-HOMEPAGE="http://www.open-scap.org/"
-SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc nss perl python rpm sql"
-RESTRICT="test"
-
-RDEPEND="!nss? ( dev-libs/libgcrypt )
- nss? ( dev-libs/nss )
- rpm? ( >=app-arch/rpm-4.9 )
- sql? ( dev-db/opendbx )
- dev-libs/libpcre
- dev-libs/libxml2
- dev-libs/libxslt
- net-misc/curl"
-DEPEND="${RDEPEND}
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
- sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
- if ! use rpm ; then
- sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
- sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
- sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
- sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
- sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
- fi
-}
-
-src_configure() {
- local myconf
- if use python || use perl ; then
- myconf+=" --enable-bindings"
- else
- myconf+=" --disable-bindings"
- fi
- if use nss ; then
- myconf+=" --with-crypto=nss3"
- else
- myconf+=" --with-crypto=gcrypt"
- fi
- econf ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- find "${D}" -name '*.la' -delete || die
- sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
- #--enable-bindings enable all bindings, clean unwanted bindings
- if use python && ! use perl ; then
- rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
- fi
- if ! use python && use perl ; then
- rm -rf "${D}"/$(python_get_sitedir) || die
- fi
- if use doc ; then
- dohtml -r docs/html/* || die
- dodoc docs/examples/* || die
- fi
- if use bash-completion ; then
- dobashcomp "${D}"/etc/bash_completion.d/oscap
- fi
- rm -rf "${D}"/etc/bash_completion.d || die
-}
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 1f8a71018248..3179538e68ab 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1 +1,3 @@
+DIST rkhunter-1.3.4.tar.gz 275653 RMD160 c4d4998c960e300a86fa0891f6da1bcc14d8eb4c SHA1 1d3d54852a6320e9eb1a77aee0d674816223d8d1 SHA256 d85d179850fee8ab04bc1733680c9c6dd8a1577975c12554db9c52bf4f7c50ba
+DIST rkhunter-1.3.6.tar.gz 217691 RMD160 ffc017cae3bc1c9c1542a8529911ba3ff32bb41f SHA1 7428cac298e820adac6dd9d1a7d005edbaf216b2 SHA256 e3f5e21307e4876da4bc4a1521a86f1cda93ad22d4c77366876d7c170dcefc10
DIST rkhunter-1.3.8.tar.gz 241551 RMD160 7c013fd68675d5f859db0430c04673154209a64e SHA1 f4b0c3f149213aa50e00c9658ad8a4a79861621f SHA256 fb1fb8bac53bab476142b5556140c59d589bc0f45d3dc058f400f2edada77a33
diff --git a/app-forensics/rkhunter/files/rkhunter-ppc64.patch b/app-forensics/rkhunter/files/rkhunter-ppc64.patch
new file mode 100644
index 000000000000..70a5896abf77
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-ppc64.patch
@@ -0,0 +1,7 @@
+--- rkhunter.orig/files/os.dat 2007-06-15 04:51:07.000000000 +0800
++++ rkhunter/files/os.dat 2008-05-04 00:11:31.000000000 +0800
+@@ -233,3 +233,4 @@
+ 988:Debian stable (arm):/usr/bin/md5sum:/bin:
+ 989:Debian stable (powerpc):/usr/bin/md5sum:/bin:
+ 990:Debian stable (x86_64):/usr/bin/md5sum:/bin:
++991:Gentoo Linux 1.6 (powerpc64):/usr/bin/md5sum:/bin:
diff --git a/app-forensics/rkhunter/rkhunter-1.3.4-r3.ebuild b/app-forensics/rkhunter/rkhunter-1.3.4-r3.ebuild
new file mode 100644
index 000000000000..a5652cc81b82
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.3.4-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.4-r3.ebuild,v 1.10 2011/10/08 18:58:52 armin76 Exp $
+
+EAPI=2
+
+inherit eutils bash-completion
+
+DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
+HOMEPAGE="http://rkhunter.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE=""
+
+RDEPEND="
+ app-shells/bash
+ dev-lang/perl
+ sys-process/lsof
+ virtual/cron
+"
+
+S="${WORKDIR}/${P}/files"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}.conf.patch"
+ epatch "${FILESDIR}/${PN}-ppc64.patch"
+}
+
+src_install() {
+ # rkhunter requires to be root
+ dosbin ${PN}
+
+ # rkhunter doesn't create it by itself
+ dodir /var/lib/${PN}/tmp
+
+ insinto /etc
+ doins ${PN}.conf || die "failed to install ${PN}.conf"
+
+ exeinto /usr/lib/${PN}/scripts
+ doexe *.pl || die "failed to install scripts"
+
+ insinto /var/lib/${PN}/db
+ doins *.dat || die "failed to install dat files"
+
+ insinto /var/lib/${PN}/db/i18n
+ doins i18n/*
+
+ doman ${PN}.8 || die "doman failed"
+ dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README WISHLIST || die "dodoc failed"
+
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}/${PN}-1.3.cron" ${PN} || \
+ die "failed to install cron script"
+
+ dobashcompletion "${FILESDIR}/${PN}.bash-completion"
+}
+
+pkg_postinst() {
+ elog "A cron script has been installed to /etc/cron.daily/rkhunter."
+ elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
+ elog "directions."
+ elog "If you want ${PN} to send mail, you will need to install"
+ elog "virtual/mailx or alter the EMAIL_CMD variable in the"
+ elog "cron script and possibly the MAIL_CMD variable in the"
+ elog "${PN}.conf file to use another mail client."
+ bash-completion_pkg_postinst
+}
diff --git a/app-forensics/rkhunter/rkhunter-1.3.6.ebuild b/app-forensics/rkhunter/rkhunter-1.3.6.ebuild
new file mode 100644
index 000000000000..e325571bc628
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.3.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.6.ebuild,v 1.4 2011/10/08 18:58:52 armin76 Exp $
+
+EAPI=2
+
+inherit eutils bash-completion
+
+DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
+HOMEPAGE="http://rkhunter.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ app-shells/bash
+ dev-lang/perl
+ sys-process/lsof
+ virtual/cron
+"
+
+S="${WORKDIR}/${P}/files"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}.conf.patch"
+}
+
+src_install() {
+ # rkhunter requires to be root
+ dosbin ${PN}
+
+ # rkhunter doesn't create it by itself
+ dodir /var/lib/${PN}/tmp
+
+ insinto /etc
+ doins ${PN}.conf || die "failed to install ${PN}.conf"
+
+ exeinto /usr/lib/${PN}/scripts
+ doexe *.pl || die "failed to install scripts"
+
+ insinto /var/lib/${PN}/db
+ doins *.dat || die "failed to install dat files"
+
+ insinto /var/lib/${PN}/db/i18n
+ doins i18n/*
+
+ doman ${PN}.8 || die "doman failed"
+ dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README || die "dodoc failed"
+
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}/${PN}-1.3.cron" ${PN} || \
+ die "failed to install cron script"
+
+ dobashcompletion "${FILESDIR}/${PN}.bash-completion"
+}
+
+pkg_postinst() {
+ elog "A cron script has been installed to /etc/cron.daily/rkhunter."
+ elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
+ elog "directions."
+ elog "If you want ${PN} to send mail, you will need to install"
+ elog "virtual/mailx or alter the EMAIL_CMD variable in the"
+ elog "cron script and possibly the MAIL_CMD variable in the"
+ elog "${PN}.conf file to use another mail client."
+ bash-completion_pkg_postinst
+}
diff --git a/app-forensics/rkhunter/rkhunter-1.3.8.ebuild b/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
index ed8436d34349..7a5ea11892c3 100644
--- a/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.8.ebuild,v 1.8 2012/01/11 20:40:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.8.ebuild,v 1.7 2011/10/08 18:58:52 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
IUSE=""
RDEPEND="
diff --git a/app-forensics/yasat/Manifest b/app-forensics/yasat/Manifest
index e76efa17b72a..b3783816e3c7 100644
--- a/app-forensics/yasat/Manifest
+++ b/app-forensics/yasat/Manifest
@@ -1,3 +1,2 @@
DIST yasat-400.tar.gz 89667 RMD160 c361ca444529b633ee567bff12883a22b6b057eb SHA1 539821ba26f7feac83da7187b334070434c21b08 SHA256 89d3b5b68f0c872e0817d77b01736279f606d31a64c2674af319c866b2d3e6b8
DIST yasat-421.tar.gz 112834 RMD160 e6efcbeccd7b610814dbf1a01bb605f4a15aa304 SHA1 75f8fcbe205c2e3a2ae970b5df67451f2770e14d SHA256 3db884855051c8ff1489c3a21dee65495e4dd298ae2e9dde9a8e09ab6bf3e166
-DIST yasat-456.tar.gz 116257 RMD160 4f108007370df58f52da5f17ca033ce7fe0a74bc SHA1 c49b6f31baf69a5f2a95e3dc76c02e371c3d1f55 SHA256 bc6c598693b9bbebd30d3d4dcf54d94b5e519af524296bffa7c6965f1f843c68
diff --git a/app-forensics/yasat/yasat-456.ebuild b/app-forensics/yasat/yasat-456.ebuild
deleted file mode 100644
index 2d1c2acaff28..000000000000
--- a/app-forensics/yasat/yasat-456.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-456.ebuild,v 1.1 2012/01/08 13:53:51 hwoarang Exp $
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://yasat.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
- dodoc README CHANGELOG || die
-}
diff --git a/app-i18n/atokx2/atokx2-17.0-r2.ebuild b/app-i18n/atokx2/atokx2-17.0-r2.ebuild
index 25b293fa8732..cd96e3b6d2d1 100644
--- a/app-i18n/atokx2/atokx2-17.0-r2.ebuild
+++ b/app-i18n/atokx2/atokx2-17.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0-r2.ebuild,v 1.9 2012/01/26 21:46:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0-r2.ebuild,v 1.8 2011/07/08 11:01:49 ssuominen Exp $
EAPI="1"
-inherit cdrom eutils
+inherit eutils
DESCRIPTION="ATOK for Linux - The most famous Japanese Input Method Engine"
HOMEPAGE="http://www.justsystem.co.jp/linux/atok.html"
@@ -17,6 +17,7 @@ LICENSE="ATOK MIT"
SLOT="0"
KEYWORDS="-* ~x86"
IUSE=""
+PROPERTIES="interactive"
RESTRICT="strip mirror"
DEPEND=">=x11-libs/gtk+-2.2:2
diff --git a/app-i18n/atokx2/atokx2-17.0.ebuild b/app-i18n/atokx2/atokx2-17.0.ebuild
index ec03df5fe123..eee722771564 100644
--- a/app-i18n/atokx2/atokx2-17.0.ebuild
+++ b/app-i18n/atokx2/atokx2-17.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.10 2012/01/26 21:46:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.9 2011/07/08 11:01:49 ssuominen Exp $
EAPI="1"
-inherit cdrom eutils
+inherit eutils
DESCRIPTION="ATOK for Linux - The most famous Japanese Input Method Engine"
HOMEPAGE="http://www.justsystem.co.jp/linux/atok.html"
@@ -16,6 +16,7 @@ LICENSE="ATOK MIT"
SLOT="0"
KEYWORDS="-* x86"
IUSE=""
+PROPERTIES="interactive"
RESTRICT="strip"
DEPEND=">=x11-libs/gtk+-2.2:2
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
index 059ed6324ac6..bf61b8b08b8e 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.2 2011/03/27 10:43:48 nirbheek Exp $
EAPI="1"
-inherit cdrom eutils multilib
+inherit eutils multilib
MY_UPDATE_P="${PN}up2"
MY_UPDATE_GTK="${PN}gtk216"
@@ -22,6 +22,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+PROPERTIES="interactive"
RESTRICT="strip mirror binchecks"
RDEPEND="!app-i18n/atokx2
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
index e524160d45e3..50c869326f9d 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.2 2011/03/27 10:43:48 nirbheek Exp $
EAPI="3"
-
-inherit cdrom eutils multilib
+inherit eutils multilib
MY_UPDATE_P="${PN}up2"
MY_UPDATE_GTK="${PN}gtk216"
@@ -22,6 +21,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+PROPERTIES="interactive"
RESTRICT="strip mirror binchecks"
RDEPEND="!app-i18n/atokx2
diff --git a/app-i18n/enca/enca-1.13-r2.ebuild b/app-i18n/enca/enca-1.13-r2.ebuild
index 324c6a11f1cb..45aab5b085f3 100644
--- a/app-i18n/enca/enca-1.13-r2.ebuild
+++ b/app-i18n/enca/enca-1.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r2.ebuild,v 1.6 2012/02/06 16:34:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r2.ebuild,v 1.1 2011/12/06 13:53:04 maksbotan Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc +recode"
DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild
index e437cc745207..f64bb49f5c4b 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild,v 1.2 2012/02/03 14:42:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild,v 1.1 2011/05/18 23:31:03 naota Exp $
EAPI=3
PYTHON_DEPEND="2:2.5"
@@ -12,7 +12,7 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="nls"
RDEPEND=">=app-i18n/ibus-1.2.0.20100111
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 6c103f2d852d..3177fec0ab3a 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,4 +1,2 @@
DIST ibus-hangul-1.2.0.20100102.tar.gz 424000 RMD160 3d8bd1ae193bd3c647aeadb5dbda21e5416070a3 SHA1 7483377b7a2108115e9eb3d2c39100971b47b1bb SHA256 4f146655cf75fa978e939708bb9c2a3329480ffd38b39ec738e33bd19b2944db
DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
-DIST ibus-hangul-1.3.2.tar.gz 435057 RMD160 3b27f4f5cc3ea8496513a9d4bd932ebd6e20b9d2 SHA1 c1f5dd0e0f7755457afcaae738d63ebf4514cf54 SHA256 0f6793c61d64461badadb042f0cea184ae69348d8bbfefe976f1e4a63a37a5a3
-DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild
new file mode 100644
index 000000000000..c525daed3dfe
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild,v 1.2 2011/05/25 00:04:59 matsuu Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+inherit python
+
+DESCRIPTION="The Hangul engine for IBus input platform"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/ibus-1.2.99
+ !>=app-i18n/ibus-1.3.99
+ >=app-i18n/libhangul-0.0.12
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ nls? ( >=sys-devel/gettext-0.17 )"
+
+src_prepare() {
+ mv py-compile py-compile.orig || die
+ ln -s "$(type -P true)" py-compile || die
+}
+
+src_configure() {
+ econf $(use_enable nls) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.3.2.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.3.2.ebuild
deleted file mode 100644
index 6d74f399ec59..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.2.ebuild,v 1.1 2012/01/21 03:06:54 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2.99
- dev-python/pygobject
- dev-python/pygtk
- >=app-i18n/libhangul-0.1
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( >=sys-devel/gettext-0.17 )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # http://pkgs.fedoraproject.org/gitweb/?p=ibus-hangul.git
- epatch "${FILESDIR}/${PN}-ibus-1.4.patch" || die
- mv py-compile py-compile.orig || die
- ln -s "$(type -P true)" py-compile || die
- sed -i -e "s:python:$(PYTHON -2):" setup/ibus-setup-hangul.in || die
-}
-
-src_configure() {
- econf $(use_enable nls) || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
deleted file mode 100644
index 1e32cfde7bfd..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild,v 1.1 2012/01/21 03:06:54 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.3.99
- dev-python/pygobject
- dev-python/pygtk
- >=app-i18n/libhangul-0.1
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( >=sys-devel/gettext-0.17 )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- mv py-compile py-compile.orig || die
- ln -s "$(type -P true)" py-compile || die
- sed -i -e "s:python:$(PYTHON -2):" setup/ibus-setup-hangul.in || die
-}
-
-src_configure() {
- econf $(use_enable nls) || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-mozc/Manifest b/app-i18n/ibus-mozc/Manifest
index 6b37c431873f..a5765a132494 100644
--- a/app-i18n/ibus-mozc/Manifest
+++ b/app-i18n/ibus-mozc/Manifest
@@ -2,5 +2,3 @@ DIST mozc-1.0.558.102.tar.bz2 41540430 RMD160 46d00bdac42cfa56e4a1eebc79653a7bf5
DIST mozc-1.1.773.102.tar.bz2 36818453 RMD160 9e8b24bbb551e3f3c252605f584af73dca774291 SHA1 8552b89d428571b034f757161a08995d725fc4aa SHA256 24f9f05111ac40a7f121bc3c460429c54a7308cd65a7536a69c41cfc6c6c7850
DIST mozc-1.2.855.102.tar.bz2 40681117 RMD160 fb15df25a56be174c0bc18acad1dd3bd8d1a5bf1 SHA1 c078e9cbc00d3c216aa0d739ae4f4405a2259e94 SHA256 d9d0a0e7fe00ad28a4e99776616157bae05b3d3cea327eac41e8f6a020a28227
DIST mozc-1.3.911.102.tar.bz2 39180652 RMD160 4cb286286107ee9ce4f3d6e37b0dad8742a8808b SHA1 d3b130001cebf560d2ce10e89eb55643fa056d93 SHA256 da27945d6732e4fc70c08534cc8d10cd23d6fba5ebc52e6b31cac5d04ba1588a
-DIST mozc-1.3.931.102.tar.bz2 55891776 RMD160 762263c0c49ae849d22ca06f0ff659e694aeb844 SHA1 41f349b9b4ea87dda19d42653d5f4b584da16c37 SHA256 f56a899e1e445e01d0f28fec45a7b3cc3dd9c68e0d6507bca00a8c01ef68c7a0
-DIST mozc-1.3.975.102.tar.bz2 55961505 RMD160 b52eddc64a79a7a9f1579648f3ee878837355971 SHA1 ef3f23083152fa564eba98235e83d72d14a06404 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild
deleted file mode 100644
index d325c6a248b9..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild,v 1.1 2011/12/23 04:03:47 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#IUSE="emacs +ibus scim skk +qt4"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/protobuf
- net-misc/curl
- sys-libs/zlib
- emacs? ( virtual/emacs )
- ibus? ( >=app-i18n/ibus-1.2 )
- scim? ( app-i18n/scim )
- qt4? (
- x11-libs/qt-gui:4
- app-i18n/zinnia
- )"
-# chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
- dev-cpp/gtest
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
- epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
-}
-
-src_configure() {
- local myconf="--channel_dev=0"
- #use chewing && myconf="${myconf} --chewing"
- if ! use qt4 ; then
- myconf="${myconf} --noqt"
- export GYP_DEFINES="use_libzinnia=0"
- fi
- "$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
- tc-export CC CXX AR AS RANLIB LD
-
- local mytarget="server/server.gyp:mozc_server"
- use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
- use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
- use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
- #use skk && mytarget="${mytarget} chrome/skk/skk.gyp:skk"
- if use qt4 ; then
- export QTDIR="${EPREFIX}/usr"
- mytarget="${mytarget} gui/gui.gyp:mozc_tool"
- fi
-
- "$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
- "$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
- if use emacs ; then
- elisp-compile unix/emacs/*.el || die
- fi
-}
-
-src_test() {
- "$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
- if use emacs ; then
- dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
- elisp-install ${PN} unix/emacs/*.{el,elc} || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
- fi
-
- if use ibus ; then
- exeinto /usr/libexec || die
- newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
- insinto /usr/share/ibus/component || die
- doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
- insinto /usr/share/ibus-mozc || die
- (
- cd data/images/unix
- newins ime_product_icon_opensource-32.png product_icon.png || die
- for f in ui-*
- do
- newins ${f} ${f/ui-} || die
- done
- )
-
- fi
-
- if use scim ; then
- exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
- newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
- exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
- newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
- insinto "$(pkg-config --variable=icondir scim)" || die
- (
- cd data/images/unix
- newins ime_product_icon_opensource-32.png scim-mozc.png || die
- for f in ui-*
- do
- newins ${f} ${f/ui-/scim-mozc-} || die
- done
- )
- fi
-
- exeinto "/usr/$(get_libdir)/mozc" || die
- doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
- if use qt4 ; then
- exeinto "/usr/$(get_libdir)/mozc" || die
- doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
- fi
-}
diff --git a/app-i18n/ibus-mozc/ibus-mozc-1.3.975.102.ebuild b/app-i18n/ibus-mozc/ibus-mozc-1.3.975.102.ebuild
deleted file mode 100644
index 17a318296d94..000000000000
--- a/app-i18n/ibus-mozc/ibus-mozc-1.3.975.102.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.3.975.102.ebuild,v 1.1 2012/01/28 02:51:26 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-MY_P="${P/ibus-}"
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#IUSE="emacs +ibus scim skk +qt4"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/protobuf
- net-misc/curl
- sys-libs/zlib
- emacs? ( virtual/emacs )
- ibus? ( >=app-i18n/ibus-1.2 )
- scim? ( app-i18n/scim )
- qt4? (
- x11-libs/qt-gui:4
- app-i18n/zinnia
- )"
-# chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
- dev-cpp/gtest
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
- epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
-}
-
-src_configure() {
- local myconf="--channel_dev=0"
- #use chewing && myconf="${myconf} --chewing"
- if ! use qt4 ; then
- myconf="${myconf} --noqt"
- export GYP_DEFINES="use_libzinnia=0"
- fi
- "$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
- tc-export CC CXX AR AS RANLIB LD
-
- local mytarget="server/server.gyp:mozc_server"
- use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
- use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
- use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
- #use skk && mytarget="${mytarget} chrome/skk/skk.gyp:skk"
- if use qt4 ; then
- export QTDIR="${EPREFIX}/usr"
- mytarget="${mytarget} gui/gui.gyp:mozc_tool"
- fi
-
- "$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
- "$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
- if use emacs ; then
- elisp-compile unix/emacs/*.el || die
- fi
-}
-
-src_test() {
- "$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
- if use emacs ; then
- dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
- elisp-install ${PN} unix/emacs/*.{el,elc} || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
- fi
-
- if use ibus ; then
- exeinto /usr/libexec || die
- newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
- insinto /usr/share/ibus/component || die
- doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
- insinto /usr/share/ibus-mozc || die
- (
- cd data/images/unix
- newins ime_product_icon_opensource-32.png product_icon.png || die
- for f in ui-*
- do
- newins ${f} ${f/ui-} || die
- done
- )
-
- fi
-
- if use scim ; then
- exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
- newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
- exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
- newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
- insinto "$(pkg-config --variable=icondir scim)" || die
- (
- cd data/images/unix
- newins ime_product_icon_opensource-32.png scim-mozc.png || die
- for f in ui-*
- do
- newins ${f} ${f/ui-/scim-mozc-} || die
- done
- )
- fi
-
- exeinto "/usr/$(get_libdir)/mozc" || die
- doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
- if use qt4 ; then
- exeinto "/usr/$(get_libdir)/mozc" || die
- doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
- fi
-}
-
-pkg_postinst() {
- if use emacs ; then
- elisp-site-regen
- elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
- elog "Write the following settings into your init file (~/.emacs.d/init.el"
- elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
- elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
- elog "mozc.el"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "Having the above settings, just type C-\\ which is bound to"
- elog "\`toggle-input-method' by default."
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index 1152de92e5f6..27e4468b0799 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.2 2012/02/03 14:45:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.1 2011/05/12 16:17:35 matsuu Exp $
EAPI="2"
inherit cmake-utils eutils multilib
@@ -12,7 +12,7 @@ SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND=">=app-i18n/ibus-1.3.7
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 65e6703f476a..df7edc916935 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,4 @@
DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
+DIST ibus-1.3.99.20110817.tar.gz 1470606 RMD160 3b56578153ffd27080d6f2a136823ef00e1c00bf SHA1 c2b941b17deba1b2ff43b6e4c68ea1854b2b09ac SHA256 5bb66690da0c675bee340388ef26c6ac9558d8480d2b65be0e280cd024a95b32
DIST ibus-1.4.0.tar.gz 1452055 RMD160 0583a9690ee5a7bb44ce1cebc189c3a644501ca3 SHA1 c46ea0be728ffd4e431d4a18c6bd1e51ceaf045e SHA256 9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f
-DIST ibus-1.4.1.tar.gz 1479412 RMD160 4003fc9392c59ce35048689aa50a941cfd151cff SHA1 4cc045553885d35a118ec4b44c2694910209509e SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
diff --git a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch b/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
deleted file mode 100644
index 6932e4cda02e..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4
-
-http://bugs.gentoo.org/390463
-
---- src/ibusshare.c
-+++ src/ibusshare.c
-@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
-
- if (machine_id == NULL) {
- GError *error = NULL;
-- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+ if (!g_file_get_contents ("/etc/machine-id",
-+ &machine_id,
-+ NULL,
-+ NULL) &&
-+ !g_file_get_contents ("/var/lib/dbus/machine-id",
- &machine_id,
- NULL,
- &error)) {
diff --git a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
deleted file mode 100644
index bdc1f206a2d0..000000000000
--- a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
---- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900
-+++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900
-@@ -259,23 +259,8 @@
- )
- AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
-
--if test x"$enable_gconf" = x"yes"; then
-- # check gconf
-- PKG_CHECK_MODULES(GCONF,
-- [gconf-2.0 >= 2.12],
-- )
--
-- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-- if test x"$GCONFTOOL" = xno; then
-- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-- fi
--
-- AM_GCONF_SOURCE_2
-- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
--else
-- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-- enable_gconf="no (disabled, use --enable-gconf to enable)"
--fi
-+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-+enable_gconf="no (disabled, use --enable-gconf to enable)"
-
- # --enable-memconf option.
- AC_ARG_ENABLE(memconf,
diff --git a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
index 747d026205a3..46614a011a36 100644
--- a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.13 2012/02/05 01:38:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.12 2011/11/22 23:27:59 naota Exp $
EAPI="3"
-inherit confutils eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils python
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/"
diff --git a/app-i18n/ibus/ibus-1.3.9.ebuild b/app-i18n/ibus/ibus-1.3.9.ebuild
index 0f387f186e57..c0b422785c8c 100644
--- a/app-i18n/ibus/ibus-1.3.9.ebuild
+++ b/app-i18n/ibus/ibus-1.3.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.14 2012/02/05 01:38:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.13 2011/11/22 23:27:59 naota Exp $
EAPI="3"
PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils python
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/"
diff --git a/app-i18n/ibus/ibus-1.3.99.20110817.ebuild b/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
new file mode 100644
index 000000000000..5f4db5134f73
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110817.ebuild,v 1.3 2011/11/22 23:27:59 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+inherit confutils eutils gnome2-utils multilib python
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+ gconf? ( >=gnome-base/gconf-2.12:2 )
+ gnome-base/librsvg:2
+ sys-apps/dbus
+ app-text/iso-codes
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ X? (
+ sys-apps/dbus[X]
+ x11-libs/libX11
+ x11-libs/gtk+:2
+ )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+ python? (
+ dev-python/notify-python
+ >=dev-python/dbus-python-0.83
+ )
+ nls? ( virtual/libintl )"
+# X? ( x11-libs/libX11 )
+# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+# vala? ( dev-lang/vala )
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5.8.1
+ dev-perl/XML-Parser
+ dev-util/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.9 )
+ nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-python/pygtk
+ dev-python/pyxdg
+ )"
+
+RESTRICT="test"
+
+update_gtk_immodules() {
+ local GTK2_CONFDIR="/etc/gtk-2.0"
+ # bug #366889
+ if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+ GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+ fi
+ mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ fi
+}
+
+update_gtk3_immodules() {
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+ fi
+}
+
+pkg_setup() {
+ # bug #342903
+ confutils_require_any X gtk gtk3
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ mv py-compile py-compile.orig || die
+ ln -s "$(type -P true)" py-compile || die
+ echo "ibus/_config.py" >> po/POTFILES.skip || die
+ sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc gtk-doc) \
+ $(use_enable doc gtk-doc-html) \
+ $(use_enable introspection) \
+ $(use_enable gconf) \
+ $(use_enable gtk gtk2) \
+ $(use_enable gtk xim) \
+ $(use_enable gtk3) \
+ $(use_enable nls) \
+ $(use_enable python) \
+ $(use_enable vala) \
+ $(use_enable X xim) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ insinto /etc/X11/xinit/xinput.d
+ newins xinput-ibus ibus.conf || die
+
+ # bug 289547
+ keepdir /usr/share/ibus/{engine,icons} || die
+
+ dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_preinst() {
+ use gconf && gnome2_gconf_savelist
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use gconf && gnome2_gconf_install
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ use python && python_mod_optimize /usr/share/${PN}
+ gnome2_icon_cache_update
+
+ elog "To use ibus, you should:"
+ elog "1. Get input engines from sunrise overlay."
+ elog " Run \"emerge -s ibus-\" in your favorite terminal"
+ elog " for a list of packages we already have."
+ elog
+ elog "2. Setup ibus:"
+ elog
+ elog " $ ibus-setup"
+ elog
+ elog "3. Set the following in your user startup scripts"
+ elog " such as .xinitrc, .xsession or .xprofile:"
+ elog
+ elog " export XMODIFIERS=\"@im=ibus\""
+ elog " export GTK_IM_MODULE=\"ibus\""
+ elog " export QT_IM_MODULE=\"xim\""
+ elog " ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ use python && python_mod_cleanup /usr/share/${PN}
+ gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus/ibus-1.4.0-r1.ebuild b/app-i18n/ibus/ibus-1.4.0-r1.ebuild
deleted file mode 100644
index 2c51b4ca9c7e..000000000000
--- a/app-i18n/ibus/ibus-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0-r1.ebuild,v 1.2 2012/01/03 15:18:37 ssuominen Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python autotools
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
-
-RDEPEND=">=dev-libs/glib-2.26:2
- dconf? ( >=gnome-base/dconf-0.7.5 )
- gconf? ( >=gnome-base/gconf-2.12:2 )
- gnome-base/librsvg:2
- sys-apps/dbus[X?]
- app-text/iso-codes
- gtk? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- X? (
- x11-libs/libX11
- x11-libs/gtk+:2
- )
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
- python? (
- dev-python/notify-python
- >=dev-python/dbus-python-0.83
- )
- nls? ( virtual/libintl )"
-# X? ( x11-libs/libX11 )
-# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
-# vala? ( dev-lang/vala )
-DEPEND="${RDEPEND}
- >=dev-lang/perl-5.8.1
- dev-perl/XML-Parser
- dev-util/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.9 )
- nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
- python? (
- dev-python/pygtk
- dev-python/pyxdg
- )"
-
-RESTRICT="test"
-
-update_gtk_immodules() {
- local GTK2_CONFDIR="/etc/gtk-2.0"
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
- fi
- mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-update_gtk3_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
-pkg_setup() {
- # bug #342903
- confutils_require_any X gtk gtk3
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- >py-compile #397497
- echo "ibus/_config.py" >> po/POTFILES.skip || die
- sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
-
- epatch \
- "${FILESDIR}"/${P}-doc-typo.patch \
- "${FILESDIR}"/${P}-machine-id-fallback.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable dconf) \
- $(use_enable doc gtk-doc) \
- $(use_enable doc gtk-doc-html) \
- $(use_enable introspection) \
- $(use_enable gconf) \
- $(use_enable gtk gtk2) \
- $(use_enable gtk xim) \
- $(use_enable gtk3) \
- $(use_enable nls) \
- $(use_enable python) \
- $(use_enable vala) \
- $(use_enable X xim) || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- find "${ED}" -name '*.la' -type f -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- newins xinput-ibus ibus.conf || die
-
- # bug 289547
- keepdir /usr/share/ibus/{engine,icons} || die
-
- dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_preinst() {
- use gconf && gnome2_gconf_savelist
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gconf && gnome2_gconf_install
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use python && python_mod_optimize /usr/share/${PN}
- gnome2_icon_cache_update
-
- elog "To use ibus, you should:"
- elog "1. Get input engines from sunrise overlay."
- elog " Run \"emerge -s ibus-\" in your favorite terminal"
- elog " for a list of packages we already have."
- elog
- elog "2. Setup ibus:"
- elog
- elog " $ ibus-setup"
- elog
- elog "3. Set the following in your user startup scripts"
- elog " such as .xinitrc, .xsession or .xprofile:"
- elog
- elog " export XMODIFIERS=\"@im=ibus\""
- elog " export GTK_IM_MODULE=\"ibus\""
- elog " export QT_IM_MODULE=\"xim\""
- elog " ibus-daemon -d -x"
-}
-
-pkg_postrm() {
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use python && python_mod_cleanup /usr/share/${PN}
- gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.4.0.ebuild b/app-i18n/ibus/ibus-1.4.0.ebuild
new file mode 100644
index 000000000000..03dd9547518a
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.4.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0.ebuild,v 1.3 2011/11/22 23:27:59 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+inherit confutils eutils gnome2-utils multilib python autotools
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+ dconf? ( >=gnome-base/dconf-0.7.5 )
+ gconf? ( >=gnome-base/gconf-2.12:2 )
+ gnome-base/librsvg:2
+ sys-apps/dbus[X?]
+ app-text/iso-codes
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ X? (
+ x11-libs/libX11
+ x11-libs/gtk+:2
+ )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+ python? (
+ dev-python/notify-python
+ >=dev-python/dbus-python-0.83
+ )
+ nls? ( virtual/libintl )"
+# X? ( x11-libs/libX11 )
+# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+# vala? ( dev-lang/vala )
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5.8.1
+ dev-perl/XML-Parser
+ dev-util/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.9 )
+ nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+ python? (
+ dev-python/pygtk
+ dev-python/pyxdg
+ )"
+
+RESTRICT="test"
+
+update_gtk_immodules() {
+ local GTK2_CONFDIR="/etc/gtk-2.0"
+ # bug #366889
+ if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+ GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+ fi
+ mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ fi
+}
+
+update_gtk3_immodules() {
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+ fi
+}
+
+pkg_setup() {
+ # bug #342903
+ confutils_require_any X gtk gtk3
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ mv py-compile py-compile.orig || die
+ ln -s "$(type -P true)" py-compile || die
+ echo "ibus/_config.py" >> po/POTFILES.skip || die
+ sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+
+ epatch "${FILESDIR}"/${P}-doc-typo.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable dconf) \
+ $(use_enable doc gtk-doc) \
+ $(use_enable doc gtk-doc-html) \
+ $(use_enable introspection) \
+ $(use_enable gconf) \
+ $(use_enable gtk gtk2) \
+ $(use_enable gtk xim) \
+ $(use_enable gtk3) \
+ $(use_enable nls) \
+ $(use_enable python) \
+ $(use_enable vala) \
+ $(use_enable X xim) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ insinto /etc/X11/xinit/xinput.d
+ newins xinput-ibus ibus.conf || die
+
+ # bug 289547
+ keepdir /usr/share/ibus/{engine,icons} || die
+
+ dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_preinst() {
+ use gconf && gnome2_gconf_savelist
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use gconf && gnome2_gconf_install
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ use python && python_mod_optimize /usr/share/${PN}
+ gnome2_icon_cache_update
+
+ elog "To use ibus, you should:"
+ elog "1. Get input engines from sunrise overlay."
+ elog " Run \"emerge -s ibus-\" in your favorite terminal"
+ elog " for a list of packages we already have."
+ elog
+ elog "2. Setup ibus:"
+ elog
+ elog " $ ibus-setup"
+ elog
+ elog "3. Set the following in your user startup scripts"
+ elog " such as .xinitrc, .xsession or .xprofile:"
+ elog
+ elog " export XMODIFIERS=\"@im=ibus\""
+ elog " export GTK_IM_MODULE=\"ibus\""
+ elog " export QT_IM_MODULE=\"xim\""
+ elog " ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ use python && python_mod_cleanup /usr/share/${PN}
+ gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
deleted file mode 100644
index 5d4ba8d96191..000000000000
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.1 2012/02/05 16:33:16 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.5"
-inherit confutils eutils gnome2-utils multilib python autotools
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
-
-RDEPEND=">=dev-libs/glib-2.26:2
- dconf? ( >=gnome-base/dconf-0.7.5 )
- gconf? ( >=gnome-base/gconf-2.12:2 )
- gnome-base/librsvg:2
- sys-apps/dbus[X?]
- app-text/iso-codes
- gtk? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- X? (
- x11-libs/libX11
- x11-libs/gtk+:2
- )
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
- python? (
- dev-python/notify-python
- >=dev-python/dbus-python-0.83
- )
- nls? ( virtual/libintl )"
-# X? ( x11-libs/libX11 )
-# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
-# vala? ( dev-lang/vala )
-DEPEND="${RDEPEND}
- >=dev-lang/perl-5.8.1
- dev-perl/XML-Parser
- dev-util/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.9 )
- nls? ( >=sys-devel/gettext-0.16.1 )"
-RDEPEND="${RDEPEND}
- python? (
- dev-python/pygtk
- dev-python/pyxdg
- )"
-
-RESTRICT="test"
-
-update_gtk_immodules() {
- local GTK2_CONFDIR="/etc/gtk-2.0"
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
- fi
- mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-update_gtk3_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
-pkg_setup() {
- # bug #342903
- confutils_require_any X gtk gtk3
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- >py-compile #397497
- echo "ibus/_config.py" >> po/POTFILES.skip || die
-
- epatch \
- "${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch
- use gconf || epatch "${FILESDIR}/${P}-no-gconf.patch"
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable dconf) \
- $(use_enable doc gtk-doc) \
- $(use_enable doc gtk-doc-html) \
- $(use_enable introspection) \
- $(use_enable gconf) \
- $(use_enable gtk gtk2) \
- $(use_enable gtk xim) \
- $(use_enable gtk3) \
- $(use_enable nls) \
- $(use_enable python) \
- $(use_enable vala) \
- $(use_enable X xim) \
- PYTHON="$(PYTHON)" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- find "${ED}" -name '*.la' -type f -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- newins xinput-ibus ibus.conf || die
-
- # bug 289547
- keepdir /usr/share/ibus/{engine,icons} || die
-
- dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_preinst() {
- use gconf && gnome2_gconf_savelist
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gconf && gnome2_gconf_install
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use python && python_mod_optimize /usr/share/${PN}
- gnome2_icon_cache_update
-
- elog "To use ibus, you should:"
- elog "1. Get input engines from sunrise overlay."
- elog " Run \"emerge -s ibus-\" in your favorite terminal"
- elog " for a list of packages we already have."
- elog
- elog "2. Setup ibus:"
- elog
- elog " $ ibus-setup"
- elog
- elog "3. Set the following in your user startup scripts"
- elog " such as .xinitrc, .xsession or .xprofile:"
- elog
- elog " export XMODIFIERS=\"@im=ibus\""
- elog " export GTK_IM_MODULE=\"ibus\""
- elog " export QT_IM_MODULE=\"xim\""
- elog " ibus-daemon -d -x"
-}
-
-pkg_postrm() {
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use python && python_mod_cleanup /usr/share/${PN}
- gnome2_icon_cache_update
-}
diff --git a/app-i18n/im-chooser/im-chooser-1.5.2.ebuild b/app-i18n/im-chooser/im-chooser-1.5.2.ebuild
index c86fa1bd6732..87de1f0efe37 100644
--- a/app-i18n/im-chooser/im-chooser-1.5.2.ebuild
+++ b/app-i18n/im-chooser/im-chooser-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-chooser/im-chooser-1.5.2.ebuild,v 1.2 2011/12/18 10:05:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-chooser/im-chooser-1.5.2.ebuild,v 1.1 2011/11/28 08:10:06 naota Exp $
EAPI=3
inherit gnome2 eutils
@@ -34,8 +34,3 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig"
DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.5.1-imchooserui.patch
- gnome2-src_prepare
-}
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
index e712c86b1529..164c91298fc7 100644
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild,v 1.6 2011/12/18 05:29:48 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-freewnn/im-freewnn-0.0.2-r1.ebuild,v 1.5 2011/12/14 16:36:55 ago Exp $
EAPI="1"
@@ -15,9 +15,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
-RDEPEND="dev-libs/glib
- x11-libs/pango
- >=x11-libs/gtk+-2.4:2
+RDEPEND=">=x11-libs/gtk+-2.4:2
>=app-i18n/freewnn-1.1.1_alpha21-r1"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index e1bb281ea7ef..3d17c3d10635 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -1,6 +1,4 @@
DIST imhangul-0.9.12.tar.bz2 364154 RMD160 bf549c6157a474c2f1f20055de5aa8274d811cac SHA1 45fef722435bc53294f2a8f7d56ddf4d654ff2de SHA256 e51854c78c9be45e6be7f758a18d4dec9f52e1a2cbb671734d8947537bad05d0
DIST imhangul-0.9.16.tar.bz2 253102 RMD160 8dc127982defc3aa9db087965ccbad7fd4b8d53b SHA1 989113f64252eb990003e3f6e64ca66472586484 SHA256 fb36064cfdec3d3a36a4d9a08ccdcd9d2dbb5b999a6ff6688527139addc8add3
DIST imhangul-2.0.0.tar.bz2 255591 RMD160 196d05c164d446d65be11ba99263eaf25e2fbafc SHA1 0e12088f6eae4703b22be88251e3dc6546d8fb11 SHA256 504b3cce9dc269bc94a14c6e725b86620cb135e6d43f8b945d799162f50bbb43
-DIST imhangul-2.1.0.tar.bz2 268205 RMD160 9ee441730b52dc5857bfcb28c95696414fc86cab SHA1 199d73c24fe1e4365089031a0bd06f049c167b2d SHA256 08c6deb97eda7c96e8180528f3b2aeee3e367757c643e2c48dde7d7b5ac77dc9
DIST imhangul-3.0.0.tar.bz2 265064 RMD160 8925d9c2e90b2289b2c505f0cd713025ceec5062 SHA1 d1e4452284b52b56fd553a855e2aa7a9ee5d09fe SHA256 fbc6fbdd33781eeac873c677cb30da7163f0f8e8277bad386a93267c34b50eef
-DIST imhangul-3.1.0.tar.bz2 267943 RMD160 d14a1eebcfecfa8e1c0070094f0bf5e394c2f889 SHA1 8faff9153cb3cf69e1c2188f7d7b5411077b52b2 SHA256 69cd696a56321dd6cf7dc32d4bc7959a5853aee6ee61e4c4b26521473e84dad3
diff --git a/app-i18n/imhangul/imhangul-2.0.0.ebuild b/app-i18n/imhangul/imhangul-2.0.0.ebuild
index 548c513737d0..351bb4547c77 100644
--- a/app-i18n/imhangul/imhangul-2.0.0.ebuild
+++ b/app-i18n/imhangul/imhangul-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-2.0.0.ebuild,v 1.5 2011/12/22 22:03:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-2.0.0.ebuild,v 1.4 2011/12/14 16:34:59 ago Exp $
EAPI="3"
inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://kldp.net/frs/download.php/5924/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND=">=app-i18n/libhangul-0.0.12
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
deleted file mode 100644
index ddb6501f3ea6..000000000000
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-2.1.0.ebuild,v 1.1 2012/01/11 15:23:33 matsuu Exp $
-
-EAPI="3"
-inherit multilib
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="http://code.google.com/p/imhangul/"
-SRC_URI="http://imhangul.googlecode.com/files/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/libhangul-0.0.12
- >=x11-libs/gtk+-2.2:2
- virtual/libintl"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- sys-devel/gettext"
-
-get_gtk_confdir() {
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}"
- else
- GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}"
- fi
- echo ${GTK2_CONFDIR}
-}
-
-update_gtk_immodules() {
- local GTK2_CONFDIR=$(get_gtk_confdir)
-
- mkdir -p "${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-src_prepare() {
- # Drop DEPRECATED flags, bug #387825
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
-}
-
-src_configure() {
- econf \
- --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
- --with-gtk-im-module-file="$(get_gtk_confdir)" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- find "${ED}" -name "*.la" -type f -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
- newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
- newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
- newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
- newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
- newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
- newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
- newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
- newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
-
- dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
-}
-
-pkg_postinst() {
- update_gtk_immodules
-
- elog ""
- elog "If you want to use one of the module as a default input method, "
- elog ""
- elog "export GTK_IM_MODULE=hangul2 # 2 input type"
- elog "export GTK_IM_MODULE=hangul3f # 3 input type"
- elog ""
-}
-
-pkg_postrm() {
- update_gtk_immodules
-}
diff --git a/app-i18n/imhangul/imhangul-3.1.0.ebuild b/app-i18n/imhangul/imhangul-3.1.0.ebuild
deleted file mode 100644
index 020d01447642..000000000000
--- a/app-i18n/imhangul/imhangul-3.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-3.1.0.ebuild,v 1.1 2012/01/11 15:23:33 matsuu Exp $
-
-EAPI="3"
-inherit multilib
-
-DESCRIPTION="Gtk+-3.0 Hangul Input Modules"
-HOMEPAGE="http://code.google.com/p/imhangul/"
-SRC_URI="http://imhangul.googlecode.com/files/${P}.tar.bz2"
-
-SLOT="3"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/libhangul-0.0.12
- x11-libs/gtk+:3
- virtual/libintl"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- sys-devel/gettext"
-
-update_gtk_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
-src_prepare() {
- # Drop DEPRECATED flags, bug #387825
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
-}
-
-src_configure() {
- econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- find "${ED}" -name "*.la" -type f -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
- newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
- newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
- newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
- newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
- newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
- newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
- newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
- newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
-
- dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
-}
-
-pkg_postinst() {
- update_gtk_immodules
-
- elog ""
- elog "If you want to use one of the module as a default input method, "
- elog ""
- elog "export GTK_IM_MODULE=hangul2 # 2 input type"
- elog "export GTK_IM_MODULE=hangul3f # 3 input type"
- elog ""
-}
-
-pkg_postrm() {
- update_gtk_immodules
-}
diff --git a/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild
index 26aa8c735681..af2efb72d21e 100644
--- a/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild,v 1.5 2011/12/18 20:12:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kakasi/kakasi-2.3.4-r1.ebuild,v 1.3 2011/10/22 08:54:33 naota Exp $
inherit toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="http://kakasi.namazu.org/stable/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
src_compile() {
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
deleted file mode 100644
index 16de07ca4f7e..000000000000
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ /dev/null
@@ -1,5 +0,0 @@
-XIM=kinput2
-XIM_PROGRAM=@EPREFIX@/usr/bin/kinput2
-XIM_ARGS="-@SERVER@ +kinput -xim"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
deleted file mode 100644
index dc47a8902d91..000000000000
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ /dev/null
@@ -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/app-i18n/kinput2/kinput2-3.1-r2.ebuild,v 1.1 2012/01/22 11:14:22 matsuu Exp $
-
-EAPI="3"
-inherit eutils
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna/"
-SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="freewnn"
-
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt"
-
-DEPEND="${RDEPEND}
- x11-misc/gccmakedep
- x11-misc/imake
- app-text/rman"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-r1-gentoo.diff"
-
- if use freewnn; then
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die
- else
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf || die
- fi
-}
-
-src_configure() {
- xmkmf -a || die
-}
-
-src_compile() {
- emake \
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults/" \
- CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- || die
-}
-
-src_install() {
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
- rm -rf "${ED}/usr/lib/X11" || die
-
- local server
- if use freewnn; then
- server="wnn"
- else
- server="canna"
- fi
-
- insinto /etc/X11/xinit/xinput.d
- sed \
- -e "s:@EPREFIX@:${EPREFIX}:g" \
- -e "s:@SERVER@:${server}:g" \
- "${FILESDIR}/xinput-kinput2" > "${T}/kinput2.conf" || die
- doins "${T}/kinput2.conf" || die
-
- dodoc README NEWS doc/* || die
- newman cmd/${PN}.man ${PN}.1 || die
-}
diff --git a/app-i18n/libguess/libguess-1.0.ebuild b/app-i18n/libguess/libguess-1.0.ebuild
index b6a8cee9700f..4857a1505f0b 100644
--- a/app-i18n/libguess/libguess-1.0.ebuild
+++ b/app-i18n/libguess/libguess-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libguess/libguess-1.0.ebuild,v 1.12 2012/02/03 01:32:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libguess/libguess-1.0.ebuild,v 1.10 2011/10/11 16:56:14 jer Exp $
EAPI=2
@@ -10,11 +10,11 @@ SRC_URI="http://distfiles.atheme.org/${P}.tbz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
- >=dev-libs/libmowgli-0.7.0:0"
+ >=dev-libs/libmowgli-0.7.0"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9.0"
diff --git a/app-i18n/libguess/libguess-1.1.ebuild b/app-i18n/libguess/libguess-1.1.ebuild
index 8ee2ad062e2c..ffa86a078dc7 100644
--- a/app-i18n/libguess/libguess-1.1.ebuild
+++ b/app-i18n/libguess/libguess-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libguess/libguess-1.1.ebuild,v 1.2 2012/02/03 01:32:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libguess/libguess-1.1.ebuild,v 1.1 2011/12/01 13:51:22 chainsaw Exp $
EAPI=2
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x8
IUSE="examples"
RDEPEND="
- >=dev-libs/libmowgli-0.7.0:0"
+ >=dev-libs/libmowgli-0.7.0"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9.0"
diff --git a/app-i18n/libguess/metadata.xml b/app-i18n/libguess/metadata.xml
index 1baa46d82420..7803cdb58252 100644
--- a/app-i18n/libguess/metadata.xml
+++ b/app-i18n/libguess/metadata.xml
@@ -2,7 +2,7 @@
- jdhore@gentoo.org
- Jeff Horelick
+ chainsaw@gentoo.org
+ Tony Vroon
diff --git a/app-i18n/libhangul/libhangul-0.0.12.ebuild b/app-i18n/libhangul/libhangul-0.0.12.ebuild
index d5d77d9190e0..bb3c193990a6 100644
--- a/app-i18n/libhangul/libhangul-0.0.12.ebuild
+++ b/app-i18n/libhangul/libhangul-0.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.12.ebuild,v 1.5 2012/02/01 17:12:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.12.ebuild,v 1.4 2011/10/01 03:20:09 phajdan.jr Exp $
EAPI="3"
@@ -10,7 +10,7 @@ SRC_URI="http://kldp.net/frs/download.php/5855/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="nls static-libs test"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
deleted file mode 100644
index a5e9efc418a9..000000000000
--- a/app-i18n/libskk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libskk-0.0.9.tar.gz 719373 RMD160 8f5a2bd150dfffe4ba8e639df6c00f72f8657db5 SHA1 46c3c88e4996eaef003543cdaf29abf21ecbabdc SHA256 1c691c658d160229928a72ef102731f8ab44a135fab7e4bdf2d17f264b359333
diff --git a/app-i18n/libskk/libskk-0.0.9.ebuild b/app-i18n/libskk/libskk-0.0.9.ebuild
deleted file mode 100644
index 8c921829164e..000000000000
--- a/app-i18n/libskk/libskk-0.0.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libskk/libskk-0.0.9.ebuild,v 1.1 2012/01/28 02:58:45 matsuu Exp $
-
-EAPI=4
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls static-libs"
-
-RDEPEND="dev-libs/glib
- dev-libs/libgee:0
- dev-libs/json-glib
- >=dev-libs/gobject-introspection-0.9
- dev-lang/vala:0.12
- nls? ( virtual/libintl )"
-# >=dev-util/valadoc-0.3.1
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete
- fi
-
- doman docs/skk.1
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml
deleted file mode 100644
index 2d5852c16c60..000000000000
--- a/app-i18n/libskk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-cjk
-
diff --git a/app-i18n/man-pages-de/man-pages-de-0.8.ebuild b/app-i18n/man-pages-de/man-pages-de-0.8.ebuild
index 40ae91edea7a..0ce78a3424fd 100644
--- a/app-i18n/man-pages-de/man-pages-de-0.8.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-0.8.ebuild,v 1.3 2012/02/05 21:40:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-0.8.ebuild,v 1.1 2011/02/27 16:41:33 jmbsvicetto Exp $
MY_PN="manpages-de"
@@ -10,7 +10,7 @@ SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_PN}-${PV}.tar.bz2"
LICENSE="as-is GPL-2 GPL-3 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild b/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild
index ebedef9af557..1712c41162a6 100644
--- a/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild
+++ b/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild,v 1.5 2012/02/06 17:21:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-pl/man-pages-pl-20070628-r1.ebuild,v 1.2 2011/07/30 21:18:05 nelchael Exp $
inherit autotools
@@ -10,7 +10,7 @@ SRC_URI="http://www.batnet.pl/ptm/man-PL${PV:6:2}-${PV:4:2}-${PV:0:4}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/app-i18n/multiskkserv/files/multiskkserv.initd b/app-i18n/multiskkserv/files/multiskkserv.initd
old mode 100644
new mode 100755
diff --git a/app-i18n/prime/files/prime-1.0.0.1-libdir.patch b/app-i18n/prime/files/prime-1.0.0.1-libdir.patch
deleted file mode 100644
index efa521969237..000000000000
--- a/app-i18n/prime/files/prime-1.0.0.1-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- prime-1.0.0.1.orig/src/prime.src 2005-03-07 16:51:34.000000000 +0900
-+++ prime-1.0.0.1/src/prime.src 2010-05-27 18:44:37.000000000 +0900
-@@ -12,8 +12,10 @@
- # the GNU General Public License version 2.
- #
-
-+require 'rbconfig'
-+
- PRIME_BINDIR = '%bindir%'
--PRIME_LIBDIR = '%rubydir%'
-+PRIME_LIBDIR = Config::CONFIG["sitelibdir"]
- $LOAD_PATH.unshift(PRIME_LIBDIR) unless $LOAD_PATH.member?(PRIME_LIBDIR)
-
- require 'getoptlong'
diff --git a/app-i18n/prime/files/prime-1.0.0.1-parallel.patch b/app-i18n/prime/files/prime-1.0.0.1-parallel.patch
deleted file mode 100644
index 46d87fb94649..000000000000
--- a/app-i18n/prime/files/prime-1.0.0.1-parallel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur prime-1.0.0.1.orig//src/Makefile.am prime-1.0.0.1//src/Makefile.am
---- prime-1.0.0.1.orig//src/Makefile.am 2004-03-26 02:19:51.000000000 +0900
-+++ prime-1.0.0.1//src/Makefile.am 2010-05-27 18:29:20.000000000 +0900
-@@ -23,7 +23,7 @@
-
- ## FIXME: Consider other commands.
- ## FIXME: (2004-02-05)
--@PRIME_COMMAND@: $(script_sources) Makefile
-+$(primelib_SCRIPTS): $(script_sources) Makefile
- ruby -e " \
- command_suffixes = ['', \
- '-userdict-update', '-userdict-convert', \
diff --git a/app-i18n/prime/prime-1.0.0.1-r1.ebuild b/app-i18n/prime/prime-1.0.0.1-r1.ebuild
deleted file mode 100644
index f3fee1eecb6b..000000000000
--- a/app-i18n/prime/prime-1.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/prime/prime-1.0.0.1-r1.ebuild,v 1.1 2012/01/22 11:06:26 matsuu Exp $
-
-EAPI="3"
-# don't work with ruby19
-# jruby: sary-ruby issue
-# rbx: sary-ruby issue
-USE_RUBY="ruby18 ree18"
-inherit autotools eutils ruby-ng
-
-DESCRIPTION="Japanese PRedictive Input Method Editor"
-HOMEPAGE="http://taiyaki.org/prime/"
-SRC_URI="http://prime.sourceforge.jp/src/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=app-dicts/prime-dict-1.0.0
- >=dev-libs/suikyo-2.1.0
- dev-ruby/ruby-progressbar
- dev-ruby/sary-ruby"
-
-S="${WORKDIR}/${P/_/-}"
-
-all_ruby_prepare() {
- epatch \
- "${FILESDIR}/${P}-parallel.patch" \
- "${FILESDIR}/${P}-libdir.patch"
- eautoreconf
-}
-
-each_ruby_configure() {
- econf \
- --with-prime-docdir=/usr/share/doc/${PF}/html \
- --with-rubydir=$(ruby_rbconfig_value 'sitelibdir') || die
-}
-
-each_ruby_compile() {
- emake || die
-}
-
-each_ruby_install() {
- emake DESTDIR="${D}" install install-etc || die
-}
-
-all_ruby_install() {
- dodoc AUTHORS ChangeLog NEWS README TODO || die
- dohtml -r doc/* || die
-}
diff --git a/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild b/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild
index 204e4f6cc3ba..d8cd518ef2e3 100644
--- a/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild
+++ b/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild,v 1.3 2012/01/05 15:31:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-prime/scim-prime-1.0.1-r1.ebuild,v 1.1 2011/12/02 00:42:51 naota Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/scim-imengine/29156/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="static-libs"
RDEPEND=">=app-i18n/scim-1.0
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 36f4d4717ed0..852953967820 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,3 +1 @@
DIST transifex-client-0.5.2.tar.gz 26057 RMD160 d7d065a619bc7bd32829e537541410226908e7eb SHA1 fb7d4feaa98cff012064b051cbe90af2fea1d661 SHA256 97c11397629c1dbb75a4bb87fd3cdc7bad6dbe9a152c54f538e96218f8b17a83
-DIST transifex-client-0.6.1.tar.gz 33136 RMD160 c3c652b65fd4e6fdb4bbb3b0effc52fce19d32e9 SHA1 4bbdcc03285b78d2e5512f30885e8ef4e25080c4 SHA256 f7ee31630f4739ece9eb9bd2ea5e4621d96235503dc9492c19f8e5b8a21744aa
-DIST transifex-client-0.6.tar.gz 32516 RMD160 b0c9204f79a7496c60143922858c0b58c8ac6e33 SHA1 917cde09552ab48e688aa5f52b84157f29619afb SHA256 c40e092fe467cedb99d5ad086974d9d2c774fe8ea6e4eb95143fce604bb99ae2
diff --git a/app-i18n/transifex-client/transifex-client-0.6.1.ebuild b/app-i18n/transifex-client/transifex-client-0.6.1.ebuild
deleted file mode 100644
index 416c87ccac65..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.6.1.ebuild,v 1.1 2012/01/10 21:09:40 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="http://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-i18n/transifex-client/transifex-client-0.6.ebuild b/app-i18n/transifex-client/transifex-client-0.6.ebuild
deleted file mode 100644
index f939af105f16..000000000000
--- a/app-i18n/transifex-client/transifex-client-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.6.ebuild,v 1.1 2011/12/24 09:35:32 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="http://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index ec4360141810..2474e131c84c 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,4 +1,5 @@
DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46
DIST uim-1.6.1.tar.bz2 6192431 RMD160 26c4e30f59c8eb005189d6778333079c81f8489c SHA1 412bb2df6041185084e2f64fb73357389bf992b5 SHA256 ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
+DIST uim-1.7.0.tar.bz2 6402469 RMD160 e866f4270e60d0590a0a37331f3ccf64d7e48fbf SHA1 b79ed80c2557e804e6d3d2771a213a29cd932a73 SHA256 aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
DIST uim-1.7.1.tar.bz2 6354866 RMD160 af62d79be189e0cafda37fbb34bd94441ebeff77 SHA1 9001955f9efbd3cf23c9ad62c027f44060553fa8 SHA256 81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
diff --git a/app-i18n/uim/files/uim-1.7.1-qt4.patch b/app-i18n/uim/files/uim-1.7.1-qt4.patch
deleted file mode 100644
index 76b8cfc5f14c..000000000000
--- a/app-i18n/uim/files/uim-1.7.1-qt4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix build with ld --as-needed
- uim-counted-init is a static library which needs symbols from libuim
- which it must be placed behind it on the command line so it is not
- dropped by ld --as-needed
-Author: Julian Taylor
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/uim/+bug/832939
-Index: uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in
-===================================================================
---- uim-1.7.1.orig/qt4/pref/uim-pref-qt4.pro.in 2011-08-25 23:31:03.080564183 +0200
-+++ uim-1.7.1/qt4/pref/uim-pref-qt4.pro.in 2011-08-25 23:31:01.170564166 +0200
-@@ -4,7 +4,7 @@
-
- # to include qtgettext.h
- INCLUDEPATH += @srcdir@/..
--LIBS += -luim-custom -luim-counted-init @LIBINTL@
-+LIBS += -luim-custom -luim-counted-init -luim @LIBINTL@
-
- QMAKE_UIC = $$QMAKE_UIC -tr UIC_
-
diff --git a/app-i18n/uim/uim-1.7.0.ebuild b/app-i18n/uim/uim-1.7.0.ebuild
new file mode 100644
index 000000000000..b7869b8503d9
--- /dev/null
+++ b/app-i18n/uim/uim-1.7.0.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.0.ebuild,v 1.4 2011/09/28 10:59:35 ssuominen Exp $
+
+EAPI="3"
+inherit autotools eutils multilib elisp-common flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple, secure and flexible input method library"
+HOMEPAGE="http://code.google.com/p/uim/"
+SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
+
+RESTRICT="test"
+
+RDEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXrender
+ )
+ anthy? (
+ unicode? ( >=app-i18n/anthy-8622 )
+ !unicode? ( app-i18n/anthy )
+ )
+ canna? ( app-i18n/canna )
+ curl? ( >=net-misc/curl-7.16.4 )
+ eb? ( dev-libs/eb )
+ emacs? ( virtual/emacs )
+ libffi? ( virtual/libffi )
+ gnome? ( >=gnome-base/gnome-panel-2.14 )
+ gtk? ( >=x11-libs/gtk+-2.4:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ kde? ( >=kde-base/kdelibs-4 )
+ libedit? ( dev-libs/libedit )
+ libnotify? ( >=x11-libs/libnotify-0.4 )
+ m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+ ncurses? ( sys-libs/ncurses )
+ nls? ( virtual/libintl )
+ prime? ( app-i18n/prime )
+ qt4? ( x11-libs/qt-gui:4[qt3support] )
+ skk? ( app-i18n/skk-jisyo )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl )
+ !dev-scheme/sigscheme
+ !app-i18n/uim-svn
+ !=dev-scheme/sigscheme-0.8.5
+# mana? ( app-i18n/mana )
+# scim? ( >=app-i18n/scim-1.3.0 ) # broken
+# sj3? ( >=app-i18n/sj3-2.0.1.21 )
+# wnn? ( app-i18n/wnn )
+# gnome? (
+# gtk? ( >=gnome-base/gnome-panel-2.14 )
+# gtk3? ( >=gnome-base/gnome-panel-3 )
+# )
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ >=sys-devel/gettext-0.15
+ kde? ( dev-util/cmake )
+ X? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+RDEPEND="${RDEPEND}
+ X? (
+ media-fonts/font-sony-misc
+ linguas_zh_CN? (
+ || ( media-fonts/font-isas-misc media-fonts/intlfonts )
+ )
+ linguas_zh_TW? (
+ media-fonts/intlfonts
+ )
+ linguas_ja? (
+ || ( media-fonts/font-jis-misc media-fonts/intlfonts )
+ )
+ linguas_ko? (
+ || ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
+ )
+ )"
+# test? ( dev-scheme/gauche )
+
+SITEFILE=50${PN}-gentoo.el
+
+update_gtk_immodules() {
+ local GTK2_CONFDIR="/etc/gtk-2.0"
+ # bug #366889
+ if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+ GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+ fi
+ mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ fi
+}
+
+update_gtk3_immodules() {
+ if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
+ "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+ "${FILESDIR}"/${PN}-1.6.1-canna.patch
+
+ # bug 275420
+ sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
+
+ echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
+
+ #./autogen.sh
+ AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if (use gtk || use gtk3) && (use anthy || use canna) ; then
+ myconf="${myconf} --enable-dict"
+ else
+ myconf="${myconf} --disable-dict"
+ fi
+
+ if use gtk || use gtk3 || use qt4 ; then
+ myconf="${myconf} --enable-pref"
+ else
+ myconf="${myconf} --disable-pref"
+ fi
+
+ if use anthy ; then
+ if use unicode ; then
+ myconf="${myconf} --with-anthy-utf8"
+ else
+ myconf="${myconf} --with-anthy"
+ fi
+ else
+ myconf="${myconf} --without-anthy"
+ fi
+
+ if use libnotify ; then
+ myconf="${myconf} --enable-notify=libnotify"
+ fi
+
+ #if use gnome ; then
+ # myconf="${myconf} $(use_enable gtk gnome-applet)"
+ # myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
+ #fi
+ econf $(use_with X x) \
+ $(use_with canna) \
+ $(use_with curl) \
+ $(use_with eb) \
+ $(use_enable emacs) \
+ $(use_with emacs lispdir "${SITELISP}") \
+ $(use_with libffi ffi) \
+ $(use_enable gnome gnome-applet) \
+ $(use_with gtk gtk2) \
+ $(use_with gtk3) \
+ $(use_with libedit) \
+ --disable-kde-applet \
+ $(use_enable kde kde4-applet) \
+ $(use_with m17n-lib m17nlib) \
+ $(use_enable ncurses fep) \
+ $(use_enable nls) \
+ $(use_with prime) \
+ --without-qt \
+ --without-qt-immodule \
+ $(use_with qt4 qt4) \
+ $(use_with qt4 qt4-immodule) \
+ $(use_with skk) \
+ $(use_with sqlite sqlite3) \
+ $(use_enable ssl openssl) \
+ $(use_enable static-libs static) \
+ $(use_with xft) \
+ ${myconf}
+ # $(use_enable qt4 qt4-qt3support) \
+}
+
+src_compile() {
+ emake || die "emake failed"
+
+ if use emacs; then
+ cd emacs
+ elisp-compile *.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ # parallel make install b0rked, bug #222677
+ emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
+
+ dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
+ if use emacs; then
+ elisp-install uim-el emacs/*.elc || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
+ || die "elisp-site-file-install failed"
+ fi
+
+ find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
+ use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+
+ sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
+ insinto /etc/X11/xinit/xinput.d
+ doins "${T}/uim.conf" || die
+
+ # collision with dev-scheme/sigscheme, bug #330975
+ # find "${ED}" -name '*gcroots*' -delete || die
+}
+
+pkg_postinst() {
+ elog
+ elog "New input method switcher has been introduced. You need to set"
+ elog
+ elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+ elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+ elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+ elog
+ elog "If you would like to use uim-anthy as default input method, put"
+ elog "(define default-im-name 'anthy)"
+ elog "to your ~/.uim."
+ elog
+ elog "All input methods can be found by running uim-im-switcher-gtk, "
+ elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
+ elog
+ elog "If you upgrade from a version of uim older than 1.4.0,"
+ elog "you should run revdep-rebuild."
+
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ if use emacs; then
+ elisp-site-regen
+ echo
+ elog "uim is autoloaded with Emacs with a minimal set of features:"
+ elog "There is no keybinding defined to call it directly, so please"
+ elog "create one yourself and choose an input method."
+ elog "Integration with LEIM is not done with this ebuild, please have"
+ elog "a look at the documentation how to achieve this."
+ fi
+}
+
+pkg_postrm() {
+ use gtk && update_gtk_immodules
+ use gtk3 && update_gtk3_immodules
+ use emacs && elisp-site-regen
+}
diff --git a/app-i18n/uim/uim-1.7.1-r1.ebuild b/app-i18n/uim/uim-1.7.1-r1.ebuild
deleted file mode 100644
index 75368892af80..000000000000
--- a/app-i18n/uim/uim-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild,v 1.1 2011/12/21 17:39:41 matsuu Exp $
-
-EAPI="4"
-inherit autotools eutils multilib elisp-common flag-o-matic
-
-DESCRIPTION="Simple, secure and flexible input method library"
-HOMEPAGE="http://code.google.com/p/uim/"
-SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-RESTRICT="test"
-
-REQUIRED_USE="gtk? ( X ) qt4? ( X )"
-
-RDEPEND="X? (
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender
- )
- anthy? (
- unicode? ( >=app-i18n/anthy-8622 )
- !unicode? ( app-i18n/anthy )
- )
- canna? ( app-i18n/canna )
- curl? ( >=net-misc/curl-7.16.4 )
- eb? ( dev-libs/eb )
- emacs? ( virtual/emacs )
- libffi? ( virtual/libffi )
- gnome? ( >=gnome-base/gnome-panel-2.14 )
- gtk? ( >=x11-libs/gtk+-2.4:2 )
- gtk3? ( x11-libs/gtk+:3 )
- kde? ( >=kde-base/kdelibs-4 )
- libedit? ( dev-libs/libedit )
- libnotify? ( >=x11-libs/libnotify-0.4 )
- m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
- ncurses? ( sys-libs/ncurses )
- nls? ( virtual/libintl )
- prime? ( app-i18n/prime )
- qt4? ( x11-libs/qt-gui:4[qt3support] )
- skk? ( app-i18n/skk-jisyo )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )
- !dev-scheme/sigscheme
- !app-i18n/uim-svn
- !=dev-scheme/sigscheme-0.8.5
-# mana? ( app-i18n/mana )
-# scim? ( >=app-i18n/scim-1.3.0 ) # broken
-# sj3? ( >=app-i18n/sj3-2.0.1.21 )
-# wnn? ( app-i18n/wnn )
-# gnome? (
-# gtk? ( >=gnome-base/gnome-panel-2.14 )
-# gtk3? ( >=gnome-base/gnome-panel-3 )
-# )
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=sys-devel/gettext-0.15
- kde? ( dev-util/cmake )
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-RDEPEND="${RDEPEND}
- X? (
- media-fonts/font-sony-misc
- linguas_zh_CN? (
- || ( media-fonts/font-isas-misc media-fonts/intlfonts )
- )
- linguas_zh_TW? (
- media-fonts/intlfonts
- )
- linguas_ja? (
- || ( media-fonts/font-jis-misc media-fonts/intlfonts )
- )
- linguas_ko? (
- || ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
- )
- )"
-# test? ( dev-scheme/gauche )
-
-SITEFILE=50${PN}-gentoo.el
-
-update_gtk_immodules() {
- local GTK2_CONFDIR="/etc/gtk-2.0"
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
- fi
- mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-update_gtk3_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.7.1-qt4.patch \
- "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
- "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
-
- # bug 275420
- sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
-
- echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
-
- #./autogen.sh
- AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if (use gtk || use gtk3) && (use anthy || use canna) ; then
- myconf="${myconf} --enable-dict"
- else
- myconf="${myconf} --disable-dict"
- fi
-
- if use gtk || use gtk3 || use qt4 ; then
- myconf="${myconf} --enable-pref"
- else
- myconf="${myconf} --disable-pref"
- fi
-
- if use anthy ; then
- if use unicode ; then
- myconf="${myconf} --with-anthy-utf8"
- else
- myconf="${myconf} --with-anthy"
- fi
- else
- myconf="${myconf} --without-anthy"
- fi
-
- if use libnotify ; then
- myconf="${myconf} --enable-notify=libnotify"
- fi
-
- #if use gnome ; then
- # myconf="${myconf} $(use_enable gtk gnome-applet)"
- # myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
- #fi
-
- econf $(use_with X x) \
- $(use_with canna) \
- $(use_with curl) \
- $(use_with eb) \
- $(use_enable emacs) \
- $(use_with emacs lispdir "${SITELISP}") \
- $(use_with libffi ffi) \
- $(use_enable gnome gnome-applet) \
- $(use_with gtk gtk2) \
- $(use_with gtk3) \
- $(use_with libedit) \
- --disable-kde-applet \
- $(use_enable kde kde4-applet) \
- $(use_with m17n-lib m17nlib) \
- $(use_enable ncurses fep) \
- $(use_enable nls) \
- $(use_with prime) \
- --without-qt \
- --without-qt-immodule \
- $(use_with qt4 qt4) \
- $(use_with qt4 qt4-immodule) \
- $(use_enable qt4 qt4-qt3support) \
- $(use_with skk) \
- $(use_with sqlite sqlite3) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs static) \
- $(use_with xft) \
- ${myconf}
-}
-
-src_compile() {
- emake || die "emake failed"
-
- if use emacs; then
- cd emacs
- elisp-compile *.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- # parallel make install b0rked, bug #222677
- emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
- if use emacs; then
- elisp-install uim-el emacs/*.elc || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
- || die "elisp-site-file-install failed"
- fi
-
- find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
- insinto /etc/X11/xinit/xinput.d
- doins "${T}/uim.conf" || die
-
- # collision with dev-scheme/sigscheme, bug #330975
- # find "${ED}" -name '*gcroots*' -delete || die
-}
-
-pkg_postinst() {
- elog
- elog "New input method switcher has been introduced. You need to set"
- elog
- elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
- elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
- elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
- elog
- elog "If you would like to use uim-anthy as default input method, put"
- elog "(define default-im-name 'anthy)"
- elog "to your ~/.uim."
- elog
- elog "All input methods can be found by running uim-im-switcher-gtk, "
- elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
- elog
- elog "If you upgrade from a version of uim older than 1.4.0,"
- elog "you should run revdep-rebuild."
-
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- if use emacs; then
- elisp-site-regen
- echo
- elog "uim is autoloaded with Emacs with a minimal set of features:"
- elog "There is no keybinding defined to call it directly, so please"
- elog "create one yourself and choose an input method."
- elog "Integration with LEIM is not done with this ebuild, please have"
- elog "a look at the documentation how to achieve this."
- fi
-}
-
-pkg_postrm() {
- use gtk && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use emacs && elisp-site-regen
-}
diff --git a/app-laptop/hdapsd/files/hdapsd.conf.2 b/app-laptop/hdapsd/files/hdapsd.conf.2
deleted file mode 100644
index 2f55a83bae87..000000000000
--- a/app-laptop/hdapsd/files/hdapsd.conf.2
+++ /dev/null
@@ -1,11 +0,0 @@
-# The list of the disk devices that hdapsd should monitor.
-# Usually this is 'hda', 'sda' or 'hda sda'.
-DISKLIST="sda"
-
-# hdapsd sensitivity
-# The lower the threshold is the earlier
-# the heads are parked when the laptop is shaked
-THRESHOLD="10"
-
-# Set any extra options here, like -a for Adaptive mode
-OPTIONS="-a"
diff --git a/app-laptop/hdapsd/files/hdapsd.init.2 b/app-laptop/hdapsd/files/hdapsd.init.2
deleted file mode 100644
index 80add2d32f9d..000000000000
--- a/app-laptop/hdapsd/files/hdapsd.init.2
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-depend() {
- need localmount
-}
-
-checkconfig() {
- if [[ -n ${DISK} ]]; then
- ewarn "Please migrate DISK to DISKLIST in /etc/conf.d/hdapsd."
- DISKLIST=${DISK}
- fi
-
- if [[ -z ${DISKLIST} || -z ${THRESHOLD} ]] ; then
- eerror "You should setup DISKLIST and THRESHOLD in /etc/conf.d/hdapsd."
- return 1
- fi
-
- for DISK in ${DISKLIST}; do
- if [ ! -b /dev/${DISK} ]; then
- eerror "Could not find disk /dev/${DISK}!"
- eerror "Adjust the DISK setting in /etc/conf.d/hdapsd"
- return 1
- fi
-
- if [[ ! -e /sys/block/${DISK}/queue/protect ]] && [[ ! -e /sys/block/${DISK}/device/unload_heads ]] ; then
- eerror "No protect entry for ${DISK}!"
- eerror "Make sure your kernel is patched with the blk_freeze patch"
- return 1
- fi
- done
-
- # Load the tp_smapi module first
- # This is not a requirement, but it helps hdapsd adaptive mode
- if [[ ! -e /sys/devices/platform/smapi ]] ; then
- modprobe tp_smapi 2>/dev/null
- fi
-
- if [[ ! -d /sys/devices/platform/hdaps ]]; then
- ebegin "Loading hdaps module"
- modprobe hdaps
- eend $? || return 1
- fi
-}
-
-start() {
- checkconfig || return 1
-
- local DISKOPTS DISK
- for DISK in ${DISKLIST}; do
- DISKOPTS="${DISKOPTS} -d ${DISK}"
- done
-
- ebegin "Starting Hard Drive Active Protection System daemon"
- start-stop-daemon --start --exec /usr/sbin/hdapsd \
- --pidfile /var/run/hdapsd.pid \
- -- --syslog --background --pidfile \
- ${DISKOPTS} --sensitivity "${THRESHOLD}" ${OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping Hard Drive Active Protection System daemon"
- start-stop-daemon --stop --exec /usr/sbin/hdapsd \
- --pidfile /var/run/hdapsd.pid
- eend $?
-}
diff --git a/app-laptop/hdapsd/hdapsd-20090401-r1.ebuild b/app-laptop/hdapsd/hdapsd-20090401-r1.ebuild
deleted file mode 100644
index d4774ceac80e..000000000000
--- a/app-laptop/hdapsd/hdapsd-20090401-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20090401-r1.ebuild,v 1.1 2011/12/21 04:51:22 ottxor Exp $
-
-EAPI=4
-inherit linux-info
-
-DESCRIPTION="IBM ThinkPad Harddrive Active Protection disk head parking daemon"
-HOMEPAGE="http://hdaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hdaps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-pkg_setup() {
- # We require the hdaps module which can either come from kernel sources or
- # from the tp_smapi package.
- if ! has_version app-laptop/tp_smapi[hdaps]; then
- CONFIG_CHECK="~SENSORS_HDAPS"
- ERROR_SENSORS_HDAPS="${P} requires app-laptop/tp_smapi (with hdaps USE enabled) or support for CONFIG_SENSORS_HDAPS enabled"
- linux-info_pkg_setup
- fi
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
- rm -rf "${ED}"/usr/share/doc/hdapsd
- dodoc ChangeLog README AUTHORS
- newconfd "${FILESDIR}"/hdapsd.conf.2 hdapsd
- newinitd "${FILESDIR}"/hdapsd.init.2 hdapsd
-}
-
-pkg_postinst(){
- [[ -z $(ls ${EROOT}/sys/block/*/queue/protect 2>/dev/null) ]] && \
- [[ -z $(ls ${EROOT}/sys/block/*/device/unload_heads 2>/dev/null) ]] && \
- ewarn "Your kernel does NOT support shock protection. Kernel 2.6.28 and above is recommended!"
-
- if ! has_version app-laptop/tp_smapi[hdaps]; then
- ewarn "Using the hdaps module provided by app-laptop/tp_smapi instead"
- ewarn "of the in-kernel driver is strongly recommended!"
- fi
-
- elog "You can change the default frequency by modifing /sys/devices/platform/hdaps/sampling_rate"
- elog "You might need to enable shock protection manually by running "
- elog " echo -1 > /sys/block/DEVICE/device/unload_heads"
-}
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index 7e3583c44f82..d093e471712a 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,2 +1,2 @@
+DIST ibam-0.4.tar.gz 18913 RMD160 b834e1deae6989a23d2130810f8dcb9e9cb71616 SHA1 cab718518acb0b945078479d3c8540bb09892ccc SHA256 962b55ef610ffd5f954938188f3275e4c2c673e79015361718b83a3469be155b
DIST ibam-0.5.2.tar.gz 22149 RMD160 c9a662abad521b4604c875ff3403d52f6aafc1d7 SHA1 79321ff80f4cf3a2b8b92522b5b652aaaefd09c1 SHA256 d668f23088e48be537dbf3ab63f1a8f6f9acb32031b1f6ba6fb185e9e6079d91
-DIST ibam_0.5.2-2.diff.gz 5914 RMD160 c63047df2f410f173bf90c5a6e763550121a2e5a SHA1 284217ebe3042e9fdb2e2d0f769a0e808cd273cf SHA256 8986814e13e8014bac3daf15a10c446d045e11c0468fff442fab437956a16890
diff --git a/app-laptop/ibam/files/ibam-0.5.2-acpi.patch b/app-laptop/ibam/files/ibam-0.5.2-acpi.patch
new file mode 100644
index 000000000000..321f5b3c8dfb
--- /dev/null
+++ b/app-laptop/ibam/files/ibam-0.5.2-acpi.patch
@@ -0,0 +1,15 @@
+--- ibam-0.5.2/ibam.inl 2009-03-09 19:53:20.000000000 +0300
++++ ibam-0.5.2/ibam.inl 2010-11-26 04:52:29.590364097 +0300
+@@ -942,10 +942,11 @@
+ {
+ string pmu_path = "/proc/pmu"; // These strings are already in ibam.hpp,
+ string acpi_path = "/proc/acpi"; // maybe a static function should check this
++ string acpi_ver_path = "/sys/module/acpi/parameters/acpica_version";
+ string sysfs_path = "/sys/class/power_supply"; // ...
+ ifstream pmu,acpi,sysfs;
+ pmu.open((pmu_path+"/info").c_str());
+- acpi.open((acpi_path+"/info").c_str());
++ acpi.open(acpi_ver_path.c_str());
+ if (pmu.is_open()) {
+ #ifdef IBAM_DEBUG
+ cout << "using pmu" << endl;
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
deleted file mode 100644
index 77854b5f3d5a..000000000000
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -17,8 +17,8 @@
- #
- IBAM_VERSION=0.5.2
-
--CC=g++
--CFLAGS=-O3 -DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
-+CXX?=g++
-+CXXFLAGS+=-DIBAM_VERSION=\"$(IBAM_VERSION)\" -Wall
-
- PREFIX=/usr
-
-@@ -30,23 +30,23 @@
- all: ibam
-
- ibam: ibam.cpp ibam.inl ibam.hpp
-- $(CC) $(CFLAGS) ibam.cpp -o ibam
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) ibam.cpp -o ibam
-
- krell: ibam-krell.so
-
- ibam-krell.so: ibam-krell.o
-- $(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
-
- ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
-- $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
-+ $(CXX) $(CXXFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
-
- krell1: ibam-krell1.so
-
- ibam-krell1.so: ibam-krell1.o
-- $(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
-+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
-
- ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
-- $(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
-+ $(CXX) $(CXXFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
-
- install: ibam
- $(INSTALL) ./ibam $(PREFIX)/local/bin/
diff --git a/app-laptop/ibam/files/ibam-0.5.2-ldflags.patch b/app-laptop/ibam/files/ibam-0.5.2-ldflags.patch
new file mode 100644
index 000000000000..23c481dd6371
--- /dev/null
+++ b/app-laptop/ibam/files/ibam-0.5.2-ldflags.patch
@@ -0,0 +1,27 @@
+diff -uNr ibam-0.5.2.ORIG//Makefile ibam-0.5.2/Makefile
+--- ibam-0.5.2.ORIG//Makefile 2010-10-19 21:49:39.000000000 +0100
++++ ibam-0.5.2/Makefile 2010-10-19 21:53:27.000000000 +0100
+@@ -30,12 +30,12 @@
+ all: ibam
+
+ ibam: ibam.cpp ibam.inl ibam.hpp
+- $(CC) $(CFLAGS) ibam.cpp -o ibam
++ $(CC) $(LDFLAGS) $(CFLAGS) ibam.cpp -o ibam
+
+ krell: ibam-krell.so
+
+ ibam-krell.so: ibam-krell.o
+- $(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++ $(CC) $(LDFLAGS) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
+
+ ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
+ $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
+@@ -43,7 +43,7 @@
+ krell1: ibam-krell1.so
+
+ ibam-krell1.so: ibam-krell1.o
+- $(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
++ $(CC) $(LDFLAGS) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
+
+ ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
+ $(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
diff --git a/app-laptop/ibam/ibam-0.4.ebuild b/app-laptop/ibam/ibam-0.4.ebuild
new file mode 100644
index 000000000000..18f5618af522
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.4.ebuild,v 1.5 2010/01/01 20:56:59 ssuominen Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+
+ sed -i \
+ -e "s:^CFLAGS=-O3:CFLAGS=${CFLAGS}:" \
+ -e "s:^CC=g++:CC=$(tc-getCXX):" \
+ "${S}"/Makefile || die
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install() {
+ dobin ibam || die
+
+ dodoc CHANGES README REPORT
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install sci-visualization/gnuplot if you wish to use"
+ elog "the --plot argument to ibam."
+ elog
+}
diff --git a/app-laptop/ibam/ibam-0.5.2-r1.ebuild b/app-laptop/ibam/ibam-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..d2af89d2e973
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.5.2-r1.ebuild,v 1.1 2010/10/19 21:16:33 chainsaw Exp $
+
+EAPI=2
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gkrellm"
+
+DEPEND="gkrellm? ( app-admin/gkrellm )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
+
+src_prepare() {
+ base_src_prepare
+ sed -i \
+ -e "s:^CFLAGS=-O3:CFLAGS=${CFLAGS}:" \
+ -e "s:^CC=g++:CC=$(tc-getCXX):" \
+ "${S}"/Makefile \
+ || die "Failed to set CFLAGS/compiler"
+}
+
+src_compile() {
+ emake || die "Making ibam failed"
+ if use gkrellm; then
+ emake krell || die "Making krell failed"
+ fi
+}
+
+src_install() {
+ dobin ibam || die "dobin failed"
+ dodoc CHANGES README REPORT || die "dodoc failed"
+
+ if use gkrellm; then
+ insinto /usr/$(get_libdir)/gkrellm2/plugins
+ doins ibam-krell.so || die "doins gkrellm plugin failed"
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install sci-visualization/gnuplot if you wish to use"
+ elog "the --plot argument to ibam."
+ elog
+}
diff --git a/app-laptop/ibam/ibam-0.5.2-r2.ebuild b/app-laptop/ibam/ibam-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..f20fffc9e5e9
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.5.2-r2.ebuild,v 1.1 2011/03/20 15:34:24 aidecoe Exp $
+
+EAPI=2
+
+inherit base toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gkrellm"
+
+DEPEND="gkrellm? ( app-admin/gkrellm )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
+ "${FILESDIR}/${P}-acpi.patch"
+ )
+
+src_prepare() {
+ base_src_prepare
+ sed -i \
+ -e "s:^CFLAGS=-O3:CFLAGS=${CFLAGS}:" \
+ -e "s:^CC=g++:CC=$(tc-getCXX):" \
+ "${S}"/Makefile \
+ || die "Failed to set CFLAGS/compiler"
+}
+
+src_compile() {
+ emake || die "Making ibam failed"
+ if use gkrellm; then
+ emake krell || die "Making krell failed"
+ fi
+}
+
+src_install() {
+ dobin ibam || die "dobin failed"
+ dodoc CHANGES README REPORT || die "dodoc failed"
+
+ if use gkrellm; then
+ insinto /usr/$(get_libdir)/gkrellm2/plugins
+ doins ibam-krell.so || die "doins gkrellm plugin failed"
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install sci-visualization/gnuplot if you wish to use"
+ elog "the --plot argument to ibam."
+ elog
+}
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
deleted file mode 100644
index eba631af0a3b..000000000000
--- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.5.2-r3.ebuild,v 1.1 2012/01/23 00:55:39 ssuominen Exp $
-
-EAPI=4
-
-PATCH_LEVEL=2
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Intelligent Battery Monitor"
-HOMEPAGE="http://ibam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gkrellm"
-
-RDEPEND="
- gkrellm? (
- app-admin/gkrellm
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- )"
-DEPEND="
- ${RDEPEND}
- gkrellm? ( dev-util/pkgconfig )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-build.patch \
- "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-
- local f
- for f in `find . -name '*.dpatch'`; do
- epatch ${f}
- done
-}
-
-src_compile() {
- tc-export CXX
- emake
- use gkrellm && emake krell
-}
-
-src_install() {
- dobin ibam
- dodoc CHANGES README REPORT
-
- if use gkrellm; then
- insinto /usr/$(get_libdir)/gkrellm2/plugins
- doins ibam-krell.so
- fi
-}
-
-pkg_postinst() {
- elog
- elog "You will need to install sci-visualization/gnuplot if you wish to use"
- elog "the --plot argument to ibam."
- elog
-}
diff --git a/app-laptop/ibam/ibam-0.5.2.ebuild b/app-laptop/ibam/ibam-0.5.2.ebuild
new file mode 100644
index 000000000000..7030c04b9ef3
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibam/ibam-0.5.2.ebuild,v 1.2 2010/10/19 21:16:33 chainsaw Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gkrellm"
+
+DEPEND="gkrellm? ( app-admin/gkrellm )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+
+ sed -i \
+ -e "s:^CFLAGS=-O3:CFLAGS=${CFLAGS}:" \
+ -e "s:^CC=g++:CC=$(tc-getCXX):" \
+ "${S}"/Makefile \
+ || die "Sed Makefile failed"
+}
+
+src_compile() {
+ emake || die "Making ibam failed"
+ if use gkrellm; then
+ emake krell || die "Making krell failed"
+ fi
+}
+
+src_install() {
+ dobin ibam || die "dobin failed"
+ dodoc CHANGES README REPORT || die "dodoc failed"
+
+ if use gkrellm; then
+ insinto /usr/$(get_libdir)/gkrellm2/plugins
+ doins ibam-krell.so || die "doins gkrellm plugin failed"
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install sci-visualization/gnuplot if you wish to use"
+ elog "the --plot argument to ibam."
+ elog
+}
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 251d77b845e4..e238325f10df 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,2 +1 @@
DIST laptop-mode-tools_1.55.tar.gz 97675 RMD160 af1476c4ff4c08c2a077eb592ca2c3369c57b8e9 SHA1 e2dcec04f4c1152bce07dd621ad8a63f70b013ef SHA256 4fc8420253bc053a643c736238a6dcde6f8e32b48674cad6d42cc90a5ff727b5
-DIST laptop-mode-tools_1.60.tar.gz 104415 RMD160 09b58d3ea889b43c5383a319d077e4b935f850fe SHA1 abdf010712b3dd9ec795518a5cb11dfe50893872 SHA256 39246db1bba2ea12c7ee6f1979f914a803a9f70836cde687ff9c3a39bc9c9519
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch
new file mode 100644
index 000000000000..aab707aedc6f
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.55-linux3-support.patch
@@ -0,0 +1,40 @@
+Add support for Linux 3.0 kernels
+
+Signed-off-by: Robin H. Johnson
+
+diff -Nuar --exclude '*~' laptop-mode-tools_1.55.orig//usr/sbin/laptop_mode laptop-mode-tools_1.55/usr/sbin/laptop_mode
+--- laptop-mode-tools_1.55.orig//usr/sbin/laptop_mode 2010-05-26 08:54:44.000000000 -0700
++++ laptop-mode-tools_1.55/usr/sbin/laptop_mode 2011-07-12 13:29:38.000000000 -0700
+@@ -496,6 +496,7 @@
+ case "$KLEVEL" in
+ "2.4" ) ;;
+ "2.6" ) ;;
++ "3.0" ) ;;
+ *)
+ log "ERR" "Unhandled kernel version: $KLEVEL ('uname -r' = '$(uname -r)')" >&2
+ exit 1
+diff -Nuar --exclude '*~' laptop-mode-tools_1.55.orig//usr/share/laptop-mode-tools/modules/laptop-mode laptop-mode-tools_1.55/usr/share/laptop-mode-tools/modules/laptop-mode
+--- laptop-mode-tools_1.55.orig//usr/share/laptop-mode-tools/modules/laptop-mode 2010-05-26 08:54:44.000000000 -0700
++++ laptop-mode-tools_1.55/usr/share/laptop-mode-tools/modules/laptop-mode 2011-07-12 13:29:20.000000000 -0700
+@@ -193,8 +193,8 @@
+ set_sysctl /proc/sys/vm/laptop_mode 1
+ set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $AGE $AGE 60 20 0"
+ ;;
+- "2.6")
+- log "VERBOSE" "Adjusting 2.6 kernel parameters to enable laptop mode."
++ "2.6"|"3.0")
++ log "VERBOSE" "Adjusting $KLEVEL kernel parameters to enable laptop mode."
+ set_sysctl /proc/sys/vm/laptop_mode "$LM_SECONDS_BEFORE_SYNC"
+ set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$AGE"
+ set_sysctl /proc/sys/vm/dirty_expire_centisecs "$AGE"
+@@ -321,8 +321,8 @@
+ log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
+ set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
+ ;;
+- "2.6")
+- log "VERBOSE" "Adjusting 2.6 kernel parameters to disable laptop mode."
++ "2.6"|"3.0")
++ log "VERBOSE" "Adjusting $KLEVEL kernel parameters to disable laptop mode."
+ set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$U_AGE"
+ set_sysctl /proc/sys/vm/dirty_expire_centisecs "$B_AGE"
+ set_sysctl /proc/sys/vm/dirty_ratio "$NOLM_DIRTY_RATIO"
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4 b/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4
index 5a7da1463ae9..a3d4e9062752 100644
--- a/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4
+++ b/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4,v 1.4 2012/01/01 14:44:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4,v 1.2 2009/03/17 02:16:16 dirtyepic Exp $
-extra_started_commands="reload"
+opts="${opts} reload"
depend() {
need localmount
@@ -22,9 +22,6 @@ start() {
checkconfig || return 1
ebegin "Starting laptop_mode"
- # bug #342049 fix
- # check if dir exists and creates if it doesn't
- checkpath -q -d -m 755 /var/run/laptop-mode-tools
touch /var/run/laptop-mode-tools/enabled
/usr/sbin/laptop_mode auto >/dev/null
eend $?
diff --git a/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils b/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils
new file mode 100755
index 000000000000..5444a4b3432f
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop_mode_tools.pmutils
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/sbin/laptop_mode auto
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
new file mode 100644
index 000000000000..9a1d87673fbc
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r1.ebuild,v 1.5 2010/09/28 05:23:31 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="acpi apm bluetooth scsi"
+
+RDEPEND="sys-apps/ethtool
+ acpi? ( sys-power/acpid )
+ apm? ( sys-apps/apmd )
+ bluetooth? ( net-wireless/bluez )
+ scsi? ( sys-apps/sdparm )
+ sys-apps/hdparm"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Patching to avoid !sys-power/pm-utils depend wrt #327443
+ epatch "${FILESDIR}"/${P}-pm-utils-1.4.0.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+ DESTDIR="${D}" \
+ INIT_D="none" \
+ MAN_D="/usr/share/man" \
+ ACPI="$(use acpi && echo force || echo disabled)" \
+ PMU="$(false && echo force || echo disabled)" \
+ APM="$(use apm && echo force || echo disabled)" \
+ ./install.sh || die
+
+ dodoc Documentation/*.txt README || die
+ newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+ # Commented out to avoid !sys-power/pm-utils depend wrt #327443
+ # exeinto /etc/pm/power.d
+ # newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
+
+ keepdir /var/run/laptop-mode-tools
+}
+
+pkg_postinst() {
+ if ! use acpi && ! use apm; then
+ ewarn
+ ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+ ewarn "automatically disable laptop_mode on low battery."
+ ewarn
+ ewarn "This means you can lose up to 10 minutes of work if running"
+ ewarn "out of battery while laptop_mode is enabled."
+ ewarn
+ ewarn "Please see /usr/share/doc/${PF}/laptop-mode.txt.gz for further"
+ ewarn "information."
+ ewarn
+ fi
+}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild
new file mode 100644
index 000000000000..84bd8302afe5
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r2.ebuild,v 1.1 2011/07/12 20:41:51 robbat2 Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="acpi apm bluetooth scsi"
+
+RDEPEND="sys-apps/ethtool
+ acpi? ( sys-power/acpid )
+ apm? ( sys-apps/apmd )
+ bluetooth? ( net-wireless/bluez )
+ scsi? ( sys-apps/sdparm )
+ sys-apps/hdparm"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Patching to avoid !sys-power/pm-utils depend wrt #327443
+ epatch "${FILESDIR}"/${P}-pm-utils-1.4.0.patch
+ # Add support for Linux3
+ epatch "${FILESDIR}"/${P}-linux3-support.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+ DESTDIR="${D}" \
+ INIT_D="none" \
+ MAN_D="/usr/share/man" \
+ ACPI="$(use acpi && echo force || echo disabled)" \
+ PMU="$(false && echo force || echo disabled)" \
+ APM="$(use apm && echo force || echo disabled)" \
+ ./install.sh || die
+
+ dodoc Documentation/*.txt README || die
+ newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+ # Commented out to avoid !sys-power/pm-utils depend wrt #327443
+ # exeinto /etc/pm/power.d
+ # newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
+
+ keepdir /var/run/laptop-mode-tools
+}
+
+pkg_postinst() {
+ if ! use acpi && ! use apm; then
+ ewarn
+ ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+ ewarn "automatically disable laptop_mode on low battery."
+ ewarn
+ ewarn "This means you can lose up to 10 minutes of work if running"
+ ewarn "out of battery while laptop_mode is enabled."
+ ewarn
+ ewarn "Please see /usr/share/doc/${PF}/laptop-mode.txt.gz for further"
+ ewarn "information."
+ ewarn
+ fi
+}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r3.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r3.ebuild
deleted file mode 100644
index 7c91206de046..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.55-r3.ebuild,v 1.1 2011/12/31 21:25:29 idl0r Exp $
-
-EAPI=2
-inherit eutils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="acpi apm bluetooth scsi"
-
-RDEPEND="sys-apps/ethtool
- acpi? ( sys-power/acpid )
- apm? ( sys-apps/apmd )
- bluetooth? ( net-wireless/bluez )
- scsi? ( sys-apps/sdparm )
- sys-apps/hdparm"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Patching to avoid !sys-power/pm-utils depend wrt #327443
- epatch "${FILESDIR}"/${P}-pm-utils-1.4.0.patch
-}
-
-src_compile() { :; }
-
-src_install() {
- DESTDIR="${D}" \
- INIT_D="none" \
- MAN_D="/usr/share/man" \
- ACPI="$(use acpi && echo force || echo disabled)" \
- PMU="$(false && echo force || echo disabled)" \
- APM="$(use apm && echo force || echo disabled)" \
- ./install.sh || die
-
- dodoc Documentation/*.txt README || die
- newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
- # Commented out to avoid !sys-power/pm-utils depend wrt #327443
- # exeinto /etc/pm/power.d
- # newexe "${FILESDIR}"/laptop_mode_tools.pmutils laptop_mode_tools
-
- keepdir /var/run/laptop-mode-tools
-}
-
-pkg_postinst() {
- if ! use acpi && ! use apm; then
- ewarn
- ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
- ewarn "automatically disable laptop_mode on low battery."
- ewarn
- ewarn "This means you can lose up to 10 minutes of work if running"
- ewarn "out of battery while laptop_mode is enabled."
- ewarn
- ewarn "Please see /usr/share/doc/${PF}/laptop-mode.txt.gz for further"
- ewarn "information."
- ewarn
- fi
-}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
deleted file mode 100644
index a7dfb1e2f87e..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.60-r1.ebuild,v 1.5 2012/01/21 16:34:14 phajdan.jr Exp $
-
-EAPI=4
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
- sys-apps/ethtool
- sys-apps/hdparm
- acpi? ( sys-power/acpid )
- apm? ( sys-apps/apmd )
- bluetooth? ( net-wireless/bluez )
- scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Install 99-laptop-mode.rules to rules.d directory in /lib instead of /etc
- sed -i -e '/udev/s:/etc:/lib:' install.sh || die
-
- # This should avoid conflict with pm-powersave wrt #327443 and #396703
- cat <<-EOF > "${T}"/${PN}
- HOOK_BLACKLIST="00powersave"
- EOF
-}
-
-src_compile() { :; }
-
-src_install() {
- DESTDIR="${D}" \
- INIT_D="none" \
- MAN_D="/usr/share/man" \
- ACPI="$(use acpi && echo force || echo disabled)" \
- PMU="$(false && echo force || echo disabled)" \
- APM="$(use apm && echo force || echo disabled)" \
- ./install.sh || die
-
- dodoc Documentation/*.txt README
- newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
- # See src_prepare()
- insinto /etc/pm/config.d
- doins "${T}"/${PN}
-}
-
-pkg_postinst() {
- if use acpi || use apm; then
- if use acpi; then
- daemon_name="acpid"
- elif use apm; then
- deamon_name="apmd"
- fi
- ewarn
- ewarn "To enable automatic power state event handling,"
- ewarn "e.g. enabling laptop_mode after unplugging the battery,"
- ewarn "both laptop_mode and the ${daemon_name} daemon"
- ewarn "must be added to a runlevel,"
- ewarn " rc-update add laptop_mode default"
- ewarn " rc-update add ${daemon_name} default"
- ewarn
- else
- ewarn
- ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
- ewarn "automatically disable laptop_mode on low battery."
- ewarn
- ewarn "This means you can lose up to 10 minutes of work if running"
- ewarn "out of battery while laptop_mode is enabled."
- ewarn
- ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
- ewarn "information."
- ewarn
- fi
-}
diff --git a/app-laptop/samsung-tools/Manifest b/app-laptop/samsung-tools/Manifest
index 17cf1177fb63..0672c477b6c5 100644
--- a/app-laptop/samsung-tools/Manifest
+++ b/app-laptop/samsung-tools/Manifest
@@ -1,3 +1,2 @@
DIST samsung-tools-1.4.tar.gz 441042 RMD160 8e166e9e018f5e2887dce20ae43f996f85c9fd25 SHA1 fcadaf5335023c5389508aac42e716eda058c86b SHA256 c075c5e62d57262f9846e86c4f3b9a37db5adbdff296773bbee527d9f293b67a
DIST samsung-tools-1.5.tar.gz 441205 RMD160 c48126f8e6d80082d0de3ab92df64191d734246d SHA1 4c31c3bae2576eef87c825969f01c4346e3ef2df SHA256 3ebd64648e2f065859cc29b2415e83f6a003a6ab29c15895fe787fc1ae04e5e2
-DIST samsung-tools-2.0.tar.gz 435233 RMD160 3d6f2925a93d4c649e313d2f5a9a44e009dd9ee0 SHA1 8229ff4bf6f32ead7ea9279a49ad2985f65faef2 SHA256 e9f5bc07e58004665d3496d9d5048015c62c2997600b6d446d7d60be2f86ab0d
diff --git a/app-laptop/samsung-tools/samsung-tools-2.0.ebuild b/app-laptop/samsung-tools/samsung-tools-2.0.ebuild
deleted file mode 100644
index e1ff9a63ee91..000000000000
--- a/app-laptop/samsung-tools/samsung-tools-2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/samsung-tools/samsung-tools-2.0.ebuild,v 1.1 2011/12/18 10:12:20 angelos Exp $
-
-EAPI=4
-PYTHON_DEPEND=2
-inherit fdo-mime python
-
-DESCRIPTION="Tools for Samsung laptops"
-HOMEPAGE="http://launchpad.net/samsung-tools"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-laptop/easy-slow-down-manager
- dev-python/dbus-python
- dev-python/notify-python
- dev-python/pygtk
- net-wireless/rfkill
- sys-power/pm-utils
- x11-misc/xbindkeys"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- python_convert_shebangs -r -q 2 .
-}
-
-src_compile() {
- return
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- python_mod_optimize /usr/lib/${PN}
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- python_mod_cleanup /usr/lib/${PN}
-}
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index 1c9a235983d7..7d6d87db8018 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,2 +1 @@
DIST tp_smapi-0.40.tgz 39002 RMD160 8b564396afe6255476e73c9c78bd47294eeb8d53 SHA1 bc1bd1c6558d1972501e816308234d48ac530fc6 SHA256 ccb0965684cad076160750f2ac380f99373fa73f0bcc1091ffce2492f56349ab
-DIST tp_smapi-0.41.tar.gz 38852 RMD160 e4db1b7449d0da741c1433396a4227d1274743f1 SHA1 ab222a41a2773bfa8a67c4b74343655dca6fb8be SHA256 6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.40-initd b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
index e0b3bd5e0d8e..4edb05170f63 100755
--- a/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
+++ b/app-laptop/tp_smapi/files/tp_smapi-0.40-initd
@@ -4,7 +4,7 @@
#
# Distributed under the terms of the GNU General Public License, v2 or later
-extra_started_commands="low high info"
+opts="low high info"
SMAPI_SYSFS="/sys/devices/platform/smapi"
BATS="BAT0 BAT1"
diff --git a/app-laptop/tp_smapi/tp_smapi-0.41.ebuild b/app-laptop/tp_smapi/tp_smapi-0.41.ebuild
deleted file mode 100644
index 43afb114fe8d..000000000000
--- a/app-laptop/tp_smapi/tp_smapi-0.41.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.41.ebuild,v 1.1 2011/12/20 02:56:49 ottxor Exp $
-
-EAPI=4
-
-inherit linux-mod
-
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="https://github.com/evgeni/tp_smapi/ http://tpctl.sourceforge.net/"
-SRC_URI="mirror://github/evgeni/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="hdaps"
-
-RESTRICT="userpriv"
-
-# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
-# in dmi.h
-DEPEND="sys-apps/dmidecode"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-
- if kernel_is lt 2 6 19; then
- eerror
- eerror "${P} requires Linux kernel 2.6.19 or above."
- eerror
- die "Unsupported kernel version"
- fi
-
- MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
- BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
- BUILD_TARGETS="default"
-
- if use hdaps; then
- CONFIG_CHECK="~INPUT_UINPUT"
- WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
- linux-info_pkg_setup
-
- MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
- BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
-
- CONFIG_CHECK="!SENSORS_HDAPS"
- ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- # run again as pkg_pretend is not var safe
- pkg_pretend
-}
-
-src_install() {
- linux-mod_src_install
- dodoc CHANGES README
- newinitd "${FILESDIR}"/${PN}-0.40-initd smapi
- newconfd "${FILESDIR}"/${PN}-0.40-confd smapi
-}
diff --git a/app-laptop/tpctl/files/apmiser.rc b/app-laptop/tpctl/files/apmiser.rc
old mode 100644
new mode 100755
diff --git a/app-misc/alexandria/Manifest b/app-misc/alexandria/Manifest
index e62fab78984b..cf532a9989de 100644
--- a/app-misc/alexandria/Manifest
+++ b/app-misc/alexandria/Manifest
@@ -1,2 +1,2 @@
+DIST alexandria-0.6.6.tar.gz 2990953 RMD160 a935205782caafff990a859f548eec81eba4ba63 SHA1 edcd808ab2fd7407bfbacdd8ecd7f0346e871b1d SHA256 42a9c81288b13190928166c67592426d893a8fba98293fca98e1fb9f36054ce0
DIST alexandria-0.6.7.tar.gz 3014178 RMD160 f00041ee8afc0c97fd4412d7b73786d9ba1a096a SHA1 0a31bd9bb1e626e5451f01c900ac9ad9c25f5e1c SHA256 47991fc42884187974ac600b1b9db6f57546d4ea6af3ef0c125519d95bbd710b
-DIST alexandria-0.6.8.tar.gz 2888984 RMD160 a77d9eb81a2ecb6af578403a10e2b1786091ec0a SHA1 8c85085d58acd73ce2f982bc4636d949121770ee SHA256 d6bd9d6619a0bda5992a0df440404726c63cda57c49bfe0f57d5e21506866770
diff --git a/app-misc/alexandria/alexandria-0.6.6-r1.ebuild b/app-misc/alexandria/alexandria-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..63c187841ee9
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.6-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6-r1.ebuild,v 1.2 2010/06/28 11:40:00 fauli Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit gnome2 ruby-ng
+
+DESCRIPTION="A GNOME application to help you manage your book collection"
+HOMEPAGE="http://alexandria.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="evo"
+
+DOCS="ChangeLog README TODO"
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-gettext-0.6.1
+ >=dev-ruby/ruby-gnome2-0.16.0
+ >=dev-ruby/ruby-libglade2-0.12.0
+ >=dev-ruby/ruby-gconf2-0.12.0
+ >=dev-ruby/imagesize-0.1.1
+ dev-ruby/hpricot
+ evo? ( >=dev-ruby/revolution-0.5 )"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+DEPEND="${DEPEND} app-text/scrollkeeper"
+
+RUBY_PATCHES=(
+ "${FILESDIR}/${P}-Rakefile.patch"
+)
+
+each_ruby_compile() {
+ ${RUBY} -S rake || die
+}
+
+each_ruby_install() {
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
+}
+
+all_ruby_install() {
+ [ -n "${DOCS}" ] && dodoc ${DOCS}
+
+ # Move the installed docs to the gentoo standard directory
+ for doc in "${D}/usr/share/doc/alexandria/*"
+ do
+ dodoc $doc
+ done
+ rm -rf "${D}/usr/share/doc/alexandria"
+}
+
+pkg_postinst() {
+ unset PREFIX
+
+ gnome2_gconf_install
+
+ # For the next line see bug #76726
+ "${ROOT}/usr/bin/gconftool-2" --shutdown
+
+ echo
+ elog "To enable some book providers you will need to emerge"
+ elog "additional packages:"
+ echo
+ elog " For the Deastore book provider:"
+ elog " dev-ruby/htmlentities"
+ echo
+ elog " For Z39.50 support and the Library of Congress and"
+ elog " British Library book proviers:"
+ elog " dev-ruby/ruby-zoom"
+}
diff --git a/app-misc/alexandria/alexandria-0.6.6-r2.ebuild b/app-misc/alexandria/alexandria-0.6.6-r2.ebuild
new file mode 100644
index 000000000000..50c9a57a1832
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.6-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6-r2.ebuild,v 1.1 2010/08/02 18:26:25 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit gnome2 ruby-ng
+
+DESCRIPTION="A GNOME application to help you manage your book collection"
+HOMEPAGE="http://alexandria.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="evo"
+
+DOCS="ChangeLog README TODO doc/BUGS doc/cuecat_support.rdoc doc/FAQ doc/HACKING doc/NEWS"
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-gettext-0.6.1
+ >=dev-ruby/ruby-gnome2-0.16.0
+ >=dev-ruby/ruby-libglade2-0.12.0
+ >=dev-ruby/ruby-gconf2-0.12.0
+ >=dev-ruby/imagesize-0.1.1
+ dev-ruby/hpricot
+ evo? ( >=dev-ruby/revolution-0.5 )"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+DEPEND="${DEPEND} app-text/scrollkeeper"
+
+RUBY_PATCHES=(
+ "${FILESDIR}/${P}-Rakefile.patch"
+)
+
+each_ruby_compile() {
+ ${RUBY} -S rake || die
+}
+
+each_ruby_install() {
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
+}
+
+all_ruby_install() {
+ [ -n "${DOCS}" ] && dodoc ${DOCS} || die "Failed to install documentation"
+}
+
+pkg_postinst() {
+ unset PREFIX
+
+ gnome2_gconf_install
+
+ # For the next line see bug #76726
+ "${ROOT}/usr/bin/gconftool-2" --shutdown
+
+ echo
+ elog "To enable some book providers you will need to emerge"
+ elog "additional packages:"
+ echo
+ elog " For the Deastore book provider:"
+ elog " dev-ruby/htmlentities"
+ echo
+ elog " For Z39.50 support and the Library of Congress and"
+ elog " British Library book proviers:"
+ elog " dev-ruby/ruby-zoom"
+}
diff --git a/app-misc/alexandria/alexandria-0.6.6.ebuild b/app-misc/alexandria/alexandria-0.6.6.ebuild
new file mode 100644
index 000000000000..e495d517d491
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6.ebuild,v 1.5 2010/07/30 15:59:21 hwoarang Exp $
+
+inherit gnome2 ruby
+
+DESCRIPTION="A GNOME application to help you manage your book collection"
+HOMEPAGE="http://alexandria.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="evo"
+
+DOCS="ChangeLog README TODO"
+
+RDEPEND=">=dev-lang/ruby-1.8.0
+ >=dev-ruby/ruby-gettext-0.6.1
+ >=dev-ruby/ruby-gnome2-0.16.0
+ >=dev-ruby/ruby-libglade2-0.12.0
+ >=dev-ruby/ruby-gconf2-0.12.0
+ >=dev-ruby/imagesize-0.1.1
+ dev-ruby/hpricot
+ evo? ( >=dev-ruby/revolution-0.5 )"
+
+DEPEND=">=dev-lang/ruby-1.8.0
+ app-text/scrollkeeper
+ dev-ruby/rake"
+
+PATCHES=(
+ "${FILESDIR}/${P}-Rakefile.patch"
+)
+
+src_compile() {
+ rake || die
+}
+
+src_install() {
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
+
+ [ -n "${DOCS}" ] && dodoc ${DOCS}
+
+ # Move the installed docs to the gentoo standard directory
+ for doc in "${D}/usr/share/doc/alexandria/*"
+ do
+ dodoc $doc
+ done
+ rm -rf "${D}/usr/share/doc/alexandria"
+}
+
+pkg_postinst() {
+ unset PREFIX
+
+ gnome2_gconf_install
+
+ # For the next line see bug #76726
+ "${ROOT}/usr/bin/gconftool-2" --shutdown
+
+ echo
+ elog "To enable some book providers you will need to emerge"
+ elog "additional packages:"
+ echo
+ elog " For the Deastore book provider:"
+ elog " dev-ruby/htmlentities"
+ echo
+ elog " For Z39.50 support and the Library of Congress and"
+ elog " British Library book proviers:"
+ elog " dev-ruby/ruby-zoom"
+}
diff --git a/app-misc/alexandria/alexandria-0.6.7.ebuild b/app-misc/alexandria/alexandria-0.6.7.ebuild
index a0b49b0e8c9a..b4f45dcaab5a 100644
--- a/app-misc/alexandria/alexandria-0.6.7.ebuild
+++ b/app-misc/alexandria/alexandria-0.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.7.ebuild,v 1.4 2012/01/04 18:02:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.7.ebuild,v 1.1 2011/12/13 19:26:15 fauli Exp $
EAPI=2
USE_RUBY="ruby18"
@@ -13,7 +13,7 @@ SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="evo"
DOCS="ChangeLog README TODO doc/BUGS doc/cuecat_support.rdoc doc/FAQ doc/HACKING doc/NEWS"
@@ -40,8 +40,8 @@ each_ruby_compile() {
}
each_ruby_install() {
- export DESTDIR="${D}" PREFIX=/usr RUBYLIBDIR="$(ruby_rbconfig_value 'sitelibdir')"
- ${RUBY} -S rake install_package_staging || die
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
}
all_ruby_install() {
diff --git a/app-misc/alexandria/alexandria-0.6.8.ebuild b/app-misc/alexandria/alexandria-0.6.8.ebuild
deleted file mode 100644
index 99898e31ace1..000000000000
--- a/app-misc/alexandria/alexandria-0.6.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.8.ebuild,v 1.1 2011/12/26 10:56:58 fauli Exp $
-
-EAPI=4
-USE_RUBY="ruby18"
-
-inherit gnome2 ruby-ng
-
-DESCRIPTION="A GNOME application to help you manage your book collection"
-HOMEPAGE="http://alexandria.rubyforge.org/"
-SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="evo"
-
-DOCS="ChangeLog README TODO doc/BUGS doc/cuecat_support.rdoc doc/FAQ doc/HACKING doc/NEWS"
-
-ruby_add_rdepend "
- >=dev-ruby/ruby-gettext-0.6.1
- >=dev-ruby/ruby-gtk2-0.90
- >=dev-ruby/ruby-goocanvas-0.90
- >=dev-ruby/ruby-gstreamer-0.90
- >=dev-ruby/ruby-pango-0.90
- >=dev-ruby/imagesize-0.1.1
- dev-ruby/hpricot
- evo? ( >=dev-ruby/revolution-0.5 )"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-DEPEND="${DEPEND}
- gnome-base/gconf:2
- app-text/scrollkeeper"
-
-RUBY_PATCHES=(
- "${FILESDIR}/${P}-set_status_label.patch"
- "${FILESDIR}/${PN}-0.6.6-Rakefile.patch"
-)
-
-each_ruby_compile() {
- ${RUBY} -S rake || die
-}
-
-each_ruby_install() {
- export DESTDIR="${D}" PREFIX=/usr RUBYLIBDIR="$(ruby_rbconfig_value 'sitelibdir')"
- ${RUBY} -S rake install_package_staging || die
-}
-
-all_ruby_install() {
- [ -n "${DOCS}" ] && dodoc ${DOCS} || die "Failed to install documentation"
-}
-
-pkg_postinst() {
- unset PREFIX
-
- gnome2_gconf_install
-
- # For the next line see bug #76726
- "${ROOT}/usr/bin/gconftool-2" --shutdown
-
- echo
- elog "To enable some book providers you will need to emerge"
- elog "additional packages:"
- echo
- elog " For the Deastore book provider:"
- elog " dev-ruby/htmlentities"
- echo
- elog " For Z39.50 support and the Library of Congress and"
- elog " British Library book proviers:"
- elog " dev-ruby/ruby-zoom"
-}
diff --git a/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch b/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch
deleted file mode 100644
index 55fbade8827e..000000000000
--- a/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/alexandria/ui/dialogs/new_book_dialog.rb.orig
-+++ lib/alexandria/ui/dialogs/new_book_dialog.rb
-@@ -574,7 +574,7 @@
- log.debug { "update message : #{message}" }
-
- # @parent.appbar.status = message
-- MainApp.instance.appbar.status = message # HACKish
-+ MainApp.instance.ui_manager.set_status_label( message )
- #false
- end
- end
diff --git a/app-misc/bb/bb-1.3.0_rc1-r2.ebuild b/app-misc/bb/bb-1.3.0_rc1-r2.ebuild
deleted file mode 100644
index b65923c89707..000000000000
--- a/app-misc/bb/bb-1.3.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/bb-1.3.0_rc1-r2.ebuild,v 1.2 2012/02/07 08:10:42 slyfox Exp $
-
-EAPI=4
-
-inherit autotools eutils versionator
-
-MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
-
-DESCRIPTION="Demonstration program for visual effects of aalib"
-HOMEPAGE="http://aa-project.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mikmod"
-
-DEPEND="media-libs/aalib
- mikmod? ( media-libs/libmikmod )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-noattr.patch"
- epatch "${FILESDIR}/${P}-fix-protos.patch"
- epatch "${FILESDIR}"/${P}-messager-overlap.patch
- epatch "${FILESDIR}"/${P}-zbuff-fault.patch
- epatch "${FILESDIR}"/${P}-printf-cleanup.patch
- epatch "${FILESDIR}"/${P}-m4-stuff.patch
-
- # rename binary and manpage bb -> bb-aalib
-
- mv bb.1 bb-aalib.1 || die
- sed -e 's/bb/bb-aalib/' \
- -i bb-aalib.1
- sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
- -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/' \
- -e 's/bb_SOURCES/bb_aalib_SOURCES/' \
- -i Makefile.am || die
-
- AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
- elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
-}
diff --git a/app-misc/bb/bb-1.3.0_rc1.ebuild b/app-misc/bb/bb-1.3.0_rc1.ebuild
new file mode 100644
index 000000000000..1cb1dbad7225
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bb/bb-1.3.0_rc1.ebuild,v 1.2 2008/01/05 22:19:48 angelos Exp $
+
+inherit eutils versionator
+
+MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
+
+DESCRIPTION="Demonstration program for visual effects of aalib"
+HOMEPAGE="http://aa-project.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mikmod"
+
+DEPEND="media-libs/aalib
+ mikmod? ( media-libs/libmikmod )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-noattr.patch" || die "epatch failed"
+}
+
+src_install() {
+ newbin bb bb-aalib || die "renaming bb binary failed"
+ newman bb.1 bb-aalib.1 || die "renaming bb manpage failed"
+ insinto /usr/share/bb
+ doins bb.s3m bb2.s3m bb3.s3m
+}
+
+pkg_postinst() {
+ elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with busybox."
+}
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
deleted file mode 100644
index 577f306c8169..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-fix-protos.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes warning:
-main.c: In function 'load_song':
-main.c:56:23: warning: incompatible implicit declaration of built-in function 'strlen'
-diff --git a/main.c b/main.c
-index ae852a7..417ff62 100644
---- a/main.c
-+++ b/main.c
-@@ -21,6 +21,7 @@
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-+#include
- #include
- #include "timers.h"
- #include "bb.h"
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch b/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
deleted file mode 100644
index 0fa98f8162f5..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Fix aclocal failure on libmikmod-less systems
-
-commit 55b86efdc3e2a1febb593169b10ab252c75fdb10
-Author: Sergei Trofimovich
-Date: Tue Feb 7 10:59:09 2012 +0300
-
- bb-1.3.0_rc1: bundle m4 source
-
-diff --git m4/aalib.m4 m4/aalib.m4
-new file mode 100644
-index 0000000..991fbda
---- /dev/null
-+++ m4/aalib.m4
-@@ -0,0 +1,169 @@
-+# Configure paths for AALIB
-+# Jan Hubicka 4/22/2001
-+# stolen from Sam Lantinga 9/21/99
-+# stolen from Manish Singh
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_AALIB],
-+[dnl
-+dnl Get the cflags and libraries from the aalib-config script
-+dnl
-+AC_ARG_WITH(aalib-prefix,[ --with-aalib-prefix=PFX Prefix where AALIB is installed (optional)],
-+ aalib_prefix="$withval", aalib_prefix="")
-+AC_ARG_WITH(aalib-exec-prefix,[ --with-aalib-exec-prefix=PFX Exec prefix where AALIB is installed (optional)],
-+ aalib_exec_prefix="$withval", aalib_exec_prefix="")
-+AC_ARG_ENABLE(aalibtest, [ --disable-aalibtest Do not try to compile and run a test AALIB program],
-+ , enable_aalibtest=yes)
-+
-+ if test x$aalib_exec_prefix != x ; then
-+ aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
-+ if test x${AALIB_CONFIG+set} != xset ; then
-+ AALIB_CONFIG=$aalib_exec_prefix/bin/aalib-config
-+ fi
-+ fi
-+ if test x$aalib_prefix != x ; then
-+ aalib_args="$aalib_args --prefix=$aalib_prefix"
-+ if test x${AALIB_CONFIG+set} != xset ; then
-+ AALIB_CONFIG=$aalib_prefix/bin/aalib-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
-+ min_aalib_version=ifelse([$1], ,0.11.0,$1)
-+ AC_MSG_CHECKING(for AALIB - version >= $min_aalib_version)
-+ no_aalib=""
-+ if test "$AALIB_CONFIG" = "no" ; then
-+ no_aalib=yes
-+ else
-+ AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
-+ AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
-+
-+ aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_aalibtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $AALIB_CFLAGS"
-+ LIBS="$LIBS $AALIB_LIBS"
-+dnl
-+dnl Now check if the installed AALIB is sufficiently new. (Also sanity
-+dnl checks the results of aalib-config to some extent
-+dnl
-+ rm -f conf.aalibtest
-+ AC_TRY_RUN([
-+#include
-+#include
-+#include
-+#include "aalib.h"
-+
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main (int argc, char *argv[])
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ /* This hangs on some systems (?)
-+ system ("touch conf.aalibtest");
-+ */
-+ { FILE *fp = fopen("conf.aalibtest", "a"); if ( fp ) fclose(fp); }
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_aalib_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_aalib_version");
-+ exit(1);
-+ }
-+
-+ if (($aalib_major_version > major) ||
-+ (($aalib_major_version == major) && ($aalib_minor_version > minor)) ||
-+ (($aalib_major_version == major) && ($aalib_minor_version == minor) && ($aalib_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** 'aalib-config --version' returned %d.%d.%d, but the minimum version\n", $aalib_major_version, $aalib_minor_version, $aalib_micro_version);
-+ printf("*** of AALIB required is %d.%d.%d. If aalib-config is correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If aalib-config was wrong, set the environment variable AALIB_CONFIG\n");
-+ printf("*** to point to the correct copy of aalib-config, and remove the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ return 1;
-+ }
-+}
-+
-+],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_aalib" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$AALIB_CONFIG" = "no" ; then
-+ echo "*** The aalib-config script installed by AALIB could not be found"
-+ echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the AALIB_CONFIG environment variable to the"
-+ echo "*** full path to aalib-config."
-+ else
-+ if test -f conf.aalibtest ; then
-+ :
-+ else
-+ echo "*** Could not run AALIB test program, checking why..."
-+ CFLAGS="$CFLAGS $AALIB_CFLAGS"
-+ LIBS="$LIBS $AALIB_LIBS"
-+ AC_TRY_LINK([
-+#include
-+#include "AALIB.h"
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding AALIB or finding the wrong"
-+ echo "*** version of AALIB. If it is not finding AALIB, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means AALIB was incorrectly installed"
-+ echo "*** or that you have moved AALIB since it was installed. In the latter case, you"
-+ echo "*** may want to edit the aalib-config script: $AALIB_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ AALIB_CFLAGS=""
-+ AALIB_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(AALIB_CFLAGS)
-+ AC_SUBST(AALIB_LIBS)
-+ rm -f conf.aalibtest
-+])
-diff --git m4/libmikmod.m4 m4/libmikmod.m4
-new file mode 100644
-index 0000000..18feebe
---- /dev/null
-+++ m4/libmikmod.m4
-@@ -0,0 +1,207 @@
-+# Configure paths for libmikmod
-+#
-+# Derived from glib.m4 (Owen Taylor 97-11-3)
-+# Improved by Chris Butler
-+#
-+
-+dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
-+dnl LIBMIKMOD_LDADD
-+dnl
-+AC_DEFUN([AM_PATH_LIBMIKMOD],
-+[dnl
-+dnl Get the cflags and libraries from the libmikmod-config script
-+dnl
-+AC_ARG_WITH(libmikmod-prefix,[ --with-libmikmod-prefix=PFX Prefix where libmikmod is installed (optional)],
-+ libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
-+AC_ARG_WITH(libmikmod-exec-prefix,[ --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)],
-+ libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
-+AC_ARG_ENABLE(libmikmodtest, [ --disable-libmikmodtest Do not try to compile and run a test libmikmod program],
-+ , enable_libmikmodtest=yes)
-+
-+ if test x$libmikmod_config_exec_prefix != x ; then
-+ libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"
-+ if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-+ LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config
-+ fi
-+ fi
-+ if test x$libmikmod_config_prefix != x ; then
-+ libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix"
-+ if test x${LIBMIKMOD_CONFIG+set} != xset ; then
-+ LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no)
-+ min_libmikmod_version=ifelse([$1], ,3.1.5,$1)
-+ AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version)
-+ no_libmikmod=""
-+ if test "$LIBMIKMOD_CONFIG" = "no" ; then
-+ no_libmikmod=yes
-+ else
-+ LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags`
-+ LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs`
-+ LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd`
-+ libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-+ libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-+ libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
-+ if test "x$enable_libmikmodtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ AC_LANG_SAVE
-+ AC_LANG_C
-+ CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD"
-+ LIBS="$LIBMIKMOD_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed libmikmod is sufficiently new. (Also sanity
-+dnl checks the results of libmikmod-config to some extent
-+dnl
-+ rm -f conf.mikmodtest
-+ AC_TRY_RUN([
-+#include
-+#include
-+#include
-+
-+char* my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str) {
-+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ } else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main()
-+{
-+ int major,minor,micro;
-+ int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
-+ char *tmp_version;
-+
-+ system("touch conf.mikmodtest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_libmikmod_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_libmikmod_version");
-+ exit(1);
-+ }
-+
-+ libmikmod_major_version=(MikMod_GetVersion() >> 16) & 255;
-+ libmikmod_minor_version=(MikMod_GetVersion() >> 8) & 255;
-+ libmikmod_micro_version=(MikMod_GetVersion() ) & 255;
-+
-+ if ((libmikmod_major_version != $libmikmod_config_major_version) ||
-+ (libmikmod_minor_version != $libmikmod_config_minor_version) ||
-+ (libmikmod_micro_version != $libmikmod_config_micro_version))
-+ {
-+ printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n",
-+ $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version,
-+ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+ printf ("*** was found! If libmikmod-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n");
-+ printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n");
-+ printf("*** before re-running configure\n");
-+ }
-+ else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) ||
-+ (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
-+ (libmikmod_micro_version != LIBMIKMOD_REVISION))
-+ {
-+ printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
-+ LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+ }
-+ else
-+ {
-+ if ((libmikmod_major_version > major) ||
-+ ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) ||
-+ ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n",
-+ libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-+ printf("*** You need a version of libmikmod newer than %d.%d.%d.\n",
-+ major, minor, micro);
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n");
-+ printf("*** correct copy of libmikmod-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_libmikmod=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ AC_LANG_RESTORE
-+ fi
-+ fi
-+ if test "x$no_libmikmod" = x ; then
-+ AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`])
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$LIBMIKMOD_CONFIG" = "no" ; then
-+ echo "*** The libmikmod-config script installed by libmikmod could not be found"
-+ echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the"
-+ echo "*** full path to libmikmod-config."
-+ else
-+ if test -f conf.mikmodtest ; then
-+ :
-+ else
-+ echo "*** Could not run libmikmod test program, checking why..."
-+ CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS"
-+ LIBS="$LIBS $LIBMIKMOD_LIBS"
-+ AC_LANG_SAVE
-+ AC_LANG_C
-+ AC_TRY_LINK([
-+#include
-+#include
-+], [ return (MikMod_GetVersion()!=0); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding libmikmod or finding the wrong"
-+ echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location. Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system."
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means libmikmod was incorrectly installed"
-+ echo "*** or that you have moved libmikmod since it was installed. In the latter case, you"
-+ echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ AC_LANG_RESTORE
-+ fi
-+ fi
-+ LIBMIKMOD_CFLAGS=""
-+ LIBMIKMOD_LIBS=""
-+ LIBMIKMOD_LDADD=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(LIBMIKMOD_CFLAGS)
-+ AC_SUBST(LIBMIKMOD_LIBS)
-+ AC_SUBST(LIBMIKMOD_LDADD)
-+ rm -f conf.mikmodtest
-+])
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch b/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
deleted file mode 100644
index e46b75fd5815..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-messager-overlap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-messager.c: fix memory overlap (fixes artefacts in scrolling text)
-
-==363== Source and destination overlap in memcpy(0xa066240, 0xa0662b8, 240)
-==363== at 0x4C2B220: memcpy@@GLIBC_2.14 (mc_replace_strmem.c:838)
-==363== by 0x407D97: newline (messager.c:43)
-==363== by 0x407EE6: put (messager.c:54)
-==363== by 0x40806E: messager (messager.c:77)
-==363== by 0x403009: bb (bb.c:258)
-==363== by 0x407C06: main (main.c:202)
-
-diff --git a/messager.c b/messager.c
-index 95cc410..964080b 100644
---- a/messager.c
-+++ b/messager.c
-@@ -40,8 +40,8 @@ static void newline()
- start = 0;
- cursor_y++, cursor_x = 0;
- if (cursor_y >= aa_scrheight(context)) {
-- memcpy(context->textbuffer + start * aa_scrwidth(context), context->textbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
-- memcpy(context->attrbuffer + start * aa_scrwidth(context), context->attrbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
-+ memmove(context->textbuffer + start * aa_scrwidth(context), context->textbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
-+ memmove(context->attrbuffer + start * aa_scrwidth(context), context->attrbuffer + (start + 1) * aa_scrwidth(context), aa_scrwidth(context) * (aa_scrheight(context) - start - 1));
- memset(context->textbuffer + aa_scrwidth(context) * (aa_scrheight(context) - 1), ' ', aa_scrwidth(context));
- memset(context->attrbuffer + aa_scrwidth(context) * (aa_scrheight(context) - 1), 0, aa_scrwidth(context));
- cursor_y--;
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch b/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
deleted file mode 100644
index da113795124b..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-printf-cleanup.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-zoom.c: cleanup protos
-
-x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -O2 -march=core2 -pipe -I/usr/include -pthread -D_REENTRANT -D SOUNDDIR=\"/usr/share/bb\" -c zoom.c
-zoom.c: In function 'mkrealloc_table':
-zoom.c:245:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-zoom.c:251:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-zoom.c:260:113: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-zoom.c: In function 'moveoldpoints':
-zoom.c:590:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-zoom.c:596:3: warning: format '%i' expects type 'int', but argument 3 has type 'long unsigned int'
-diff --git a/zoom.c b/zoom.c
-index 7450095..b86cc8b 100644
---- a/zoom.c
-+++ b/zoom.c
-@@ -241,13 +241,13 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
- #endif
- if (dyndata == NULL) {
- fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
-- "temporary dynamical data of size:%i\n"
-+ "temporary dynamical data of size:%li\n"
- "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
- return;
- }
- if (best == NULL) {
- fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
-- "temporary dynamical data of size:%i\n"
-+ "temporary dynamical data of size:%li\n"
- "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
- #ifndef HAVE_ALLOCA
- free(dyndata);
-@@ -256,7 +256,7 @@ static /*INLINE */ void mkrealloc_table(register number_t * pos, realloc_t * rea
- }
- if (best1 == NULL) {
- fprintf(stderr, "XaoS fatal error:Could not allocate memory for"
-- "temporary dynamical data of size:%i\n"
-+ "temporary dynamical data of size:%li\n"
- "I am unable to handle this problem so please resize to lower window\n", (size) * (DSIZE + 1) * sizeof(struct dyn_data) + size * sizeof(int) + size * sizeof(int));
- #ifndef HAVE_ALLOCA
- free(dyndata);
-@@ -586,13 +586,13 @@ static /*INLINE */ void moveoldpoints(void)
- #endif
- if (size == NULL) {
- fprintf(stderr, "XaoS fratal error:Could not allocate memory for"
-- "temporary dynamical data of size:%i\n"
-+ "temporary dynamical data of size:%li\n"
- "I am unable to handle this problem so please resize to lower window\n", 2 * d->width * sizeof(int));
- return;
- }
- if (start == NULL) {
- fprintf(stderr, "XaoS fratal error:Could not allocate memory for"
-- "temporary dynamical data of size:%i\n"
-+ "temporary dynamical data of size:%li\n"
- "I am unable to handle this problem so please resize to lower window\n", 2 * d->width * sizeof(int));
- #ifndef HAVE_ALLOCA
- free(size);
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch b/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
deleted file mode 100644
index b3e882ed55e9..000000000000
--- a/app-misc/bb/files/bb-1.3.0_rc1-zbuff-fault.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-tex.c: Fix out-of-bounds zbuff clearing
-
-> zbuff = (int *) malloc(X_s * Y_s * sizeof(int));
-> memset(zbuff, 0x55, (X_s * Y_s * sizeof(long)));
-
-Ouch! amd64: sizeof(long) == 8; sizeof (int) == 4
-
-Valgrind says:
-==4525== Invalid write of size 4
-==4525== at 0x4C2C3AF: memset (mc_replace_strmem.c:967)
-==4525== by 0x4122E0: clear_zbuff (tex.c:95)
-==4525== by 0x4144D8: disp3d (tex.c:292)
-==4525== by 0x40F3C6: scene5 (scene5.c:206)
-==4525== by 0x4031BC: bb (bb.c:325)
-==4525== by 0x407C56: main (main.c:202)
-==4525== Address 0xac9ef00 is 0 bytes after a block of size 34,992 alloc'd
-==4525== at 0x4C2996D: malloc (vg_replace_malloc.c:263)
-==4525== by 0x412283: set_zbuff (tex.c:85)
-==4525== by 0x40F347: scene5 (scene5.c:196)
-==4525== by 0x4031BC: bb (bb.c:325)
-==4525== by 0x407C56: main (main.c:202)
-
-diff --git a/tex.c b/tex.c
-index 9f2f99d..b390510 100644
---- a/tex.c
-+++ b/tex.c
-@@ -92,7 +92,7 @@ void unset_zbuff()
-
- static inline void clear_zbuff()
- {
-- memset(zbuff, 0x55, (X_s * Y_s * sizeof(long)));
-+ memset(zbuff, 0x55, (X_s * Y_s * sizeof(int)));
- }
-
-
diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml
index f3d36d3380fa..e552045aca6d 100644
--- a/app-misc/bb/metadata.xml
+++ b/app-misc/bb/metadata.xml
@@ -5,8 +5,4 @@
jokey@gentoo.org
Markus Ullmann
-
- slyfox@gentoo.org
- Sergei Trofimovich
-
diff --git a/app-misc/beagle/beagle-0.3.9-r3.ebuild b/app-misc/beagle/beagle-0.3.9-r3.ebuild
new file mode 100644
index 000000000000..f429e2393614
--- /dev/null
+++ b/app-misc/beagle/beagle-0.3.9-r3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r3.ebuild,v 1.7 2011/03/12 11:51:42 angelos Exp $
+
+EAPI=2
+
+inherit base gnome.org eutils mono mozextension autotools
+
+DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
+HOMEPAGE="http://www.beagle-project.org/"
+LICENSE="MIT Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="avahi chm debug doc eds firefox +galago gtk +pdf +inotify +ole thunderbird +google +xscreensaver"
+
+#See bug 248331 for blocker reason.
+RDEPEND="!!sci-libs/beagle
+ >=dev-lang/mono-1.9
+ >=app-shells/bash-3.2
+ app-arch/zip
+ >=dev-db/sqlite-3.3.1
+ >=dev-dotnet/ndesk-dbus-0.6.0
+ >=dev-dotnet/ndesk-dbus-glib-0.4.1
+ >=dev-dotnet/taglib-sharp-2.0
+ gtk? (
+ x11-libs/libX11
+ >=gnome-base/librsvg-2.22.0:2
+ sys-devel/gettext
+ >=dev-dotnet/gtk-sharp-2.12.6:2
+ >=dev-dotnet/gconf-sharp-2.24.0:2
+ >=dev-dotnet/glade-sharp-2.12.6:2
+ >=dev-dotnet/gnome-sharp-2.24.0:2
+ >=dev-dotnet/gnomevfs-sharp-2.24.0:2
+ x11-misc/xdg-utils
+ >=x11-libs/gtk+-2.14.0:2
+ >=dev-libs/atk-1.22.0
+ )
+ eds? (
+ >=dev-dotnet/evolution-sharp-0.18.1
+ >=dev-dotnet/gconf-sharp-2.24.0
+ >=dev-dotnet/glib-sharp-2.12.6
+ )
+ ole? (
+ >=app-text/wv-1.2.3
+ >=dev-dotnet/gsf-sharp-0.8.1
+ >=app-office/gnumeric-1.4.3-r3
+ )
+
+ x11-misc/shared-mime-info
+ >=dev-dotnet/glib-sharp-2.12.6:2
+ dev-libs/gmime:2.4[mono]
+ chm? ( dev-libs/chmlib )
+ pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
+ galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
+ thunderbird? (
+ || (
+ >=mail-client/thunderbird-1.5
+ >=mail-client/thunderbird-bin-1.5
+ )
+ )
+ firefox? (
+ || (
+ >=www-client/firefox-1.5
+ >=www-client/firefox-bin-1.5
+ )
+ )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ >=dev-libs/libbeagle-0.3.9
+ avahi? ( >=net-dns/avahi-0.6.10[mono] )"
+
+DEPEND="${RDEPEND}
+ doc? ( >=virtual/monodoc-1.2.4 )
+ dev-util/pkgconfig
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ >=dev-util/intltool-0.35"
+
+pkg_setup() {
+ enewgroup beagleindex
+ enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
+ if use thunderbird
+ then
+ if ! use inotify
+ then
+ eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
+ eerror "Please enable the inotify use-flag also."
+ eerror "See http://bugs.gentoo.org/263781 for more information."
+ die "Please enable the inotify use-flag."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Fix bugs.gnome.org/556243
+ sed -i -e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
+ search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
+
+ # Fix when using firefox 3.6
+ epatch "${FILESDIR}/${P}-firefox-3.6.patch"
+
+ # Fix building against gmime-2.4, bug #311499
+ epatch "${FILESDIR}/${P}-gmime24.patch"
+
+ # Remove bogus open check
+ epatch "${FILESDIR}/${P}-openfix.patch"
+
+ # Port to mono-2.6
+ epatch "${FILESDIR}/${P}-mono2.6.patch"
+
+ # Grow/shrink the number beagle-search results based on window size
+ epatch "${FILESDIR}/${P}-grow-shrink.patch"
+
+ # Update tileIndex when removing a tile
+ epatch "${FILESDIR}/${P}-update-tileindex.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf --disable-static \
+ --disable-dependency-tracking \
+ --disable-epiphany-extension \
+ $(use_enable debug xml-dump) \
+ $(use_enable doc docs) \
+ $(use_enable thunderbird) \
+ $(use_enable eds evolution) \
+ $(use_enable gtk gui) \
+ $(use_enable ole gsf-sharp wv1) \
+ $(use_enable xscreensaver xss) \
+ $(use_enable inotify) \
+ $(use_enable avahi) \
+ $(use_enable google googlebackends)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+
+ dodoc AUTHORS NEWS README || die "dodoc failed"
+
+ declare MOZILLA_FIVE_HOME
+ if use firefox; then
+ xpi_unpack "${S}"/firefox-extension/beagle.xpi \
+ || die "Unable to find Beagle Firefox Extension"
+ mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
+
+ if has_version '>=www-client/firefox-1.5'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+ xpi_install "${WORKDIR}"/firefox-beagle \
+ || die "xpi install for firefox failed!"
+ fi
+ if has_version '>=www-client/firefox-bin-1.5'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${WORKDIR}"/firefox-beagle \
+ || die "xpi install for firefox-bin failed!"
+ fi
+ fi
+
+ if use thunderbird; then
+ xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
+ || die "Unable to find Beagle Thunderbird Extension"
+ mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
+
+ if has_version '>=mail-client/thunderbird-1.5'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+ xpi_install "${WORKDIR}"/thunderbird-beagle \
+ || die "xpi install for thunderbird failed!"
+ fi
+ if has_version '>=mail-client/thunderbird-bin-1.5'; then
+ MOZILLA_FIVE_HOME="/opt/thunderbird"
+ xpi_install "${WORKDIR}"/thunderbird-beagle \
+ || die "xpi install for thunderbird-bin failed!"
+ fi
+ fi
+
+ sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
+ "${D}"/etc/beagle/crawl-rules/crawl-*
+
+ insinto /etc/beagle/crawl-rules
+ doins "${FILESDIR}/crawl-portage"
+
+ keepdir "/usr/$(get_libdir)/beagle/Backends"
+ diropts -o beagleindex -g beagleindex
+ keepdir "/var/lib/cache/beagle/indexes"
+}
+
+pkg_postinst() {
+ elog "If available, Beagle greatly benefits from using certain operating"
+ elog "system features such as Extended Attributes and inotify."
+ elog
+ elog "If you want static queryables such as the portage tree and system"
+ elog "documentation you will need to edit the /etc/beagle/crawl-* files"
+ elog "and change CRAWL_ENABLE from 'no' to 'yes'."
+ elog
+ elog "For more info on how to create the optimal beagle environment, and"
+ elog "basic usage info, see the Gentoo page of the Beagle website:"
+ elog "http://www.beagle-project.org/Gentoo_Installation"
+}
diff --git a/app-misc/beagle/beagle-0.3.9-r4.ebuild b/app-misc/beagle/beagle-0.3.9-r4.ebuild
new file mode 100644
index 000000000000..42a8d17f5bdb
--- /dev/null
+++ b/app-misc/beagle/beagle-0.3.9-r4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r4.ebuild,v 1.5 2011/03/12 11:51:42 angelos Exp $
+
+EAPI="3"
+
+inherit base gnome.org eutils mono mozextension autotools
+
+DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
+HOMEPAGE="http://www.beagle-project.org/"
+LICENSE="MIT Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="avahi chm debug doc eds firefox +galago gtk +pdf +inotify +ole thunderbird +google +xscreensaver"
+
+#See bug 248331 for blocker reason.
+RDEPEND="!!sci-libs/beagle
+ >dev-lang/mono-2.4
+ >=app-shells/bash-3.2
+ app-arch/zip
+ >=dev-db/sqlite-3.3.1
+ >=dev-dotnet/ndesk-dbus-0.6.0
+ >=dev-dotnet/ndesk-dbus-glib-0.4.1
+ >=dev-dotnet/taglib-sharp-2.0
+ gtk? (
+ x11-libs/libX11
+ >=gnome-base/librsvg-2.22.0:2
+ sys-devel/gettext
+ >=dev-dotnet/gtk-sharp-2.12.6:2
+ >=dev-dotnet/gconf-sharp-2.24.0:2
+ >=dev-dotnet/glade-sharp-2.12.6:2
+ >=dev-dotnet/gnome-sharp-2.24.0:2
+ >=dev-dotnet/gnomevfs-sharp-2.24.0:2
+ x11-misc/xdg-utils
+ >=x11-libs/gtk+-2.14.0:2
+ >=dev-libs/atk-1.22.0
+ )
+ eds? (
+ >=dev-dotnet/evolution-sharp-0.18.1
+ >=dev-dotnet/gconf-sharp-2.24.0:2
+ >=dev-dotnet/glib-sharp-2.12.6:2
+ )
+ ole? (
+ >=app-text/wv-1.2.3
+ >=dev-dotnet/gsf-sharp-0.8.1
+ >=app-office/gnumeric-1.4.3-r3
+ )
+
+ x11-misc/shared-mime-info
+ >=dev-dotnet/glib-sharp-2.12.6:2
+ dev-libs/gmime:2.4[mono]
+ chm? ( dev-libs/chmlib )
+ pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
+ galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
+ thunderbird? (
+ || (
+ >=mail-client/thunderbird-1.5
+ >=mail-client/thunderbird-bin-1.5
+ )
+ )
+ firefox? (
+ || (
+ >=www-client/firefox-1.5
+ >=www-client/firefox-bin-1.5
+ )
+ )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ >=dev-libs/libbeagle-0.3.9
+ avahi? ( >=net-dns/avahi-0.6.10[mono] )"
+
+DEPEND="${RDEPEND}
+ doc? ( >=virtual/monodoc-1.2.4 )
+ dev-util/pkgconfig
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ >=dev-util/intltool-0.35"
+
+pkg_setup() {
+ enewgroup beagleindex
+ enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
+ if use thunderbird
+ then
+ if ! use inotify
+ then
+ eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
+ eerror "Please enable the inotify use-flag also."
+ eerror "See http://bugs.gentoo.org/263781 for more information."
+ die "Please enable the inotify use-flag."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Fix bugs.gnome.org/556243
+ sed -i -e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
+ search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
+
+ # Fix when using firefox 3.6
+ epatch "${FILESDIR}/${P}-firefox-3.6.patch"
+
+ # Fix building against gmime-2.4, bug #311499
+ epatch "${FILESDIR}/${P}-gmime24.patch"
+
+ # Remove bogus open check
+ epatch "${FILESDIR}/${P}-openfix.patch"
+
+ # Port to mono-2.6
+ epatch "${FILESDIR}/${P}-mono2.6.patch"
+
+ # Grow/shrink the number beagle-search results based on window size
+ epatch "${FILESDIR}/${P}-grow-shrink.patch"
+
+ # Update tileIndex when removing a tile
+ epatch "${FILESDIR}/${P}-update-tileindex.patch"
+
+ # Support mono-2.8, bug #341195
+ epatch "${FILESDIR}/${P}-mono2.8.patch"
+
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf --disable-static \
+ --disable-dependency-tracking \
+ --disable-epiphany-extension \
+ $(use_enable debug xml-dump) \
+ $(use_enable doc docs) \
+ $(use_enable thunderbird) \
+ $(use_enable eds evolution) \
+ $(use_enable gtk gui) \
+ $(use_enable ole gsf-sharp wv1) \
+ $(use_enable xscreensaver xss) \
+ $(use_enable inotify) \
+ $(use_enable avahi) \
+ $(use_enable google googlebackends)
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install || die "emake install failed."
+
+ dodoc AUTHORS NEWS README || die "dodoc failed"
+
+ declare MOZILLA_FIVE_HOME
+ if use firefox; then
+ xpi_unpack "${S}"/firefox-extension/beagle.xpi \
+ || die "Unable to find Beagle Firefox Extension"
+ mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
+
+ if has_version '>=www-client/firefox-1.5'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+ xpi_install "${WORKDIR}"/firefox-beagle \
+ || die "xpi install for firefox failed!"
+ fi
+ if has_version '>=www-client/firefox-bin-1.5'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${WORKDIR}"/firefox-beagle \
+ || die "xpi install for firefox-bin failed!"
+ fi
+ fi
+
+ if use thunderbird; then
+ xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
+ || die "Unable to find Beagle Thunderbird Extension"
+ mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
+
+ if has_version '>=mail-client/thunderbird-1.5'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+ xpi_install "${WORKDIR}"/thunderbird-beagle \
+ || die "xpi install for thunderbird failed!"
+ fi
+ if has_version '>=mail-client/thunderbird-bin-1.5'; then
+ MOZILLA_FIVE_HOME="/opt/thunderbird"
+ xpi_install "${WORKDIR}"/thunderbird-beagle \
+ || die "xpi install for thunderbird-bin failed!"
+ fi
+ fi
+
+ sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
+ "${ED}"/etc/beagle/crawl-rules/crawl-*
+
+ insinto /etc/beagle/crawl-rules
+ doins "${FILESDIR}/crawl-portage"
+
+ keepdir "/usr/$(get_libdir)/beagle/Backends"
+ diropts -o beagleindex -g beagleindex
+ keepdir "/var/lib/cache/beagle/indexes"
+
+ find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+ elog "If available, Beagle greatly benefits from using certain operating"
+ elog "system features such as Extended Attributes and inotify."
+ elog
+ elog "If you want static queryables such as the portage tree and system"
+ elog "documentation you will need to edit the /etc/beagle/crawl-* files"
+ elog "and change CRAWL_ENABLE from 'no' to 'yes'."
+ elog
+ elog "For more info on how to create the optimal beagle environment, and"
+ elog "basic usage info, see the Gentoo page of the Beagle website:"
+ elog "http://www.beagle-project.org/Gentoo_Installation"
+}
diff --git a/app-misc/beanstalkd/Manifest b/app-misc/beanstalkd/Manifest
index da4136342c25..74baf30984d8 100644
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@@ -1,3 +1,2 @@
DIST beanstalkd-1.3.tar.gz 116114 RMD160 a1fa4c6aae530beeecfbe49a4e09903a58e1cc38 SHA1 ce85375605459458e0a357d9ecaeb9baeb3b9c9a SHA256 3d3eb36bf2932e6f3c4e6851420e8e579b2c4ae19f0297d8fd384c7461b4d885
DIST beanstalkd-1.4.6.tar.gz 140858 RMD160 f1641f15b32731f19a39721d8b37da940a145672 SHA1 1ee0d731e22aa45fb22e816f6e364913595f6e65 SHA256 a03aca5ccd87c2a1bb6cdaf38d3463c9f987090f4eb6cd9c7f6e03d3d54d3ac9
-DIST beanstalkd-1.5.tar.gz 61494 RMD160 a48ec645b90e003efdc2685ded65654502b12480 SHA1 95c694366b0b21230563b1e983690d572f79ce6e SHA256 ad39ccca490f58dc48df8609e2b6acfddcd200890c62f3d4b0d1ac4de713467e
diff --git a/app-misc/beanstalkd/beanstalkd-1.5.ebuild b/app-misc/beanstalkd/beanstalkd-1.5.ebuild
deleted file mode 100644
index a99d49f62acc..000000000000
--- a/app-misc/beanstalkd/beanstalkd-1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: #
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="A fast, distributed, in-memory workqueue service"
-HOMEPAGE="http://xph.us/software/beanstalkd/"
-SRC_URI="mirror://github/kr/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~mips ~sparc-fbsd ~x64-macos ~x86 ~x86-fbsd ~x86-macos"
-
-RDEPEND=""
-DEPEND="test? ( dev-lang/python )"
-
-IUSE="test"
-
-pkg_setup() {
- enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "compile failed"
-}
-
-src_install() {
- dobin beanstalkd || die
-
- DATADIR=/var/lib/${PN}
- dodir ${DATADIR} || die
- fowners beanstalk:daemon ${DATADIR}
-
- doman doc/"${PN}".1
-
- dodoc README NEWS.md doc/*.txt || die
-
- newconfd "${FILESDIR}/conf-1.4.2" beanstalkd
- newinitd "${FILESDIR}/init-1.4.6" beanstalkd
-}
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 07973e328af8..70755a98e418 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,6 +1,5 @@
-DIST byobu_4.55.orig.tar.gz 444603 RMD160 0dcfe530095e3b3fdf4217d7e945a3b7ea2c3f59 SHA1 4b3ad381cfc106e3402d280009c19476359eac6d SHA256 f5c1c6c097873a0d94f88ddf94aabd79927701676b6bd5e980a9488a16f22592
-DIST byobu_5.0.orig.tar.gz 445115 RMD160 e628ff16a1dc46ece54a578d172c1a108ace42eb SHA1 6673d28defbca05fda27c793e992075f9e663240 SHA256 1ae783a8250f846b41f7366feeb806ca94f1d90c3c025899ca1b0c1ac1d5ca67
-DIST byobu_5.1.orig.tar.gz 445194 RMD160 26bb9c52ddda1574ef38e6a8fd71a55a1fca88a9 SHA1 8b27c9028500721879cb1501bf0b8027923ba4e7 SHA256 abdbea19759505092728266d509f333948fe6862cd82db378e5d52518d2ef6fb
-DIST byobu_5.2.orig.tar.gz 334656 RMD160 6a9a006f3b44988d1d5f53c469fb79bd1dd2525e SHA1 c4e5254d35ece10189ee2ef5c9c36a364d7f29ba SHA256 ea1f3af34a74bfe16b350782c289ac6c45ccb6b596f45c47000143712937e2ff
-DIST byobu_5.4.orig.tar.gz 336895 RMD160 d80a65a7e85d5deaa1be1227a123db6aafaae86a SHA1 4d4c22fcf536d75afdde84f720b0eb363c722ad0 SHA256 2f2dd7eaf88d627853de184243d92132db437af1d1c81ac1f4a1639662fad339
-DIST byobu_5.5.orig.tar.gz 337042 RMD160 1add14a70722e3edc6542342a8d064458fef9adb SHA1 cecd4541e16b099ff27ce09ee73933d8c36bbbf9 SHA256 d79ec0a931c80b245c83df03c564fb478314ec937339313d95dc3a87b7e1a382
+DIST byobu_4.44.orig.tar.gz 397701 RMD160 e440899bd4ad20a72d80e4dac2ab8d34a142c62d SHA1 0407dccc9a7748439a5b29a8272c817066163ee9 SHA256 b26ad766b5f146f57b665d3884099047125fe1352fcb5a0b2b67dd93d1dc331a
+DIST byobu_4.47.orig.tar.gz 399931 RMD160 e0a5b8eb14d8d56bc0db90eaeb26045479b00c7e SHA1 8306c3c570346e84e383310d20ea7426f3940d8e SHA256 c3c2ab759a56f758c3932d9e2d5d7f7d23ed57d99b66f9d7666c4f7f614fc60b
+DIST byobu_4.48.orig.tar.gz 404879 RMD160 cf7c54a8b52679f2fd2e8ebf38854f419fb884d3 SHA1 55e01070049a82b292c39b28d5de7602188b1980 SHA256 3e5f4656ca7a01893edb25569b1c02a1400ae7b720b957e808560b8da6290a5c
+DIST byobu_4.52.orig.tar.gz 403607 RMD160 bcb16bf3254562c7ef65dd9130ea2cca97a7ba59 SHA1 220e8b91e736ac501f372f5005a20f8a94cb5558 SHA256 04ab143b484a351dac1eb2ff60aee819ba0c6b119f47e7473858619c528480b2
+DIST byobu_4.54.orig.tar.gz 405398 RMD160 6fcedb9755d16455d0cce9af047bda2598259fdb SHA1 3768b2078f634d56d589f8c1720afa089504981c SHA256 9f04b71f131ee471b3719efe49c7e4243623e6103864c87e0993d98516291995
diff --git a/app-misc/byobu/byobu-4.44.ebuild b/app-misc/byobu/byobu-4.44.ebuild
new file mode 100644
index 000000000000..7595d468639f
--- /dev/null
+++ b/app-misc/byobu/byobu-4.44.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.44.ebuild,v 1.1 2011/11/03 20:29:37 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+ dev-libs/newt"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/byobu/byobu-4.47.ebuild b/app-misc/byobu/byobu-4.47.ebuild
new file mode 100644
index 000000000000..aad79784efe4
--- /dev/null
+++ b/app-misc/byobu/byobu-4.47.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.47.ebuild,v 1.1 2011/11/10 21:50:47 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+ dev-libs/newt"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/byobu/byobu-4.48.ebuild b/app-misc/byobu/byobu-4.48.ebuild
new file mode 100644
index 000000000000..933f8f983070
--- /dev/null
+++ b/app-misc/byobu/byobu-4.48.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.48.ebuild,v 1.1 2011/11/16 07:07:16 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+ dev-libs/newt"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/byobu/byobu-4.52.ebuild b/app-misc/byobu/byobu-4.52.ebuild
new file mode 100644
index 000000000000..6cbd6296fb9e
--- /dev/null
+++ b/app-misc/byobu/byobu-4.52.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.52.ebuild,v 1.1 2011/12/05 20:58:03 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+ dev-libs/newt"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/byobu/byobu-4.54.ebuild b/app-misc/byobu/byobu-4.54.ebuild
new file mode 100644
index 000000000000..f47ae7828f53
--- /dev/null
+++ b/app-misc/byobu/byobu-4.54.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.54.ebuild,v 1.1 2011/12/11 08:14:44 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="https://launchpad.net/byobu"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )
+ dev-libs/newt"
+
+src_prepare() {
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for backends
+ dosym ${PN} /usr/bin/${PN}-screen
+ dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/byobu/byobu-4.55.ebuild b/app-misc/byobu/byobu-4.55.ebuild
deleted file mode 100644
index fa7da0d8ef4d..000000000000
--- a/app-misc/byobu/byobu-4.55.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-4.55.ebuild,v 1.1 2011/12/23 03:09:23 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/byobu/byobu-5.0.ebuild b/app-misc/byobu/byobu-5.0.ebuild
deleted file mode 100644
index ee2f0f2a9b82..000000000000
--- a/app-misc/byobu/byobu-5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.0.ebuild,v 1.1 2011/12/26 22:12:02 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/byobu/byobu-5.1.ebuild b/app-misc/byobu/byobu-5.1.ebuild
deleted file mode 100644
index e97f5ebb0b72..000000000000
--- a/app-misc/byobu/byobu-5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.1.ebuild,v 1.1 2012/01/04 09:17:38 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/byobu/byobu-5.2.ebuild b/app-misc/byobu/byobu-5.2.ebuild
deleted file mode 100644
index 7f432550f8a6..000000000000
--- a/app-misc/byobu/byobu-5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.2.ebuild,v 1.1 2012/01/11 23:26:58 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/byobu/byobu-5.4.ebuild b/app-misc/byobu/byobu-5.4.ebuild
deleted file mode 100644
index 7568aa681d27..000000000000
--- a/app-misc/byobu/byobu-5.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.4.ebuild,v 1.1 2012/01/17 23:42:33 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/byobu/byobu-5.5.ebuild b/app-misc/byobu/byobu-5.5.ebuild
deleted file mode 100644
index e38caa4eef09..000000000000
--- a/app-misc/byobu/byobu-5.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.5.ebuild,v 1.1 2012/01/21 06:04:11 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="https://launchpad.net/byobu"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-misc/screen app-misc/tmux )
- dev-libs/newt"
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Create symlinks for backends
- dosym ${PN} /usr/bin/${PN}-screen
- dosym ${PN} /usr/bin/${PN}-tmux
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20111025.ebuild b/app-misc/ca-certificates/ca-certificates-20111025.ebuild
index a7ab7a38ce72..9f20919baf93 100644
--- a/app-misc/ca-certificates/ca-certificates-20111025.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20111025.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20111025.ebuild,v 1.9 2012/01/25 05:17:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20111025.ebuild,v 1.3 2011/12/12 16:44:06 ago Exp $
EAPI="3"
@@ -13,12 +13,11 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_a
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
# platforms like AIX don't have a good ar
-DEPEND="kernel_AIX? ( app-arch/deb2targz )
- !=x11-libs/gtk+-2.4:2 )
- gnome? ( >=gnome-base/gnome-panel-2.10 )
- sys-apps/pciutils
- nls? ( sys-devel/gettext )
- >=app-misc/ddccontrol-db-20060730"
-DEPEND="${RDEPEND}
- dev-perl/XML-Parser
- dev-util/intltool
- doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
- >=dev-libs/libxslt-1.1.6
- app-text/htmltidy )
- sys-kernel/linux-headers"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-pciutils-libz.patch
- epatch "${FILESDIR}"/${P}-automake.patch
- epatch "${FILESDIR}"/${P}-no-ddcpci.patch
- sed -i '/^htmldir/d' doc/Makefile.am || die
-
- # ppc/ppc64 do not have inb/outb/ioperm
- # they also do not have (sys|asm)/io.h
- if ! use amd64 && ! use x86 ; then
- local card
- for card in sis intel810 ; do
- sed -r -i \
- -e "/${card}.Po/d" \
- -e "s~${card}[^[:space:]]*~ ~g" \
- src/ddcpci/Makefile.{am,in}
- done
- sed -i \
- -e '/sis_/d' \
- -e '/i810_/d' \
- src/ddcpci/main.c
- fi
-
- ## Save for a rainy day or future patching
- eautoreconf
- intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
- econf \
- --htmldir='$(datarootdir)'/doc/${PF}/html \
- $(use_enable ddcpci) \
- $(use_enable doc) \
- $(use_enable gnome gnome-applet) \
- $(use_enable gtk gnome) \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
deleted file mode 100644
index 005efc51c636..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-taken from upstream git
-
-From 1c5eaf9ca5cb03d4124d54b4178d4a2a47a724d7 Mon Sep 17 00:00:00 2001
-From: Stanislav Brabec
-Date: Sun, 10 Oct 2010 18:29:16 +0200
-Subject: [PATCH] Applied ddccontrol-libexecdir.patch
-
----
- .../GNOME_ddcc-applet.server.in.in | 2 +-
- src/gnome-ddcc-applet/Makefile.am | 12 +++++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-index f3a28ba..89a6615 100644
---- a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-+++ b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
-@@ -2,7 +2,7 @@
-
-
-+ location="@appletdir@/ddcc-applet">
-
-
-
-diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
-index d16fbd0..6218efa 100644
---- a/src/gnome-ddcc-applet/Makefile.am
-+++ b/src/gnome-ddcc-applet/Makefile.am
-@@ -6,9 +6,10 @@ DDCC_LDADD = ../lib/libddccontrol.la
-
- EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
-
--pkglib_PROGRAMS = ddcc-applet
--ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
-+applet_PROGRAMS = ddcc-applet
-+appletdir = $(libexecdir)
-
-+ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
- ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
- AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
-
-@@ -18,10 +19,11 @@ serverdir = $(libdir)/bonobo/servers
- server_in_files = GNOME_ddcc-applet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
-
--$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-- sed -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@
-+$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
-+ $(AM_V_GEN)sed \
-+ -e "s|\@appletdir\@|$(appletdir)|" \
-+ $< > $@
-
- CLEANFILES = $(server_in_files) $(server_DATA)
-
- @INTLTOOL_SERVER_RULE@
--
---
-1.7.4.1
-
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
deleted file mode 100644
index 5ecb90f12a82..000000000000
--- a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix building when ddcpci is disabled. just a hack while we sort
-out the real fix upstream.
-
---- a/src/gddccontrol/main.c
-+++ b/src/gddccontrol/main.c
-@@ -24,7 +24,7 @@
- #include
- #include
-
--#include "ddcpci-ipc.h"
-+#define IDLE_TIMEOUT 60
-
- #include "notebook.h"
-
diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index ba22cd1648e4..2b6ad1725fe6 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -4,7 +4,11 @@
robbat2@gentoo.org
-
- enable direct PCI memory access (the setuid ddcpci util)
-
+
+ nicolas@boichat.ch
+
+ Upstream developer. Please CC on all bugs involving ddccontrol
+ and ddccontrol-db.
+
+
diff --git a/app-misc/delay/delay-1.6-r1.ebuild b/app-misc/delay/delay-1.6-r1.ebuild
index ae5c8fbba63b..1523f2922165 100644
--- a/app-misc/delay/delay-1.6-r1.ebuild
+++ b/app-misc/delay/delay-1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r1.ebuild,v 1.5 2012/02/01 17:30:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r1.ebuild,v 1.1 2011/08/14 14:36:54 jlec Exp $
EAPI=4
@@ -12,12 +12,9 @@ SRC_URI="http://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
IUSE=""
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
src_prepare() {
sed -i -e "s/#include /&\n#include /" delay.c || die
tc-export CC
diff --git a/app-misc/digitemp/digitemp-3.3.2.ebuild b/app-misc/digitemp/digitemp-3.3.2.ebuild
index 5d31a758a37e..2790f1ef18d9 100644
--- a/app-misc/digitemp/digitemp-3.3.2.ebuild
+++ b/app-misc/digitemp/digitemp-3.3.2.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.3.2.ebuild,v 1.8 2012/01/09 07:15:10 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.3.2.ebuild,v 1.7 2007/04/12 20:42:47 opfer Exp $
DESCRIPTION="Temperature logging and reporting using Dallas Semiconductor's iButtons and 1-Wire protocol"
HOMEPAGE="http://www.digitemp.com http://www.ibutton.com"
@@ -13,7 +11,7 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-DEPEND="ds2490? ( virtual/libusb:0 )"
+DEPEND="ds2490? ( >=dev-libs/libusb-0.1.10a )"
targets() {
# default is to compile to the ds9097u.
diff --git a/app-misc/digitemp/digitemp-3.5.0-r1.ebuild b/app-misc/digitemp/digitemp-3.5.0-r1.ebuild
index fbac66e8929f..4e7786d85f6c 100644
--- a/app-misc/digitemp/digitemp-3.5.0-r1.ebuild
+++ b/app-misc/digitemp/digitemp-3.5.0-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.5.0-r1.ebuild,v 1.2 2012/01/09 07:15:10 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.5.0-r1.ebuild,v 1.1 2010/07/19 00:25:42 hwoarang Exp $
inherit toolchain-funcs
@@ -15,7 +13,7 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-DEPEND="ds2490? ( virtual/libusb:0 )"
+DEPEND="ds2490? ( >=dev-libs/libusb-0.1.10a )"
targets() {
# default is to compile to the ds9097u.
diff --git a/app-misc/digitemp/digitemp-3.5.0.ebuild b/app-misc/digitemp/digitemp-3.5.0.ebuild
index bf6ab02b5667..171b471716bb 100644
--- a/app-misc/digitemp/digitemp-3.5.0.ebuild
+++ b/app-misc/digitemp/digitemp-3.5.0.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.5.0.ebuild,v 1.2 2012/01/09 07:15:10 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.5.0.ebuild,v 1.1 2007/12/07 11:03:41 wschlich Exp $
DESCRIPTION="Temperature logging and reporting using Dallas Semiconductor's iButtons and 1-Wire protocol"
HOMEPAGE="http://www.digitemp.com/ http://www.ibutton.com/"
@@ -13,7 +11,7 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-DEPEND="ds2490? ( virtual/libusb:0 )"
+DEPEND="ds2490? ( >=dev-libs/libusb-0.1.10a )"
targets() {
# default is to compile to the ds9097u.
diff --git a/app-misc/dvtm/dvtm-0.6.ebuild b/app-misc/dvtm/dvtm-0.6.ebuild
index 8772486f2120..aafd8a7e998d 100644
--- a/app-misc/dvtm/dvtm-0.6.ebuild
+++ b/app-misc/dvtm/dvtm-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.6.ebuild,v 1.4 2012/01/04 05:39:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.6.ebuild,v 1.3 2011/01/15 14:26:25 maekke Exp $
EAPI=3
@@ -34,7 +34,7 @@ src_prepare() {
-e '/strip/d' \
Makefile || die "sed Makefile failed"
- restore_config config.h
+ use savedconfig && restore_config config.h
}
src_compile() {
diff --git a/app-misc/dvtm/dvtm-0.7.ebuild b/app-misc/dvtm/dvtm-0.7.ebuild
index b8d1eec9158d..1b934980fc2d 100644
--- a/app-misc/dvtm/dvtm-0.7.ebuild
+++ b/app-misc/dvtm/dvtm-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.7.ebuild,v 1.4 2012/01/15 15:55:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.7.ebuild,v 1.1 2011/10/27 01:10:54 chithanh Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="unicode"
DEPEND="sys-libs/ncurses[unicode?]"
@@ -34,7 +34,7 @@ src_prepare() {
-e '/strip/d' \
Makefile || die "sed Makefile failed"
- restore_config config.h
+ use savedconfig && restore_config config.h
}
src_compile() {
diff --git a/app-misc/editor-wrapper/editor-wrapper-2.ebuild b/app-misc/editor-wrapper/editor-wrapper-2.ebuild
new file mode 100644
index 000000000000..bb342d7de7c9
--- /dev/null
+++ b/app-misc/editor-wrapper/editor-wrapper-2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-2.ebuild,v 1.1 2011/08/11 10:40:41 ulm Exp $
+
+DESCRIPTION="Wrapper script that will execute EDITOR"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_install() {
+ exeinto /usr/libexec
+ newexe "${FILESDIR}/${P}.sh" gentoo-editor || die
+}
diff --git a/app-misc/editor-wrapper/editor-wrapper-3.ebuild b/app-misc/editor-wrapper/editor-wrapper-3.ebuild
new file mode 100644
index 000000000000..5d23db138a8e
--- /dev/null
+++ b/app-misc/editor-wrapper/editor-wrapper-3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-3.ebuild,v 1.4 2011/08/21 13:19:41 nixnut Exp $
+
+EAPI=4
+
+DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+ sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
+ sed -e 's/@VAR@/PAGER/g' "${FILESDIR}/${P}.sh" >pager || die
+}
+
+src_install() {
+ exeinto /usr/libexec
+ doexe editor pager
+ # backwards compatibility
+ dosym editor /usr/libexec/gentoo-editor
+}
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index 2a00bf913b71..5fa9980f868c 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.7 2011/12/29 21:37:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.5 2011/09/03 16:01:26 armin76 Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
S="${WORKDIR}"
@@ -23,4 +23,6 @@ src_prepare() {
src_install() {
exeinto /usr/libexec
doexe editor pager
+ # backwards compatibility
+ dosym editor /usr/libexec/gentoo-editor
}
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-2.sh b/app-misc/editor-wrapper/files/editor-wrapper-2.sh
new file mode 100644
index 000000000000..dc8e065e0f29
--- /dev/null
+++ b/app-misc/editor-wrapper/files/editor-wrapper-2.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the MIT/X11 license
+
+# Editor wrapper script, executes ${EDITOR} with arguments $@
+
+if [ -z "${EDITOR}" ]; then
+ # Try to get EDITOR from system profile
+ EDITOR=$(. /etc/profile &>/dev/null; echo "${EDITOR}")
+fi
+
+if [ -z "${EDITOR}" ]; then
+ echo "$0: The EDITOR variable must be set" >&2
+ exit 1
+fi
+
+exec ${EDITOR} "$@"
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-3.sh b/app-misc/editor-wrapper/files/editor-wrapper-3.sh
new file mode 100644
index 000000000000..34520ffef78a
--- /dev/null
+++ b/app-misc/editor-wrapper/files/editor-wrapper-3.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the MIT/X11 license
+
+# Wrapper script, executes ${@VAR@} with arguments $@
+
+if [ -z "${@VAR@}" ]; then
+ # Try to get @VAR@ from system profile
+ @VAR@=$(. /etc/profile &>/dev/null; echo "${@VAR@}")
+fi
+
+if [ -z "${@VAR@}" ]; then
+ echo "$0: The @VAR@ variable must be set" >&2
+ exit 1
+fi
+
+exec ${@VAR@} "$@"
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
index e10437ebc3e9..c2dc53d997d2 100644
--- a/app-misc/email2trac/Manifest
+++ b/app-misc/email2trac/Manifest
@@ -1,3 +1,2 @@
DIST email2trac-1.6.0.tar.gz 95718 RMD160 70f24b880c4abc3984e267b4f90be68c6a8ef8a2 SHA1 f10c397349fbf0ce9725051da1fc29a2918138bb SHA256 9210984b289ed55a8c4a1e8145bd1425ac6b50829049f2e78837308251b14e6c
DIST email2trac-2.4.2.tar.gz 101547 RMD160 99693d47b2b5b56e7d6f602263b7469087f9eda2 SHA1 f631c47aad86d14719d6d0107096a632fa65abe1 SHA256 8ec46a676e5b3a2e8b1720138892d01bd875f6ba0981c7670a609e4e3d546d1e
-DIST email2trac-2.4.7.tar.gz 107343 RMD160 8921dd1905c486be3a833f0cb282ad2debc82072 SHA1 98e6d9ff0ddd9bee7157a86306e8abc0d9696fa1 SHA256 87fdb57d88441632e58b000b88bafd676e12940e19cd6d22caa99c0ea438620c
diff --git a/app-misc/email2trac/email2trac-2.4.7.ebuild b/app-misc/email2trac/email2trac-2.4.7.ebuild
deleted file mode 100644
index f140a4a15273..000000000000
--- a/app-misc/email2trac/email2trac-2.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/email2trac/email2trac-2.4.7.ebuild,v 1.1 2012/01/03 02:06:45 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Utilites to convert emails into trac objects"
-HOMEPAGE="https://subtrac.sara.nl/oss/email2trac/"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="=www-apps/trac-0.12*"
-
-pkg_setup() {
- einfo "You can set the following variables in make.conf:"
- einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
- einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
-
- python_pkg_setup
-}
-
-src_prepare() {
- sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
- -e "s:\$(CC):& ${LDFLAGS} :" \
- Makefile.in
-}
-
-src_configure() {
- econf --sysconfdir=/etc/${PN}/ \
- --with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
- --with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
- python_convert_shebangs -r 2 "${D}"
-}
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 9d60d29334b0..6d027bffbfe2 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,2 +1,3 @@
+DIST emelfm2-0.7.2.tar.bz2 1053920 RMD160 0322db785ed0fb120b9d752de0cc5043d3165f7d SHA1 26089a11ca863d5728ac759cecf5306f3eae2bba SHA256 0e655d8212a3f3002a337863b2e841f4cedfef1dc704939535278392c3cfe912
+DIST emelfm2-0.7.4.tar.bz2 1069514 RMD160 18a9a1fc4be17dd37d4f64b3950ba9b2c9f0d50a SHA1 43ac0e2030cb270a2df405cfc937f83848bfbce4 SHA256 fa14f7d42c693b70ee2b6b3effef8cc571c19ae38ce1df1cbb6da90d5e95513c
DIST emelfm2-0.7.5.tar.bz2 1055510 RMD160 ff6913eac2f0cec9be72a943a9a02715bb2a2bb7 SHA1 b3aa34d2e9281d761fbfc96acb3eb6f297590c4e SHA256 6dcd2ca2695f0ceb442a8390558580a19d4fb66d1d89e2b103696a6d4e68ac2c
-DIST emelfm2-0.8.0.tar.bz2 1085861 RMD160 ba20d1073a2a3597f975d7006d3963df1e81e6e5 SHA1 699ddb8854bea97ce908e2a8984070caf946103b SHA256 85baadcf3d52d77eb8a44a325a444d52cf25164b1151c641dc2b36eb68e333e3
diff --git a/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild b/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..d3e9c56b3dc4
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild,v 1.10 2011/10/27 05:53:51 tetromino Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="http://emelfm2.net/"
+SRC_URI="http://${PN}.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="acl fam gimp kernel_linux nls policykit spell udev"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+ acl? ( sys-apps/acl )
+ !kernel_linux? ( fam? ( virtual/fam ) )
+ gimp? ( media-gfx/gimp )
+ policykit? ( sys-auth/polkit )
+ spell? ( app-text/gtkspell:2 )
+ udev? ( sys-fs/udisks
+ dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+pkg_setup() {
+ myconf="DOCS_VERSION=1 WITH_TRANSPARENCY=1 STRIP=0"
+
+ use udev && myconf="${myconf} WITH_DEVKIT=1"
+ use gimp && myconf="${myconf} WITH_THUMBS=1"
+ use acl && myconf="${myconf} WITH_ACL=1"
+ use kernel_linux && myconf="${myconf} WITH_KERNELFAM=1 USE_INOTIFY=1"
+ use spell && myconf="${myconf} EDITOR_SPELLCHECK=1"
+ use nls || myconf="${myconf} I18N=0"
+ use policykit && myconf="${myconf} WITH_POLKIT=1"
+
+ if ! use kernel_linux && use fam; then
+ if has_version "app-admin/gamin"; then
+ myconf="${myconf} USE_GAMIN=1"
+ else
+ myconf="${myconf} USE_FAM=1"
+ fi
+ fi
+}
+
+src_compile() {
+ tc-export CC
+ emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
+ ${myconf} || die
+}
+
+src_install() {
+ emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
+ ${myconf} install || die
+ newicon icons/${PN}_48.png ${PN}.png
+ prepalldocs
+}
diff --git a/app-misc/emelfm2/emelfm2-0.7.4.ebuild b/app-misc/emelfm2/emelfm2-0.7.4.ebuild
new file mode 100644
index 000000000000..ae85b4903c7b
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.7.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.4.ebuild,v 1.3 2011/10/27 05:53:51 tetromino Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A file manager that implements the popular two-pane design"
+HOMEPAGE="http://emelfm2.net/"
+SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl fam gimp kernel_linux nls policykit spell udev"
+
+RDEPEND=">=dev-libs/glib-2.22:2
+ >=x11-libs/gtk+-2.12:2
+ acl? ( sys-apps/acl )
+ gimp? ( media-gfx/gimp )
+ policykit? ( sys-auth/polkit )
+ spell? ( app-text/gtkspell:2 )
+ udev? ( sys-fs/udisks
+ dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+pkg_setup() {
+ emel_use() {
+ use ${1} && echo "${2}=1" || echo "${2}=0"
+ }
+
+ myemelconf=(
+ DOCS_VERSION=1
+ $(emel_use nls I18N)
+ WITH_TRANSPARENCY=1
+ $(emel_use kernel_linux WITH_KERNELFAM)
+ $(emel_use spell EDITOR_SPELLCHECK)
+ $(emel_use udev WITH_DEVKIT)
+ $(emel_use gimp WITH_THUMBS)
+ $(emel_use acl WITH_ACL)
+ $(emel_use policykit WITH_POLKIT)
+ STRIP=0
+ )
+}
+
+src_compile() {
+ tc-export CC
+ emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
+ ${myemelconf[@]} || die
+}
+
+src_install() {
+ emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
+ ${myemelconf[@]} install || die
+ newicon icons/${PN}_48.png ${PN}.png
+ prepalldocs
+}
diff --git a/app-misc/emelfm2/emelfm2-0.8.0.ebuild b/app-misc/emelfm2/emelfm2-0.8.0.ebuild
deleted file mode 100644
index 123c2cfb626d..000000000000
--- a/app-misc/emelfm2/emelfm2-0.8.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.8.0.ebuild,v 1.1 2011/12/29 20:10:20 jer Exp $
-
-EAPI=4
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="http://emelfm2.net/"
-SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl fam gimp kernel_linux nls policykit spell udev"
-
-COMMON_DEPEND=">=dev-libs/glib-2.26:2
- >=x11-libs/gtk+-2.12:2
- acl? ( sys-apps/acl )
- gimp? ( media-gfx/gimp )
- policykit? ( sys-auth/polkit )
- spell? ( >=app-text/gtkspell-2.0.14:2 )"
-RDEPEND="${COMMON_DEPEND}
- udev? ( sys-fs/udisks )"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-pkg_setup() {
- emel_use() {
- use ${1} && echo "${2}=1" || echo "${2}=0"
- }
-
- #363813
- myemelconf=(
- GTK3=0
- DOCS_VERSION=1
- $(emel_use nls I18N)
- WITH_TRANSPARENCY=1
- $(emel_use kernel_linux WITH_KERNELFAM)
- $(emel_use spell EDITOR_SPELLCHECK)
- $(emel_use udev WITH_DEVKIT)
- $(emel_use gimp WITH_THUMBS)
- $(emel_use acl WITH_ACL)
- $(emel_use policykit WITH_POLKIT)
- STRIP=0
- )
-}
-
-src_prepare() {
- sed -i Makefile -e 's:dbus-glib-1::' || die
-}
-
-src_compile() {
- tc-export CC
- emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
- ${myemelconf[@]}
-}
-
-src_install() {
- emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
- ${myemelconf[@]} install $( use nls && echo install_i18n )
- newicon icons/${PN}_48.png ${PN}.png
-}
diff --git a/app-misc/enum/Manifest b/app-misc/enum/Manifest
index 0df95354ecfe..3962c0c22363 100644
--- a/app-misc/enum/Manifest
+++ b/app-misc/enum/Manifest
@@ -1,4 +1,3 @@
DIST enum-1.0.1.tar.bz2 99423 RMD160 89440851a7cbaf164496f530fc7174ad76b9cf5e SHA1 0b7c479b97cce8c2798d2a454082f2bcb3749331 SHA256 ac3a7f8ed79e29c58b686b43be82548e85dc7d2487c5984ea26d6304c010ddde
DIST enum-1.0.2.tar.bz2 99527 RMD160 68b8c77678e13c8452747118e3b07c59539c1e21 SHA1 a4c39ece6024e79b1b26dc0ac1c75482be1de4b9 SHA256 ff600b149942d706347bfc02e893be2a50fbdf2acac090666ca8ec708151af14
DIST enum-1.0.3.tar.bz2 99657 RMD160 03a4041f3381efa1e65eaf915e51f4ad90ab6e40 SHA1 6eb3f8fe6d2f5c90ef161f36b9c9d23faec68df2 SHA256 480b428c894f69563ec9f25bee0ed154697065dfbc332ca3cabb7e0f2ee6f3fe
-DIST enum-1.1.tar.bz2 100815 RMD160 00d18a600cafc2d3e60314e37a4c69f434b6bed3 SHA1 180f577436886978a68544c2591c344e5864a7c5 SHA256 9ba7fda59f183ca4dfd4b5f6654af8a0d36bbe3a846a16be764d8a32869ee480
diff --git a/app-misc/enum/enum-1.1.ebuild b/app-misc/enum/enum-1.1.ebuild
deleted file mode 100644
index 7144840dd876..000000000000
--- a/app-misc/enum/enum-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/enum/enum-1.1.ebuild,v 1.1 2012/02/02 20:23:00 sping Exp $
-
-EAPI="2"
-
-DESCRIPTION="Replacement for GNU seq and BSD jot"
-HOMEPAGE="https://fedorahosted.org/enum/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- # Remove bundled getopt
- rm -R thirdparty || die
-}
-
-src_configure() {
- econf --disable-doc-rebuild --disable-dependency-tracking
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die 'emake install'
- dodoc ChangeLog || die 'dodoc failed'
-}
diff --git a/app-misc/gcstar/gcstar-1.6.2.ebuild b/app-misc/gcstar/gcstar-1.6.2.ebuild
index 98dc58b04d96..e394194eae39 100644
--- a/app-misc/gcstar/gcstar-1.6.2.ebuild
+++ b/app-misc/gcstar/gcstar-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcstar/gcstar-1.6.2.ebuild,v 1.2 2012/01/07 12:20:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcstar/gcstar-1.6.2.ebuild,v 1.1 2011/11/20 06:51:05 tetromino Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/gcstar/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="cddb gnome mp3 spell stats tellico vorbis"
RDEPEND="dev-lang/perl
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index 505bfea6720a..9e27d61d4f5d 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3-r1.ebuild,v 1.3 2012/02/06 13:32:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3-r1.ebuild,v 1.1 2010/12/30 18:18:46 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
src_prepare() {
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index f0ecfd19493c..2c03cc912855 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1 +1,4 @@
+DIST gentoo-0.15.6.tar.gz 1467732 RMD160 8baf1db8926211dc2839484cdce48393b2bacbc6 SHA1 9de0c09aa03babeee714dcc99b1a594035426379 SHA256 c3108bd7bcd6dc0f19c0f30dab4f6ce0f36d2d020048899c74d5667afe439d9d
+DIST gentoo-0.19.10.tar.gz 1530682 RMD160 bbbcd6ab9222eaf379c3e108713f1e4242f1135b SHA1 f4ce0de8d952e28a714c95e195789ebf82d455ab SHA256 c0e5e0be1f8cc742d982eacf93824eba65e4ba3874850ab8d338759358c6208b
DIST gentoo-0.19.12.tar.gz 1538940 RMD160 c63d8fae26b37dfca52686e0848ef27a1d9a9725 SHA1 fd98fa39c977175ca015c79659a7ef817ed26dfd SHA256 a19489210752c3e230c70a43d673a9b3479b06153909aefbe91469b08c5798e0
+DIST gentoo-0.19.9.tar.gz 1532899 RMD160 db3905fe9f98a9df2db9479524b70d67c5fb4435 SHA1 61bd0bc02abadf6e001d80de972bdfd0c6d6b1c1 SHA256 f970c00fad74328b461102799b64f1d9ffc1fc6f62044c2b092fca32b7359f48
diff --git a/app-misc/gentoo/gentoo-0.15.6.ebuild b/app-misc/gentoo/gentoo-0.15.6.ebuild
new file mode 100644
index 000000000000..80d61444e148
--- /dev/null
+++ b/app-misc/gentoo/gentoo-0.15.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.15.6.ebuild,v 1.8 2010/08/13 12:46:50 josejx Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A modern GTK+ based filemanager for any WM"
+HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="fam nls"
+
+RDEPEND="x11-libs/gtk+:2
+ >=dev-libs/glib-2.14:2
+ fam? ( virtual/fam )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i \
+ -e '/GTK_DISABLE_DEPRECATED/d' \
+ src/odmultibutton.c || die
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --sysconfdir=/etc/gentoo \
+ $(use_enable nls) \
+ $(use_enable fam)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc AUTHORS BUGS ChangeLog CONFIG-CHANGES CREDITS NEWS \
+ README TODO docs/{FAQ,menus.txt}
+ dohtml -r docs/{images,config,*.{html,css}}
+ newman docs/gentoo.1x gentoo.1
+ docinto scratch
+ dodoc docs/scratch/*
+
+ make_desktop_entry ${PN} Gentoo \
+ /usr/share/${PN}/icons/${PN}.png \
+ "System;FileTools;FileManager"
+}
diff --git a/app-misc/gentoo/gentoo-0.19.10.ebuild b/app-misc/gentoo/gentoo-0.19.10.ebuild
new file mode 100644
index 000000000000..d0c587009a53
--- /dev/null
+++ b/app-misc/gentoo/gentoo-0.19.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.10.ebuild,v 1.7 2011/11/07 00:30:24 ranger Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A modern GTK+ based filemanager for any WM"
+HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.24:2
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i \
+ -e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
+ gentoorc.in || die "Fixing icon path failed."
+ sed -i \
+ -e '/GTK_DISABLE_DEPRECATED/ d' \
+ -e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
+ configure.in || die "Fixing configure.in failed" #357343
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --sysconfdir=/etc/gentoo \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS \
+ README TODO docs/{FAQ,menus.txt}
+ dohtml -r docs/{images,config,*.{html,css}}
+ newman docs/gentoo.1x gentoo.1
+ docinto scratch
+ dodoc docs/scratch/*
+
+ make_desktop_entry ${PN} Gentoo \
+ /usr/share/${PN}/icons/${PN}.png \
+ "System;FileTools;FileManager"
+}
diff --git a/app-misc/gentoo/gentoo-0.19.12.ebuild b/app-misc/gentoo/gentoo-0.19.12.ebuild
index efd6de6b8e7e..1d2ee22c1a44 100644
--- a/app-misc/gentoo/gentoo-0.19.12.ebuild
+++ b/app-misc/gentoo/gentoo-0.19.12.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.12.ebuild,v 1.7 2012/01/31 19:41:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.12.ebuild,v 1.2 2011/10/13 16:02:41 jer Exp $
EAPI=4
+
inherit autotools eutils
DESCRIPTION="A modern GTK+ based filemanager for any WM"
@@ -11,11 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="nls"
RDEPEND=">=x11-libs/gtk+-2.24:2
- >=dev-libs/glib-2
+ dev-libs/glib:2
x11-libs/gdk-pixbuf
x11-libs/pango"
DEPEND="${RDEPEND}
@@ -24,16 +25,17 @@ DEPEND="${RDEPEND}
src_prepare() {
sed -i \
-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
- gentoorc.in || die
+ gentoorc.in || die "Fixing icon path failed."
sed -i \
-e '/GTK_DISABLE_DEPRECATED/ d' \
-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
- configure.in || die #357343
+ configure.in || die "Fixing configure.in failed" #357343
eautoreconf
}
src_configure() {
econf \
+ --disable-dependency-tracking \
--sysconfdir=/etc/gentoo \
$(use_enable nls)
}
diff --git a/app-misc/gentoo/gentoo-0.19.9.ebuild b/app-misc/gentoo/gentoo-0.19.9.ebuild
new file mode 100644
index 000000000000..1edd1fac807b
--- /dev/null
+++ b/app-misc/gentoo/gentoo-0.19.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.9.ebuild,v 1.3 2011/05/02 16:46:15 signals Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A modern GTK+ based filemanager for any WM"
+HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ sed -i \
+ -e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
+ gentoorc.in || die "Fixing icon path failed."
+ sed -i \
+ -e '/GTK_DISABLE_DEPRECATED/ d' \
+ configure.in || die "Fixing configure.in failed" #357343
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --sysconfdir=/etc/gentoo \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS \
+ README TODO docs/{FAQ,menus.txt}
+ dohtml -r docs/{images,config,*.{html,css}}
+ newman docs/gentoo.1x gentoo.1
+ docinto scratch
+ dodoc docs/scratch/*
+
+ make_desktop_entry ${PN} Gentoo \
+ /usr/share/${PN}/icons/${PN}.png \
+ "System;FileTools;FileManager"
+}
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
index 1ccf96f7f78b..6d6696991014 100644
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.7 2012/01/28 14:50:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.5 2011/12/10 10:26:51 hwoarang Exp $
EAPI=4
inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
skyhook yahoo-geo"
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index e0e6d1dfcf6c..574895eaa57e 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,3 @@
+DIST gnote-0.7.3.tar.bz2 1606926 RMD160 0c85e470ee5b7685ef3c8dc774f32ee77228a7e7 SHA1 86c06cc7cc90ced886ff76d468ccd2bed16cee55 SHA256 4853315711baf7647cdae4c2f7d23e22e2b13322605efe3dd98796a06f928321
DIST gnote-0.7.4.tar.bz2 1787015 RMD160 b219beda055d50330e248c6109254af7541772dc SHA1 3cda0d7b0c40f2baa5066b7d11b2dce6d1cc8604 SHA256 19bf64397278b85703979fd4943692f6c44579e597bad27acf04a64d6813e6f2
DIST gnote-0.8.1.tar.xz 1823568 RMD160 2145407d1e440c0ff8d9be65e0950accd0239061 SHA1 c048bd669f4cc9e94143dd2fa43d459d1bd73166 SHA256 d20ad13814e016679e74aa51e2619000bd4468c13d219c760daa633e398bea43
-DIST gnote-0.8.2.tar.xz 2322160 RMD160 22dce96c10408280817512633146fd0ce3983fa0 SHA1 b74728132d4a52ba5f1e33a8ef281f2d06ecc107 SHA256 7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992
diff --git a/app-misc/gnote/gnote-0.7.3.ebuild b/app-misc/gnote/gnote-0.7.3.ebuild
new file mode 100644
index 000000000000..7f4ff50acf01
--- /dev/null
+++ b/app-misc/gnote/gnote-0.7.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.3.ebuild,v 1.3 2011/10/27 05:58:50 tetromino Exp $
+
+EAPI="3"
+
+inherit gnome2
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="http://live.gnome.org/Gnote"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="applet debug" # dbus
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+ >=dev-cpp/glibmm-2:2
+ >=dev-cpp/gtkmm-2.12:2.4
+ >=dev-libs/libxml2-2:2
+ dev-libs/libxslt
+ >=gnome-base/gconf-2:2
+ >=dev-libs/libpcre-7.8:3[cxx]
+ >=app-text/gtkspell-2.0.9:2
+ >=dev-libs/boost-1.34
+ sys-libs/e2fsprogs-libs
+ applet? (
+ >=gnome-base/gnome-panel-2
+ >=dev-cpp/libpanelappletmm-2.26:2.6 )"
+# Build with dbus is currently not implemented
+# dbus? ( >=dev-libs/dbus-glib-0.70 )"
+DEPEND="${DEPEND}
+ dev-util/pkgconfig
+ >=dev-util/intltool-0.35.0
+ app-text/gnome-doc-utils
+ app-text/docbook-xml-dtd:4.1.2"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ G2CONF="${G2CONF}
+ --disable-dbus
+ --disable-static
+ $(use_enable applet)
+ $(use_enable debug)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Do not set idiotic defines in a released tarball, bug #311979
+ sed 's/-DG.*_DISABLE_DEPRECATED//g' -i libtomboy/Makefile.am \
+ libtomboy/Makefile.in || die "sed failed"
+}
+
+src_install() {
+ gnome2_src_install
+ find "${ED}" -name "*.la" -delete || die "la file removal failed"
+}
diff --git a/app-misc/gnote/gnote-0.8.2.ebuild b/app-misc/gnote/gnote-0.8.2.ebuild
deleted file mode 100644
index e3e440937ffc..000000000000
--- a/app-misc/gnote/gnote-0.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.1 2012/01/15 01:50:12 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="applet debug"
-
-RDEPEND=">=x11-libs/gtk+-3.0:3
- >=dev-cpp/glibmm-2.28:2
- >=dev-cpp/gtkmm-3.0:3.0
- >=dev-libs/libxml2-2:2
- dev-libs/libxslt
- >=dev-libs/libpcre-7.8:3[cxx]
- >=dev-libs/boost-1.34
- >=sys-apps/util-linux-2.16
- applet? ( >=gnome-base/gnome-panel-3 )"
-DEPEND="${DEPEND}
- dev-util/pkgconfig
- >=dev-util/intltool-0.35.0
- app-text/gnome-doc-utils
- app-text/docbook-xml-dtd:4.1.2"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- $(use_enable applet)
- $(use_enable debug)"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Do not set idiotic defines in a released tarball, bug #311979
- sed 's/-DG.*_DISABLE_DEPRECATED//g' -i libtomboy/Makefile.* ||
- die "sed failed"
-}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index ceb46af208b9..ff16235006c2 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,2 +1 @@
DIST golly-2.2-src.tar.gz 2535583 RMD160 81c00b10c7b53b0e0ada89811a51783e9ab0d82b SHA1 decdfed9929ce144eea54e7ecdabaa8cdf528354 SHA256 cf7fbfd3df3c4cefcd7c4cc881011b2128f7255aacb6c79e93b7f10d3640abc2
-DIST golly-2.3-src.tar.gz 2613073 RMD160 471a98f9158d24820535112c940f99f17b808b32 SHA1 6bd8c7afa817bc79a6c64f28f2ea8af526847a0b SHA256 a1bfa412cd008e7286bc3d50decac65583720676b596bfbf5333306273a6218b
diff --git a/app-misc/golly/files/golly-separate-data-directory.patch b/app-misc/golly/files/golly-separate-data-directory.patch
new file mode 100644
index 000000000000..abbaedf476f7
--- /dev/null
+++ b/app-misc/golly/files/golly-separate-data-directory.patch
@@ -0,0 +1,62 @@
+--- golly-2.1-src.old/wxgolly.cpp 2009-09-07 02:35:55.000000000 +0200
++++ golly-2.1-src.new/wxgolly.cpp 2010-06-08 17:34:51.000000000 +0200
+@@ -195,42 +195,6 @@
+
+ // -----------------------------------------------------------------------------
+
+-void SetAppDirectory(const char* argv0)
+-{
+- #ifdef __WXMSW__
+- // on Windows we need to reset current directory to app directory if user
+- // dropped file from somewhere else onto app to start it up (otherwise we
+- // can't find Help files)
+- wxString appdir = wxStandardPaths::Get().GetDataDir();
+- wxString currdir = wxGetCwd();
+- if ( currdir.CmpNoCase(appdir) != 0 )
+- wxSetWorkingDirectory(appdir);
+- // avoid VC++ warning
+- wxUnusedVar(argv0);
+- #elif defined(__WXMAC__)
+- // wxMac has set current directory to location of .app bundle so no need
+- // to do anything
+- #else // assume Unix
+- // user might have started app from a different directory so find
+- // last "/" in argv0 and change cwd if "/" isn't part of "./" prefix
+- unsigned int pos = strlen(argv0);
+- while (pos > 0) {
+- pos--;
+- if (argv0[pos] == '/') break;
+- }
+- if ( pos > 0 && !(pos == 1 && argv0[0] == '.') ) {
+- char appdir[2048];
+- if (pos < sizeof(appdir)) {
+- strncpy(appdir, argv0, pos);
+- appdir[pos] = 0;
+- wxSetWorkingDirectory(wxString(appdir,wxConvLocal));
+- }
+- }
+- #endif
+-}
+-
+-// -----------------------------------------------------------------------------
+-
+ void GollyApp::SetFrameIcon(wxFrame* frame)
+ {
+ // set frame icon
+@@ -280,13 +244,12 @@
+ wxSystemOptions::SetOption(wxMAC_TEXTCONTROL_USE_MLTE, 1);
+ #endif
+
+- // get current working directory before calling SetAppDirectory
++ // get current working directory before changing to data directory
+ wxString initdir = wxFileName::GetCwd();
+ if (initdir.Last() != wxFILE_SEP_PATH) initdir += wxFILE_SEP_PATH;
+
+- // make sure current working directory contains application otherwise
+- // we can't open Help files
+- SetAppDirectory( wxString(argv[0]).mb_str(wxConvLocal) );
++ // change to data directory
++ wxSetWorkingDirectory(wxString("/usr/share/golly", wxConvLocal));
+
+ // now set global gollydir for use in GetPrefs and elsewhere
+ gollydir = wxFileName::GetCwd();
diff --git a/app-misc/golly/golly-2.3.ebuild b/app-misc/golly/golly-2.3.ebuild
deleted file mode 100644
index 73eca31f36e8..000000000000
--- a/app-misc/golly/golly-2.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.3.ebuild,v 1.1 2012/01/19 02:25:18 xmw Exp $
-
-EAPI=2
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit eutils python wxwidgets
-
-MY_P=${P}-src
-DESCRIPTION="A simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_configure() {
- econf \
- --with-perl-shlib="libperl.so" \
- --with-python-shlib="$(python_get_library)"
-}
-
-src_install() {
- emake docdir= DESTDIR="${D}" install || die
- dodoc README
-}
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 2e95e9f82b9c..df0777fb7670 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1 +1,2 @@
+DIST grc_1.3.tar.gz 23658 RMD160 2c0ddcfa5da80025436b11424304968a0648dbe6 SHA1 78048f49dc9067575937cecf1af7da907f824efa SHA256 cee26860a866aa1e905ff9e15b1dd5e4671263a1c109c94a2b70d836a10c0821
DIST grc_1.4.tar.gz 24302 RMD160 f95da528389d585994d55b49276853bedffbe498 SHA1 79fd504d8291f13486d361611415ae60fa56712a SHA256 bbfdc5ee074a857a8cff52f4b1941527c1dd192e1c2b45f69c624ce9fad4f4d0
diff --git a/app-misc/grc/grc-1.3-r1.ebuild b/app-misc/grc/grc-1.3-r1.ebuild
new file mode 100644
index 000000000000..fa6a26209fc5
--- /dev/null
+++ b/app-misc/grc/grc-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.3-r1.ebuild,v 1.4 2010/06/01 15:13:43 josejx Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="Generic Colouriser is yet another colouriser for beautifying your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+ cp -rf "${S}"{,.orig}
+ epatch "${FILESDIR}"/1.0.6-support-more-files.patch
+ python_convert_shebangs -r 2 .
+}
+
+src_install() {
+ insinto /usr/share/grc
+ doins conf.* "${FILESDIR}"/conf.* || die "share files"
+ insinto /etc
+ doins grc.conf || die "conf"
+ dobin grc grcat || die "dobin"
+ dodoc README INSTALL TODO CHANGES CREDITS || die
+ doman grc.1 grcat.1 || die
+}
diff --git a/app-misc/grc/grc-1.4.ebuild b/app-misc/grc/grc-1.4.ebuild
index faa5355ccc0b..0221c9929a53 100644
--- a/app-misc/grc/grc-1.4.ebuild
+++ b/app-misc/grc/grc-1.4.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.4.ebuild,v 1.5 2012/02/01 17:32:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.4.ebuild,v 1.1 2011/08/24 03:22:20 radhermit Exp $
-EAPI=4
+EAPI="3"
PYTHON_DEPEND="2"
inherit eutils python
-DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+DESCRIPTION="Generic Colouriser is yet another colouriser for beautifying your logfiles or output of commands"
HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
src_prepare() {
@@ -24,10 +24,10 @@ src_prepare() {
src_install() {
insinto /usr/share/grc
- doins conf.* "${FILESDIR}"/conf.*
+ doins conf.* "${FILESDIR}"/conf.* || die
insinto /etc
- doins grc.conf
- dobin grc grcat
- dodoc README INSTALL TODO CHANGES CREDITS
- doman grc.1 grcat.1
+ doins grc.conf || die
+ dobin grc grcat || die
+ dodoc README INSTALL TODO CHANGES CREDITS || die
+ doman grc.1 grcat.1 || die
}
diff --git a/app-misc/hatools/Manifest b/app-misc/hatools/Manifest
index b31fcfd0e593..06ca8e810b70 100644
--- a/app-misc/hatools/Manifest
+++ b/app-misc/hatools/Manifest
@@ -1 +1,2 @@
+DIST hatools-2.00.tar.gz 154527 RMD160 38451c2d0df46969d989fe445a06c53dddcd47fd SHA1 0711de4ee59d40355ed8948a3d0786040577a458 SHA256 38acceaaec0ba8f3a33fb92d2d10d7e979a5698e89731313ec1df3d6fd35bd0c
DIST hatools-2.14.tar.gz 156771 RMD160 fa6b953789869f2746f5b4001ca58cd942757bd6 SHA1 1376fee2185e5855e75ab818d57dd845008280a6 SHA256 4bad4723056f87f30633a4702b96be3b2e0d1218b7b96a79c71f42ca3f5dd109
diff --git a/app-misc/hatools/hatools-2.00.ebuild b/app-misc/hatools/hatools-2.00.ebuild
new file mode 100644
index 000000000000..b2f9e3efd891
--- /dev/null
+++ b/app-misc/hatools/hatools-2.00.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hatools/hatools-2.00.ebuild,v 1.4 2011/01/05 15:36:58 jlec Exp $
+
+DESCRIPTION="High availability environment tools for shell scripting"
+HOMEPAGE="http://www.fatalmind.com/software/hatools/"
+SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc README AUTHORS NEWS ChangeLog || die
+}
diff --git a/app-misc/hatools/hatools-2.14.ebuild b/app-misc/hatools/hatools-2.14.ebuild
index 6da9134d30fb..10a9041c1d88 100644
--- a/app-misc/hatools/hatools-2.14.ebuild
+++ b/app-misc/hatools/hatools-2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hatools/hatools-2.14.ebuild,v 1.4 2012/02/05 18:26:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hatools/hatools-2.14.ebuild,v 1.1 2011/01/05 15:36:58 jlec Exp $
-EAPI=4
+EAPI="3"
DESCRIPTION="High availability environment tools for shell scripting"
HOMEPAGE="http://www.fatalmind.com/software/hatools/"
@@ -10,9 +10,13 @@ SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
-src_prepare() {
- sed 's:ksh:bash:g' -i test.sh || die
+DEPEND="test? ( app-shells/ksh )"
+RDEPEND=""
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc README AUTHORS NEWS ChangeLog || die
}
diff --git a/app-misc/hatools/metadata.xml b/app-misc/hatools/metadata.xml
index 40149c995561..69ce787c4459 100644
--- a/app-misc/hatools/metadata.xml
+++ b/app-misc/hatools/metadata.xml
@@ -3,3 +3,4 @@
shell-tools
+
diff --git a/app-misc/iguanaIR/iguanaIR-0.93.ebuild b/app-misc/iguanaIR/iguanaIR-0.93.ebuild
index 9946486a1a63..387141a2b7b5 100644
--- a/app-misc/iguanaIR/iguanaIR-0.93.ebuild
+++ b/app-misc/iguanaIR/iguanaIR-0.93.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/iguanaIR-0.93.ebuild,v 1.7 2012/01/05 23:30:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/iguanaIR/iguanaIR-0.93.ebuild,v 1.6 2010/11/05 13:41:57 hwoarang Exp $
inherit eutils flag-o-matic
@@ -10,7 +10,7 @@ SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
pkg_setup() {
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 9f80f7cc277b..62d1cecc5c5f 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,4 +1,3 @@
DIST ktoblzcheck-1.28.tar.gz 577927 RMD160 c0de547a3a866374ea166da3cd681baefbd64953 SHA1 93c57b22df3e9a4f97b9a262feb6415f4ffb2173 SHA256 2b1f5c984211638188425d4b1982792cdf23c9e7d23e8e18cb420a761894fcf6
DIST ktoblzcheck-1.31.tar.gz 579302 RMD160 13fa133c919624c45c04cc723d3d033bf161dca0 SHA1 eb1a0b3201d6e379e99387ad81239bcb4c279f58 SHA256 3a29457ecfe09983a954dc95e4baaa2672c1824f3c2cd8471fb74d63f615f109
DIST ktoblzcheck-1.33.tar.gz 579013 RMD160 26b18b0aaf0a943e3c8de3b3c0a4ed131d2bc472 SHA1 66b0e38980151c2ba9f726ceb3377406636630c8 SHA256 ecebd9713f0ed9a81df7d77d32625d6955ca8323a8ea4e7aac639fbc7696ec6e
-DIST ktoblzcheck-1.37.tar.gz 551990 RMD160 8fb740173bbb5424bd73569d95ea2542eb04e715 SHA1 054b4dd434a80d95d33085ce042bf6c4b7a636db SHA256 34dd5fb09282ac27a8f7243d3c99ad620ef29addfedc5b81beb5fac0d0efcf49
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild
index ed255f523f3f..d21fe0214e79 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild,v 1.5 2012/01/21 16:11:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ktoblzcheck/ktoblzcheck-1.33.ebuild,v 1.1 2011/08/21 16:09:23 hanno Exp $
+
+EAPI=3
-EAPI=4
PYTHON_DEPEND="python? 2:2.6"
+
inherit python
DESCRIPTION="Library to check account numbers and bank codes of German banks"
@@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="python"
RDEPEND="app-text/recode
@@ -21,9 +23,7 @@ RDEPEND="app-text/recode
sys-apps/sed
|| ( net-misc/wget www-client/lynx )"
DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6b"
-
-DOCS="AUTHORS ChangeLog NEWS README"
+ sys-devel/libtool"
pkg_setup() {
if use python; then
@@ -33,16 +33,21 @@ pkg_setup() {
}
src_prepare() {
- >py-compile
+ rm -f py-compile
+ ln -s $(type -P true) py-compile || die
}
src_configure() {
- econf $(use_enable python)
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable python)
}
src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README
+
+ find "${D}" -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.37.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.37.ebuild
deleted file mode 100644
index e988e8c28ecb..000000000000
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.37.ebuild
+++ /dev/null
@@ -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-misc/ktoblzcheck/ktoblzcheck-1.37.ebuild,v 1.1 2012/01/06 08:43:50 ssuominen Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-inherit python
-
-DESCRIPTION="Library to check account numbers and bank codes of German banks"
-HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="python"
-
-RDEPEND="app-text/recode
- sys-apps/gawk
- sys-apps/grep
- sys-apps/sed
- || ( net-misc/wget www-client/lynx )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6b"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- >py-compile
-}
-
-src_configure() {
- econf $(use_enable python)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
- use python && python_mod_optimize ktoblzcheck.py
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup ktoblzcheck.py
-}
diff --git a/app-misc/lirc/files/lircmd b/app-misc/lirc/files/lircmd
old mode 100644
new mode 100755
diff --git a/app-misc/lirc/lirc-0.8.5.ebuild b/app-misc/lirc/lirc-0.8.5.ebuild
index c1d1197d27e7..fa230b5d60af 100644
--- a/app-misc/lirc/lirc-0.8.5.ebuild
+++ b/app-misc/lirc/lirc-0.8.5.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.11 2012/01/09 07:19:17 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.10 2010/11/01 09:00:14 fauli Exp $
inherit eutils linux-mod flag-o-matic autotools
@@ -79,7 +77,7 @@ LIBFTDI_USED_BY_DEV="
ftdi usbirboy userspace"
for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
+ DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
done
for dev in ${LIBFTDI_USED_BY_DEV}; do
diff --git a/app-misc/lirc/lirc-0.8.7.ebuild b/app-misc/lirc/lirc-0.8.7.ebuild
index f49648395310..307cad857d90 100644
--- a/app-misc/lirc/lirc-0.8.7.ebuild
+++ b/app-misc/lirc/lirc-0.8.7.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.7.ebuild,v 1.5 2012/01/09 07:19:17 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.7.ebuild,v 1.3 2010/11/05 13:42:47 hwoarang Exp $
inherit eutils linux-mod flag-o-matic autotools
@@ -19,7 +17,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug doc X hardware-carrier transmitter"
S="${WORKDIR}/${MY_P}"
@@ -77,7 +75,7 @@ LIBUSB_USED_BY_DEV="
imon_rsc streamzap mceusb xboxusb irlink commandir"
for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
+ DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
done
# adding only compile-time depends
diff --git a/app-misc/lirc/lirc-0.8.7_pre1.ebuild b/app-misc/lirc/lirc-0.8.7_pre1.ebuild
index 3f462da334d4..b50768168eeb 100644
--- a/app-misc/lirc/lirc-0.8.7_pre1.ebuild
+++ b/app-misc/lirc/lirc-0.8.7_pre1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.7_pre1.ebuild,v 1.3 2012/01/09 07:19:17 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.7_pre1.ebuild,v 1.2 2010/11/01 09:00:14 fauli Exp $
inherit eutils linux-mod flag-o-matic autotools
@@ -77,7 +75,7 @@ LIBUSB_USED_BY_DEV="
imon_rsc streamzap mceusb xboxusb irlink commandir"
for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
+ DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
done
# adding only compile-time depends
diff --git a/app-misc/lirc/lirc-0.9.0.ebuild b/app-misc/lirc/lirc-0.9.0.ebuild
index 5cd2a04e278e..556e61032e2f 100644
--- a/app-misc/lirc/lirc-0.9.0.ebuild
+++ b/app-misc/lirc/lirc-0.9.0.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0.ebuild,v 1.3 2012/01/09 07:19:17 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0.ebuild,v 1.2 2011/06/13 12:30:21 fauli Exp $
inherit eutils linux-mod flag-o-matic autotools
@@ -77,7 +75,7 @@ LIBUSB_USED_BY_DEV="
imon_rsc streamzap xboxusb irlink commandir"
for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
+ DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
done
# adding only compile-time depends
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
index ebfea98b9b1c..d4dcb3e4ec0a 100644
--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@@ -1,2 +1,2 @@
+DIST lockfile-progs_0.1.13.tar.gz 116495 RMD160 507c084ba10619c5853edcb91f288b9c66a6f8d2 SHA1 ae3dfb42d4c1b6c9bc9be7a502d657ed2b58f74d SHA256 375c6068579770eaad73000eed54615fc8f4fb1ebd9384ed00ab7d0409711303
DIST lockfile-progs_0.1.15.tar.gz 137270 RMD160 bb457d5794a41a222532a716cba5f3c59a70b9f6 SHA1 2494defdd7ac8828eb43744b116d31eadb0cf08c SHA256 51a4d932a1dba6a55cfffd0b4e4f0497c4a62da84e071b57b6c0f6eb9d81a960
-DIST lockfile-progs_0.1.16.tar.gz 155901 RMD160 59f98bfba025b7265cfc0869b86964acb8b21d52 SHA1 5624cefcf7ef5bca87544b7d7571fa33d8596bdc SHA256 f95132d632687af971da830497f06257fa86aedbc4b76874456652f06a0a8a69
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.13.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.13.ebuild
new file mode 100644
index 000000000000..3ce032dfe24b
--- /dev/null
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.13.ebuild,v 1.6 2010/03/28 19:03:32 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
+HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~s390 ~sh ~sparc x86"
+IUSE=""
+
+DEPEND="net-libs/liblockfile"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/sid"
+
+src_prepare() {
+ # Provide better Makefile, with clear separation between compilation
+ # and installation.
+ cp "${FILESDIR}/Makefile" . || die "cp failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+}
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
deleted file mode 100644
index d1546c83e368..000000000000
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild,v 1.1 2012/01/25 14:07:07 phajdan.jr Exp $
-
-EAPI="4"
-
-DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
-HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="net-libs/liblockfile"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/main"
-
-src_prepare() {
- # Provide better Makefile, with clear separation between compilation
- # and installation.
- cp "${FILESDIR}/Makefile" . || die
-}
diff --git a/app-misc/magneto-loader/Manifest b/app-misc/magneto-loader/Manifest
index 1acc8ec118eb..09d2119c3d01 100644
--- a/app-misc/magneto-loader/Manifest
+++ b/app-misc/magneto-loader/Manifest
@@ -4,4 +4,3 @@ DIST entropy-1.0_rc53.tar.bz2 1675138 RMD160 b4ee06b5a9545e9aebb189f984335dd3213
DIST entropy-1.0_rc59.tar.bz2 1678091 RMD160 ca2c9d7b5b2594ae96a2cb629ae64d97ecee4bde SHA1 c924cfee89464a12e2aa5d66f56164015581c230 SHA256 f41b48bd7ddd4207143c50da244b806e27a7318101f78955e40a054e0fca75ec
DIST entropy-1.0_rc76.tar.bz2 1717076 RMD160 e25035b9ee93bff9a96aee2bf1f3136038b1df28 SHA1 3440adb1394069cf2aa042cdc9b8f4a7cee6437a SHA256 cc86adba32d27a774bf562d849d3e2bccd37dd0cbc9a3e7386dd5d72168d9d67
DIST entropy-1.0_rc77.tar.bz2 1718649 RMD160 88a5ec354dfe6f4d00caa89e6f486ec6b448d075 SHA1 c9816883fa8780c2312b3e93d0896e131af3929b SHA256 87df5e618b6cd22ec340980b773331032c786ae0bd173fea8e54a8b091a0532c
-DIST entropy-1.0_rc80.tar.bz2 1721422 RMD160 4dd440f0f9194316ed7d2e114ae7beada242def6 SHA1 2ff10e4980be0cf70e5378165d3d1a7ca3f2d6ac SHA256 26594aa001d129e6d705fc01dd3076283ce071c094da3a14eed7881daeff436e
diff --git a/app-misc/magneto-loader/magneto-loader-1.0_rc80.ebuild b/app-misc/magneto-loader/magneto-loader-1.0_rc80.ebuild
deleted file mode 100644
index 82a78b2aabc0..000000000000
--- a/app-misc/magneto-loader/magneto-loader-1.0_rc80.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magneto-loader/magneto-loader-1.0_rc80.ebuild,v 1.1 2011/12/22 17:55:41 lxnay Exp $
-
-EAPI="2"
-inherit eutils
-
-DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-S="${WORKDIR}/entropy-${PV}/magneto"
-
-DEPEND="~sys-apps/magneto-core-${PV}"
-RDEPEND="${DEPEND}"
-
-src_compile() {
- einfo "nothing to compile"
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-loader-install || die "make install failed"
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index c3ec532f75fc..d0078f1a3833 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,7 @@
DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
DIST mc-4.7.5.2.tar.lzma 1943321 RMD160 8477450d0f2cddc356d93c5006fcfd278966f863 SHA1 fb44d01a80c5e4589aece205adccff5b5a5c34c1 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26
+DIST mc-4.7.5.5.tar.xz 1991540 RMD160 6a5ab7edeaa1478a98446b11fbe0d3836beefbeb SHA1 83f09ccee88d8a0ff36e4c672bf6df3591a3e0fc SHA256 1ec5e711e7de01d9317a444061ab0d3c91bb84d8898dbbc99c7c472d6afbe2ea
DIST mc-4.7.5.6.tar.xz 1995148 RMD160 605169df7f16e006a7889025852056041c4afd93 SHA1 3773da724813e6d93e4178850a03bc0f501f4b12 SHA256 8fc20859eac824b062fb2862429579b75cdbfb8d9011f1a7793d516550af4ffd
+DIST mc-4.8.0.tar.xz 2041108 RMD160 5aaa3efdc1274e58dd0be1b3f88c20d04b2dcf2c SHA1 245c5a75283507bc5bd58a983e8296ef45ec1efd SHA256 73b7169445bf628e783696b44860d908f97877618ae22039bcb8829ac38e23c1
DIST mc-4.8.1.tar.xz 2057960 RMD160 db2d44cffd1e78c1f85a946ebb314542a526d82d SHA1 873b35ebe3f48a661f7d49a988464ac18d40647d SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7d62c681283c1b0a8b672
diff --git a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch b/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
deleted file mode 100644
index 85ce611945b3..000000000000
--- a/app-misc/mc/files/mc-4.8.1-fix-fallocate-xBSD.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a6ca3c289994a3a9ab8f481582e2632109b759f0 Mon Sep 17 00:00:00 2001
-From: Egmont Koblinger
-Date: Thu, 19 Jan 2012 14:11:10 +0400
-Subject: [PATCH] Ticket #2689 (fix fallocate detection for xBSD)
-
- fixed macros 'mc-get-fs-info.m4' for correct 'fallocate' detection under xBSD
-
-Signed-off-by: Ilia Maslakov
----
- m4.include/mc-get-fs-info.m4 | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/m4.include/mc-get-fs-info.m4 b/m4.include/mc-get-fs-info.m4
-index bc0ca54..b1474d8 100644
---- a/m4.include/mc-get-fs-info.m4
-+++ b/m4.include/mc-get-fs-info.m4
-@@ -5,7 +5,7 @@ dnl
-
- AC_DEFUN([gl_POSIX_FALLOCATE], [
- dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
-- AC_TRY_COMPILE([
-+ AC_TRY_LINK([
- #define _XOPEN_SOURCE 600
- #include
- #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
---
-1.7.8.3
-
diff --git a/app-misc/mc/mc-4.7.5.5.ebuild b/app-misc/mc/mc-4.7.5.5.ebuild
new file mode 100644
index 000000000000..5f96139fab34
--- /dev/null
+++ b/app-misc/mc/mc-4.7.5.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.5.5.ebuild,v 1.2 2011/11/11 13:23:20 naota Exp $
+
+EAPI=4
+
+inherit base flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm +ncurses nls samba slang X"
+
+REQUIRED_USE="^^ ( ncurses slang )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ ncurses? ( sys-libs/ncurses )
+ samba? ( net-fs/samba )
+ slang? ( >=sys-libs/slang-2 )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ local myscreen=ncurses
+ use slang && myscreen=slang
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable nls) \
+ --enable-vfs \
+ $(use_enable kernel_linux vfs-undelfs) \
+ --enable-charset \
+ $(use_with X x) \
+ $(use_enable samba vfs-smb) \
+ $(use_with gpm gpm-mouse) \
+ --with-screen=${myscreen} \
+ $(use_with edit)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS README
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver ||
+ die "setting cons.saver's owner failed"
+ fperms g+s /usr/libexec/mc/cons.saver ||
+ die "setting cons.saver's permissions failed"
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-4.8.0-r2.ebuild b/app-misc/mc/mc-4.8.0-r2.ebuild
new file mode 100644
index 000000000000..c2206bc7629f
--- /dev/null
+++ b/app-misc/mc/mc-4.8.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.0-r2.ebuild,v 1.1 2011/11/30 07:21:30 slyfox Exp $
+
+EAPI=4
+
+inherit base flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib +ncurses nls samba slang test X"
+
+REQUIRED_USE="^^ ( ncurses slang )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ ncurses? ( sys-libs/ncurses )
+ samba? ( net-fs/samba )
+ slang? ( >=sys-libs/slang-2 )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}/${PN}"-4.8.0-fix-nls.patch
+ "${FILESDIR}/${PN}"-4.8.0-fix-ftp-spaces.patch
+ )
+
+src_configure() {
+ local myscreen=ncurses
+ use slang && myscreen=slang
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable nls) \
+ --enable-vfs \
+ $(use_enable kernel_linux vfs-undelfs) \
+ --enable-charset \
+ $(use_with X x) \
+ $(use_enable samba vfs-smb) \
+ $(use_with gpm gpm-mouse) \
+ --with-screen=${myscreen} \
+ $(use_with edit) \
+ $(use_enable mclib) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver ||
+ die "setting cons.saver's owner failed"
+ fperms g+s /usr/libexec/mc/cons.saver ||
+ die "setting cons.saver's permissions failed"
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-4.8.1-r1.ebuild b/app-misc/mc/mc-4.8.1-r1.ebuild
index 9f95caeca062..e0500fd73490 100644
--- a/app-misc/mc/mc-4.8.1-r1.ebuild
+++ b/app-misc/mc/mc-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r1.ebuild,v 1.7 2012/02/01 17:24:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r1.ebuild,v 1.2 2011/12/16 13:17:35 wired Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
REQUIRED_USE="^^ ( ncurses slang )"
diff --git a/app-misc/mc/mc-4.8.1-r2.ebuild b/app-misc/mc/mc-4.8.1-r2.ebuild
deleted file mode 100644
index 527d0b10a6f4..000000000000
--- a/app-misc/mc/mc-4.8.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.1-r2.ebuild,v 1.1 2012/01/27 20:26:43 slyfox Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- ncurses? ( sys-libs/ncurses )
- samba? ( net-fs/samba )
- slang? ( >=sys-libs/slang-2 )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.8.1-fix-fallocate-xBSD.patch
-
- # patch above changed .m4 bits
- eautoreconf
-}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS README NEWS
-
- # fix bug #334383
- if use kernel_linux && [[ ${EUID} == 0 ]] ; then
- fowners root:tty /usr/libexec/mc/cons.saver
- fperms g+s /usr/libexec/mc/cons.saver
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
deleted file mode 100644
index 2e5718a223dd..000000000000
--- a/app-misc/mc/mc-9999.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-9999.ebuild,v 1.3 2012/01/27 20:26:43 slyfox Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://midnight-commander.org/git/mc.git"
- LIVE_ECLASSES="git-2 autotools"
- LIVE_EBUILD=yes
-fi
-
-inherit eutils flag-o-matic ${LIVE_ECLASSES}
-
-MY_P=${P/_/-}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
- SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+edit gpm mclib +ncurses nls samba slang test X +xdg"
-
-REQUIRED_USE="^^ ( ncurses slang )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- ncurses? ( sys-libs/ncurses )
- samba? ( net-fs/samba )
- slang? ( >=sys-libs/slang-2 )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-LANGS="az be bg ca cs da de el eo es et eu fi
-fr gl hu ia id it ja ka ko lt lv mn nb nl pl pt_BR
-pt ro ru sk sl sr sv sv_SE ta tr uk vi wa zh_CN zh_TW"
-#LANGS+=" de_CH fi_FI it_IT" # suspicious overlap
-
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
- strip-linguas ${LANGS}
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS doc/{FAQ,NEWS,README}
-
- # fix bug #334383
- if use kernel_linux && [[ ${EUID} == 0 ]] ; then
- fowners root:tty /usr/libexec/mc/cons.saver
- fperms g+s /usr/libexec/mc/cons.saver
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 797a69be0805..0379473f622a 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1 +1,2 @@
-DIST media-player-info-16.tar.gz 210582 RMD160 614c3f9db15995ae4fa93f74f21b8783253bd40a SHA1 90c5a02fd1e6cf3198a84b2a48bae9fb767863fa SHA256 655baef727eafba27d72cf49b866e2f7614b13201ad71d5e8af0901ed4d5acca
+DIST media-player-info-14.tar.gz 203373 RMD160 0b9a7ebbaea1435066fdb9edc59585569ba88239 SHA1 eb526c38b1a35cebe970dc3fa25a864af79ff83f SHA256 1a70ab8543d8e91b27b5e6eb4c3f66e9dd86710fba8eb265ac1d84f8b7ab3c05
+DIST media-player-info-15.tar.gz 209131 RMD160 63c6e0c028d79ec72506314c50f4cbccc61e9baa SHA1 f81b1ba8662109b5d9ef420201d2221d5e453d6b SHA256 341ee6d21e6dcc683384c7f42633d7773e577260ec2e52d83b802d1a569e5244
diff --git a/app-misc/media-player-info/media-player-info-14.ebuild b/app-misc/media-player-info/media-player-info-14.ebuild
new file mode 100644
index 000000000000..9e33188cfa16
--- /dev/null
+++ b/app-misc/media-player-info/media-player-info-14.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-14.ebuild,v 1.2 2011/07/15 19:18:24 ssuominen Exp $
+
+EAPI=4
+
+DESCRIPTION="A repository of data files describing media player capabilities"
+HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="|| ( >=sys-fs/udev-171[hwdb] =sys-fs/udev-171[hwdb] initial_meal_add = 1;
+diff --git a/fltk/MissMealWidget.cc b/fltk/MissMealWidget.cc
+index fa6d879..be2b88a 100644
+--- a/fltk/MissMealWidget.cc
++++ b/fltk/MissMealWidget.cc
+@@ -31,7 +31,7 @@ static MealValueOutput *mvo;
+
+ static void missing_meal_cb(Fl_Widget *which, void *choice)
+ {
+-int meal = (int) choice;
++int meal = *((int *) choice);
+ mvo->set_value(current_meal_date,meal);
+ }
+
+diff --git a/fltk/PersonalOptions.cc b/fltk/PersonalOptions.cc
+index 424044b..197b892 100644
+--- a/fltk/PersonalOptions.cc
++++ b/fltk/PersonalOptions.cc
+@@ -33,7 +33,7 @@ DVValueOutput *cvo, *ovo, *lvo, *mvo, *svo, *fvo, *nvo, *pvo;
+ static void lock_cb(Fl_Widget *w, void *data)
+ {
+ Fl_Light_Button *lb = (Fl_Light_Button *) w;
+-int nut = (int) data;
++int nut = *((int *) data);
+ double value = lb->value();
+ options.locknuts[nut] = value;
+ if (nut == ENERC_KCAL) options.autocal = 0;
+diff --git a/fltk/RecordMeals.cc b/fltk/RecordMeals.cc
+index d44b9b6..31f368a 100644
+--- a/fltk/RecordMeals.cc
++++ b/fltk/RecordMeals.cc
+@@ -35,7 +35,7 @@ static bool user_has_spoken;
+
+ static void meals_per_day_cb(Fl_Widget *which, void *choice)
+ {
+-int meals_per_day = (int) choice;
++int meals_per_day = *((int *) choice);
+ delete_meals(0);
+ write_meal_db();
+ options.mealsperday = meals_per_day;
+diff --git a/fltk/ServingMenuButton.cc b/fltk/ServingMenuButton.cc
+index 1ca0c5a..a1cca3e 100644
+--- a/fltk/ServingMenuButton.cc
++++ b/fltk/ServingMenuButton.cc
+@@ -37,7 +37,7 @@ static struct food *current_foodptr;
+
+ void menu_callback(Fl_Widget *which, void *n)
+ {
+-int num = (int) n;
++int num = *((int *) n);
+ if (num > 0)
+ {
+ big_label = result[3*num-2];
+diff --git a/fltk/TheStory.cc b/fltk/TheStory.cc
+index 1db27f5..90c3c3f 100644
+--- a/fltk/TheStory.cc
++++ b/fltk/TheStory.cc
+@@ -30,7 +30,7 @@ static TheStory *who_we_are;
+
+ void food_group_selector(Fl_Widget *which, void *what)
+ {
+-who_we_are->set_food_group((int) what);
++who_we_are->set_food_group(*((int *) what));
+ }
+
+ TheStory::TheStory (int x, int y, int w, int h, Fl_Color widgetcolor) : Fl_Wizard (x, y, w, h)
+diff --git a/fltk/TheUsualMenuButton.cc b/fltk/TheUsualMenuButton.cc
+index 84d77fc..0f59009 100644
+--- a/fltk/TheUsualMenuButton.cc
++++ b/fltk/TheUsualMenuButton.cc
+@@ -33,7 +33,7 @@ static struct meal *theusual_ptrs[101];
+
+ void add_to_meal_cb(Fl_Widget* whomever, void* whatever)
+ {
+-int choice = (int) whatever;
++int choice = *((int *) whatever);
+ rm->add_theusual(theusual_ptrs[choice]);
+ }
+
+@@ -44,7 +44,7 @@ rm->new_customary_meal_phase_one();
+
+ void delete_cb(Fl_Widget* whomever, void* whatever)
+ {
+-int choice = (int) whatever;
++int choice = *((int *) whatever);
+ theusualobj[theusualobjcount-1]->delete_it(theusual_ptrs[choice]);
+ }
+
diff --git a/app-misc/nut/nut-14.1.ebuild b/app-misc/nut/nut-14.1.ebuild
new file mode 100644
index 000000000000..cb6058a942b9
--- /dev/null
+++ b/app-misc/nut/nut-14.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-14.1.ebuild,v 1.6 2011/05/21 16:58:33 jer Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ppc x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build-fixes.patch
+}
+
+src_compile() {
+ append-flags '-DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/share/nut\"'
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/* || die
+ dobin nut || die
+ doman nut.1 || die
+}
diff --git a/app-misc/nut/nut-16.11.ebuild b/app-misc/nut/nut-16.11.ebuild
new file mode 100644
index 000000000000..ab05cbe0dce4
--- /dev/null
+++ b/app-misc/nut/nut-16.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.11.ebuild,v 1.3 2011/05/23 00:38:56 jer Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-16.5-build-fixes.patch
+
+ tc-export CC CXX
+
+ sed \
+ -e "s:/usr/local/lib:/usr/share:g" \
+ -i Makefile fltk/Makefile || die
+}
+
+src_compile() {
+ emake || die
+# need fltk-1.3
+ if use X; then
+ cd fltk
+ emake || die
+ fi
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/* || die
+ dobin nut || die
+ if use X; then
+ dobin fltk/Nut || die
+ fi
+ doman nut.1 || die
+
+}
diff --git a/app-misc/nut/nut-16.12.ebuild b/app-misc/nut/nut-16.12.ebuild
new file mode 100644
index 000000000000..59fafc0e0767
--- /dev/null
+++ b/app-misc/nut/nut-16.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.12.ebuild,v 1.1 2011/06/06 22:00:01 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
+ if use X ; then
+ cd fltk
+ emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\"
+ fi
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/*
+ dobin nut
+ doman nut.1
+ if use X ; then
+ dobin fltk/Nut
+ doicon nut.xpm
+ make_desktop_entry Nut nut nut Education
+ fi
+}
diff --git a/app-misc/nut/nut-16.13.ebuild b/app-misc/nut/nut-16.13.ebuild
new file mode 100644
index 000000000000..91ce1d1d333e
--- /dev/null
+++ b/app-misc/nut/nut-16.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.13.ebuild,v 1.1 2011/07/15 15:51:53 jer Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-16.12-makefile.patch
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
+ if use X ; then
+ cd fltk
+ emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\"
+ fi
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/*
+ dobin nut
+ doman nut.1
+ if use X ; then
+ dobin fltk/Nut
+ doicon nut.xpm
+ make_desktop_entry Nut nut nut Education
+ fi
+}
diff --git a/app-misc/nut/nut-16.5.ebuild b/app-misc/nut/nut-16.5.ebuild
new file mode 100644
index 000000000000..8c99fde92f7b
--- /dev/null
+++ b/app-misc/nut/nut-16.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.5.ebuild,v 1.7 2011/05/23 00:55:03 xmw Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-build-fixes.patch \
+ "${FILESDIR}"/${P}-int.patch
+ tc-export CC CXX
+ sed \
+ -e "s:/usr/local/lib:/usr/share:g" \
+ -i Makefile fltk/Makefile || die
+}
+
+src_compile() {
+ emake || die
+# need fltk-1.3
+ if use X; then
+ cd fltk
+ emake || die
+ fi
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/* || die
+ dobin nut || die
+ if use X; then
+ dobin fltk/Nut || die
+ fi
+ doman nut.1 || die
+
+}
diff --git a/app-misc/nut/nut-16.9.ebuild b/app-misc/nut/nut-16.9.ebuild
index 03aa0f790bb2..50909c2db4e9 100644
--- a/app-misc/nut/nut-16.9.ebuild
+++ b/app-misc/nut/nut-16.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.9.ebuild,v 1.5 2012/02/05 13:40:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-16.9.ebuild,v 1.4 2011/05/31 20:50:01 maekke Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc x86"
IUSE="X"
RDEPEND="X? ( x11-libs/fltk:1 )"
diff --git a/app-misc/nut/nut-17.3.ebuild b/app-misc/nut/nut-17.3.ebuild
new file mode 100644
index 000000000000..05d308d2dc76
--- /dev/null
+++ b/app-misc/nut/nut-17.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-17.3.ebuild,v 1.1 2011/10/31 03:45:34 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Record what you eat and analyze your nutrient levels"
+HOMEPAGE="http://nut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/fltk:1 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-16.12-makefile.patch
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) FOODDIR=\\\"/usr/share/nut\\\"
+ if use X ; then
+ cd fltk
+ emake CXX=$(tc-getCXX) FOODDIR=\\\"/usr/share/nut\\\"
+ fi
+}
+
+src_install() {
+ insinto /usr/share/nut
+ doins raw.data/*
+ dobin nut
+ doman nut.1
+ if use X ; then
+ dobin fltk/Nut
+ doicon nut.xpm
+ make_desktop_entry Nut nut nut Education
+ fi
+}
diff --git a/app-misc/pal/pal-0.4.3.ebuild b/app-misc/pal/pal-0.4.3.ebuild
index f0b9de6101db..899e76784831 100644
--- a/app-misc/pal/pal-0.4.3.ebuild
+++ b/app-misc/pal/pal-0.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3.ebuild,v 1.5 2012/02/06 15:17:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3.ebuild,v 1.3 2009/08/15 13:00:06 ssuominen Exp $
EAPI=2
inherit toolchain-funcs eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="nls unicode"
RDEPEND=">=dev-libs/glib-2.0
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 4b10faf3f720..5e1c47298d93 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,3 @@
DIST pax-utils-0.2.1.tar.bz2 80580 RMD160 f8eb1e6ba6cda70ddae00ecdd02f4be0f543c84b SHA1 c3fba8661e7dd39fe3723eefacaa2d69bb236adf SHA256 6a5beefb686e425eb6829bc716d2b32b64c2e854287c212c9853bc2beb705c3a
DIST pax-utils-0.2.2.tar.bz2 80999 RMD160 7856d1054973ecc96d91fff349c23d7409cbea0f SHA1 1d856ba7a53e8d853335d22d2ddb9ed78b4a764a SHA256 eac86abe7871ee12452d221c1e7c21acb9ba78ba2cba1daa587d3c93c77acd07
DIST pax-utils-0.2.3.tar.xz 76652 RMD160 ac61a5148fe92be3dd0f0eced65581a6dda63200 SHA1 72a06931bba7687b53109e5021d664d28b9fc1c9 SHA256 b2cdc20a0c67b78753ff4c4cbaa84b8175b0e2eb926de7390daef34a19297285
-DIST pax-utils-0.3.0.tar.xz 79892 RMD160 73e2afb4212803c9cad8284f20dd859f505eb03b SHA1 b1b768e9141f1b919c1a9ce6a7c02f75cc1e5bcd SHA256 d6d2992a40d89ab02d39a90d3c88ef553ecf1c9b93bae82efe16453b9152696a
diff --git a/app-misc/pax-utils/pax-utils-0.2.3.ebuild b/app-misc/pax-utils/pax-utils-0.2.3.ebuild
index ccb21bf716cb..d39a76cac31b 100644
--- a/app-misc/pax-utils/pax-utils-0.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.3.ebuild,v 1.8 2011/12/30 16:11:30 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.3.ebuild,v 1.7 2011/11/06 23:15:30 ranger Exp $
inherit flag-o-matic toolchain-funcs eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="caps"
#RESTRICT="mirror"
diff --git a/app-misc/pax-utils/pax-utils-0.3.0.ebuild b/app-misc/pax-utils/pax-utils-0.3.0.ebuild
deleted file mode 100644
index d185fc77b76a..000000000000
--- a/app-misc/pax-utils/pax-utils-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.3.0.ebuild,v 1.1 2012/01/24 00:12:08 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
-HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml"
-SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz
- http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz
- http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="caps"
-#RESTRICT="mirror"
-
-RDEPEND="caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-src_unpack() {
- # avoid newer EAPI for easy upgrade paths
- xz -dc "${DISTDIR}/${A}" | tar xf - || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc BUGS README TODO
-}
diff --git a/app-misc/realpath/realpath-1.15-r3.ebuild b/app-misc/realpath/realpath-1.15-r3.ebuild
index 69c637b29144..bdb3436bcd9b 100644
--- a/app-misc/realpath/realpath-1.15-r3.ebuild
+++ b/app-misc/realpath/realpath-1.15-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.4 2011/12/19 17:52:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
EAPI="3"
inherit eutils toolchain-funcs flag-o-matic prefix
@@ -19,6 +19,7 @@ RDEPEND="!sys-freebsd/freebsd-bin
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
+ elibc_IRIX? ( dev-libs/gnulib )
x86-interix? ( dev-libs/gnulib )
elibc_mintlib? ( virtual/libiconv )"
diff --git a/app-misc/realpath/realpath-1.16.ebuild b/app-misc/realpath/realpath-1.16.ebuild
index f0c8053973a6..6e50ebae689c 100644
--- a/app-misc/realpath/realpath-1.16.ebuild
+++ b/app-misc/realpath/realpath-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.7 2012/02/03 17:09:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
EAPI="3"
inherit eutils toolchain-funcs flag-o-matic prefix
@@ -13,13 +13,14 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="!sys-freebsd/freebsd-bin
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
+ elibc_IRIX? ( dev-libs/gnulib )
x86-interix? ( dev-libs/gnulib )
elibc_mintlib? ( virtual/libiconv )"
diff --git a/app-misc/regionset/regionset-0.1-r1.ebuild b/app-misc/regionset/regionset-0.1-r1.ebuild
index 38caf8881f8c..4a370ff2aa0f 100644
--- a/app-misc/regionset/regionset-0.1-r1.ebuild
+++ b/app-misc/regionset/regionset-0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/regionset/regionset-0.1-r1.ebuild,v 1.3 2012/02/06 16:38:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/regionset/regionset-0.1-r1.ebuild,v 1.1 2011/03/28 06:09:36 xarthisius Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
src_compile() {
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 791e4ea9082b..74ca5e929ee5 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,3 +1,2 @@
DIST remind-03.01.10.tar.gz 357033 RMD160 1210a9a577fefb7540906889eb1e5352201e5a86 SHA1 6b575a410df7b426371de25ff76a5fdc7cb633c7 SHA256 c62bea8db26b08704c1d7bc33f6775509ea649a4ff69316334639e4cdd9ed53e
DIST remind-03.01.11.tar.gz 361793 RMD160 34a72c5c14979a483b7ee74003e240e12926e491 SHA1 6c954ade45d7e43b5a54c887fb2e032872eefbb8 SHA256 b0399b7c00e8971da0105ac271025609158a9a67f44400cabfc8f82258c02a1b
-DIST remind-03.01.12.tar.gz 361662 RMD160 d98fb10ae9d6cbf5277ded13debe1ccd05bc9fb1 SHA1 0978357014916e0c5259e18b845d291eeb367b6c SHA256 b8c7773ebbae80c7f340073c0c7f73124672c56a950d721f6afdab7b29f9cbb9
diff --git a/app-misc/remind/remind-03.01.12.ebuild b/app-misc/remind/remind-03.01.12.ebuild
deleted file mode 100644
index 58cf4c76ceee..000000000000
--- a/app-misc/remind/remind-03.01.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/remind/remind-03.01.12.ebuild,v 1.1 2012/02/01 18:12:20 tove Exp $
-
-MY_P=${P/_beta/-BETA-}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Ridiculously functional reminder program"
-HOMEPAGE="http://www.roaringpenguin.com/products/remind"
-SRC_URI="http://www.roaringpenguin.com/files/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="tk"
-
-RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
-
-src_unpack() {
- unpack ${A}
- sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- ewarn "Testing fails if run as root. Skipping tests."
- return
- fi
- make test || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dobin www/rem2html || die "dobin failed"
-
- dodoc docs/WHATSNEW examples/defs.rem www/README.* || die "dodoc failed"
-
- if ! use tk ; then
- rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
- "${D}"/usr/bin/cm2rem* "${D}"/usr/share/man/man1/cm2rem*
- fi
-
- rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
- insinto /usr/share/${PN}
- doins -r contrib/
-}
diff --git a/app-misc/rlwrap/rlwrap-0.30.ebuild b/app-misc/rlwrap/rlwrap-0.30.ebuild
index 01dbb84cafa7..24ae5a413bc3 100644
--- a/app-misc/rlwrap/rlwrap-0.30.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.30.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rlwrap/rlwrap-0.30.ebuild,v 1.6 2011/12/18 17:40:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rlwrap/rlwrap-0.30.ebuild,v 1.5 2011/03/28 05:39:33 ssuominen Exp $
EAPI=3
@@ -10,7 +10,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="amd64 ~mips ppc sparc x86"
IUSE="debug"
RDEPEND="sys-libs/readline"
diff --git a/app-misc/rlwrap/rlwrap-0.37.ebuild b/app-misc/rlwrap/rlwrap-0.37.ebuild
index 78ddbaf7c7f5..3019766112a3 100644
--- a/app-misc/rlwrap/rlwrap-0.37.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rlwrap/rlwrap-0.37.ebuild,v 1.5 2012/02/01 17:19:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rlwrap/rlwrap-0.37.ebuild,v 1.3 2011/10/18 06:42:09 phajdan.jr Exp $
EAPI=3
@@ -10,7 +10,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="debug"
RDEPEND="sys-libs/readline"
diff --git a/app-misc/smtm/smtm-1.6.10.ebuild b/app-misc/smtm/smtm-1.6.10.ebuild
index d99e62ab889f..522ab16db80f 100644
--- a/app-misc/smtm/smtm-1.6.10.ebuild
+++ b/app-misc/smtm/smtm-1.6.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10.ebuild,v 1.2 2012/02/06 19:04:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10.ebuild,v 1.1 2009/05/03 19:48:19 tove Exp $
inherit perl-app
@@ -10,7 +10,7 @@ SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=">=dev-lang/perl-5
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
deleted file mode 100644
index 8337bde734b0..000000000000
--- a/app-misc/spacenavd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spacenavd-0.5.tar.gz 41746 RMD160 7b455d4cd96074707e671103e45cd0a5423cafc3 SHA1 76438d6fce981337b272210311124fe711606235 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
deleted file mode 100644
index 3b834a43952d..000000000000
--- a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
---- spacenavd-0.5.orig/Makefile.in 2012-01-31 22:22:20.460368687 +0100
-+++ spacenavd-0.5/Makefile.in 2012-01-31 22:23:18.170367675 +0100
-@@ -6,8 +6,8 @@ ctl = spnavd_ctl
-
- CC = gcc
- INSTALL = install
--CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src
--LDFLAGS = $(xlib)
-+CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src
-+LDFLAGS = $(ldopt) $(xlib)
-
- $(bin): $(obj)
- $(CC) -o $@ $(obj) $(LDFLAGS)
-diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure
---- spacenavd-0.5.orig/configure 2012-01-31 22:22:20.460368687 +0100
-+++ spacenavd-0.5/configure 2012-01-31 22:22:49.257368187 +0100
-@@ -28,6 +28,7 @@ test_kver() {
-
- PREFIX=/usr/local
- OPT=yes
-+LDOPT=yes
- DBG=yes
- X11=yes
- HOTPLUG=yes
-@@ -70,6 +71,11 @@ for arg; do
- --disable-opt)
- OPT=no;;
-
-+ --enable-ldopt)
-+ LDOPT=yes;;
-+ --disable-ldopt)
-+ LDOPT=no;;
-+
- --enable-debug)
- DBG=yes;;
- --disable-debug)
-@@ -95,6 +101,8 @@ for arg; do
- echo ' --disable-hotplug: disable hotplug, fallback to polling for the device'
- echo ' --enable-opt: enable speed optimizations (default)'
- echo ' --disable-opt: disable speed optimizations'
-+ echo ' --enable-ldopt: enable link optimizations (default)'
-+ echo ' --disable-ldopt: disable link optimizations'
- echo ' --enable-debug: include debugging symbols (default)'
- echo ' --disable-debug: do not include debugging symbols'
- echo 'all invalid options are silently ignored'
-@@ -105,6 +113,7 @@ done
-
- echo " prefix: $PREFIX"
- echo " optimize for speed: $OPT"
-+echo " optimize link: $LDOPT"
- echo " include debugging symbols: $DBG"
- echo " x11 communication method: $X11"
- echo " use hotplug: $HOTPLUG"
-@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then
- fi
-
- if [ "$OPT" = 'yes' ]; then
-- echo 'opt = -O3' >>Makefile
-+ echo "opt = ${CFLAGS:--O3}" >>Makefile
-+fi
-+
-+if [ "$LDOPT" = 'yes' ]; then
-+ echo "ldopt = ${LDFLAGS}" >>Makefile
- fi
-
- if [ "$X11" = 'yes' ]; then
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
deleted file mode 100644
index 5b2372242e14..000000000000
--- a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in
---- spacenavd-0.5.orig/Makefile.in 2011-11-16 21:43:53.210859753 +0100
-+++ spacenavd-0.5/Makefile.in 2011-11-16 21:45:36.386857932 +0100
-@@ -24,9 +24,9 @@ clean:
-
- .PHONY: install
- install: $(bin)
-- $(INSTALL) -d $(PREFIX)/bin
-- $(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin)
-- $(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl)
-+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
-+ $(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
-+ $(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl)
- cd $(srcdir) && ./setup_init --no-install
-
- # [ -d /etc/hal/fdi/policy ] && \
diff --git a/app-misc/spacenavd/files/spnavd b/app-misc/spacenavd/files/spnavd
deleted file mode 100644
index 383a2adc390f..000000000000
--- a/app-misc/spacenavd/files/spnavd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
- need localmount
- after bootmisc
-}
-
-start() {
- ebegin "Starting Spacenav system daemon"
-
- start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd
- eend $?
-}
-
-stop() {
- local retval
-
- ebegin "Stopping Spacenav system daemon"
-
- start-stop-daemon --stop --pidfile /var/run/spnavd.pid
- retval=$?
-
- eend ${retval}
- return ${retval}
-}
diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
deleted file mode 100644
index 11a8f956409d..000000000000
--- a/app-misc/spacenavd/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- no-herd
-
- anthoine.bourgeois@gmail.com
- Anthoine Bourgeois
-
-
- sping@gentoo.org
- Sebastian Pipping
-
-
- The spacenavd daemon can be used directly as a drop-in replacement
- to the 3DxWare daemon. It can communicate with the official magellan
- SDK, and thus any program compiled with it can work with spacenavd
- transparently without any change or need of recompilation.
- Also, spacenavd provides an alternative communication protocol, for
- programs that use libspnav, that doesn't require an X server, as the
- original protocol does.
-
-
diff --git a/app-misc/spacenavd/spacenavd-0.5-r1.ebuild b/app-misc/spacenavd/spacenavd-0.5-r1.ebuild
deleted file mode 100644
index 9f041f86ea76..000000000000
--- a/app-misc/spacenavd/spacenavd-0.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r1.ebuild,v 1.1 2012/02/06 19:51:21 sping Exp $
-
-EAPI="4"
-
-inherit eutils linux-info toolchain-funcs
-
-MY_PN='spacenav'
-DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon."
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-apps/xdpyinfo )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- CONFIG_CHECK="~HOTPLUG"
- ERROR_CFG="Your kernel needs HOTPLUG for the spacenavd to work properly"
- check_extra_config
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-destdir.patch
- epatch "${FILESDIR}"/${P}-custom-flags.patch
-}
-
-src_configure() {
- econf \
- --enable-opt --enable-ldopt \
- $(use_enable X x11)
-}
-
-src_compile() {
- emake CC=$(tc-getCC)
-}
-
-src_install() {
- # Config file
- insinto /etc
- newins "${S}/doc/example-spnavrc" spnavrc.sample || die
-
- # Init script
- newinitd "${FILESDIR}/spnavd" spacenavd || die
-
- # Daemon
- dobin "${S}/spacenavd"
- use X && dobin "${S}/spnavd_ctl"
-}
-
-pkg_postinst() {
- elog "To start the Spacenav daemon system-wide by default"
- elog "you should add it to the default runlevel :"
- elog "\`rc-update add spacenavd default\`"
- elog
- if use X; then
- elog "To start generating Spacenav X events by default"
- elog "you should add this command in your user startup"
- elog "scripts such as .gnomerc or .xinitrc :"
- elog "\`spnavd_ctl x11 start\`"
- elog
- fi
- ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
- ewarn "the new version of the daemon."
-}
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2b9740ee08e4..f6b3df75a55f 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -5,4 +5,3 @@ DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275
DIST sphinx-1.10-beta.tar.gz 1518778 RMD160 1d600289c76d412e96af611ec5c614fcfd3489e1 SHA1 28e84071e75d017f4e3403e5d22dbc1302a3c912 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60
DIST sphinx-2.0.1-beta.tar.gz 1761313 RMD160 678ff846c82dff890f1e38daa524464cabf9e563 SHA1 7c1244ea95ab4fed1322c6e0cbbf88c2f7e97f9c SHA256 fe27152ee24224bcf2ab7293dabe826d8db69c35eca16edf1ca510e0a1f4bf81
DIST sphinx-2.0.2-beta.tar.gz 1916158 RMD160 66816276ae0ce13703aaf39563e1aea405e074d3 SHA1 af0fcca27abbc3d73e04ce7265748350e6bb93b9 SHA256 7023b394e1f8a11f10db53cffe37782c7e5aa5cb69cfcbb15ac246a74d7edeb8
-DIST sphinx-2.0.3-release.tar.gz 1923911 RMD160 04140bffc8e5c6cc9466cdb8d6eac226f7f06b3e SHA1 dcc8055648d6bebff17ee65673011d64cc02ca41 SHA256 875af63473875b7c7e152e85ed34bd1a92d09db062a289b594bf049b3a8c82dd
diff --git a/app-misc/sphinx/sphinx-2.0.3.ebuild b/app-misc/sphinx/sphinx-2.0.3.ebuild
deleted file mode 100644
index 31cdc2f294f5..000000000000
--- a/app-misc/sphinx/sphinx-2.0.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.3.ebuild,v 1.1 2011/12/30 07:08:56 graaff Exp $
-
-EAPI=4
-inherit eutils autotools
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
- stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- odbc? ( dev-db/unixODBC )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
- if use stemmer; then
- cd "${S}"
- unpack libstemmer_c-${STEMMER_PV}.tgz
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- sed -i -e '/\/usr\/local\//d' configure.ac || die
-
- # Regenerate autoconf files in the api directory first to avoid
- # running elibtoolize twice, which results in a warning.
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- eautoreconf
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- $(use_with mysql) \
- $(use_with odbc unixodbc) \
- $(use_with postgres pgsql) \
- $(use_with stemmer libstemmer)
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake || die "emake failed"
-
- emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
- elog "Tests require access to a live MySQL database and may require configuration."
- elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
- dodir /var/run/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-
- if use test; then
- insinto /usr/share/${PN}
- doins -r test
- fi
-}
diff --git a/app-misc/srm/srm-1.2.11-r1.ebuild b/app-misc/srm/srm-1.2.11-r1.ebuild
index 3c2c3eb0b6d3..e05ce0035283 100644
--- a/app-misc/srm/srm-1.2.11-r1.ebuild
+++ b/app-misc/srm/srm-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.11-r1.ebuild,v 1.4 2012/02/04 13:43:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.11-r1.ebuild,v 1.3 2011/11/02 14:56:56 phajdan.jr Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug"
DEPEND="!app-misc/secure-delete
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index ae7eeb27c57d..1345cf68a263 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,2 +1,3 @@
DIST strigi-0.7.1.tar.bz2 936454 RMD160 4dac3c3e8937dc1e0ea5cc759c95d64ba4e24898 SHA1 9e05a875a1c62ebb5c0c59bf2114253cd1bc2a07 SHA256 d1830506da50262c80d5a3b55ee7821b132184cbd251c527db8d9d76a9242ab3
+DIST strigi-0.7.6.tar.xz 696840 RMD160 39762730461327ba9e17e5b9e5a7bfbb4338940d SHA1 165e352a539cf3bc821e4681e0b070bbffd161e7 SHA256 bcd2eaed7256caa084e5cfff6f3ed6a9a7ca0a2544e07f9447b24b71e571e043
DIST strigi-0.7.7.tar.xz 698312 RMD160 473fc190c003ea07b74b0e309052d65b220ec635 SHA1 31e80a5d762ab20391d07080ddb035f9b91a233f SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817
diff --git a/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch b/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
new file mode 100644
index 000000000000..ee1bfc026025
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-ffmpeg.patch
@@ -0,0 +1,166 @@
+diff -ruN strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp
+--- strigi-0.7.5.orig/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-06-02 11:29:26.000000000 +0200
++++ strigi-0.7.5/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2011-08-02 23:25:04.936181179 +0200
+@@ -1,6 +1,7 @@
+ /* This file is part of Strigi Desktop Search
+ *
+ * Copyright (C) 2010 Evgeny Egorochkin
++ * Copyright (C) 2011 Tirtha Chatterjee
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -348,7 +349,7 @@
+ if ((size = in->size()) >= 0)
+ ar.addValue(factory->durationProperty, (uint32_t)(size/(fc->bit_rate/8)));
+ }
+- if(fc->nb_streams==1 && fc->streams[0]->codec->codec_type == CODEC_TYPE_AUDIO) {
++ if(fc->nb_streams==1 && fc->streams[0]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ ar.addValue(factory->typeProperty, NFO "Audio");
+ ar.addValue(factory->typeProperty, NMM_DRAFT "MusicPiece");
+ } else {
+@@ -359,7 +360,7 @@
+ const AVStream &stream = *fc->streams[i];
+ const AVCodecContext &codec = *stream.codec;
+
+- if (codec.codec_type == CODEC_TYPE_AUDIO || codec.codec_type == CODEC_TYPE_VIDEO) {
++ if (codec.codec_type == AVMEDIA_TYPE_AUDIO || codec.codec_type == AVMEDIA_TYPE_VIDEO) {
+ const string streamuri = ar.newAnonymousUri();
+ ar.addValue(factory->hasPartProperty, streamuri);
+ ar.addTriplet(streamuri, partOfPropertyName, ar.path());
+@@ -370,8 +371,16 @@
+ outs << (stream.duration * stream.time_base.num / stream.time_base.den);
+ ar.addTriplet(streamuri, durationPropertyName,outs.str());
+ }
+- if (size_t len = strlen(stream.language)) {
+- ar.addTriplet(streamuri, languagePropertyName, string(stream.language, len));
++
++ //FIXME we must stop using the deprecated fuction av_metadata_get and use
++ // av_dict_get once we are able to detect the version of FFMpeg being used
++ // using version macros. same goes for all occurences of this function.
++ AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
++ if (entry != NULL) {
++ const char *languageValue = entry->value;
++ if (size_t len = strlen(languageValue)) {
++ ar.addTriplet(streamuri, languagePropertyName, string(languageValue, len));
++ }
+ }
+ const AVCodec *p = avcodec_find_decoder(codec.codec_id);
+ if (p) {
+@@ -408,7 +417,7 @@
+ ar.addTriplet(streamuri, bitratePropertyName, outs.str());
+ }
+
+- if (codec.codec_type == CODEC_TYPE_AUDIO) {
++ if (codec.codec_type == AVMEDIA_TYPE_AUDIO) {
+
+ ar.addTriplet(streamuri, typePropertyName, audioClassName);
+ if (codec.channels) {
+@@ -458,36 +467,83 @@
+ }
+
+ // Tags
+-
+- if (int32_t len = strlen(fc->title)) {
+- ar.addValue(factory->titleProperty, string(fc->title, len) );
++
++ AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *titleValue = entry->value;
++ if (int32_t len = strlen(titleValue)) {
++ ar.addValue(factory->titleProperty, string(titleValue, len) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "author", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *authorValue = entry->value;
++ if (int32_t len = strlen(authorValue)) {
++ const string creatoruri = ar.newAnonymousUri();
++ ar.addValue(factory->creatorProperty, creatoruri);
++ ar.addTriplet(creatoruri, typePropertyName, contactClassName);
++ ar.addTriplet(creatoruri, fullnamePropertyName, string(authorValue, len) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *copyrightValue = entry->value;
++ if (int32_t len = strlen(copyrightValue)) {
++ ar.addValue(factory->copyrightProperty, string(copyrightValue, len) );
++ }
+ }
+- if (int32_t len = strlen(fc->author)) {
+- const string creatoruri = ar.newAnonymousUri();
+- ar.addValue(factory->creatorProperty, creatoruri);
+- ar.addTriplet(creatoruri, typePropertyName, contactClassName);
+- ar.addTriplet(creatoruri, fullnamePropertyName, string(fc->author, len) );
+- }
+- if (int32_t len = strlen(fc->copyright)) {
+- ar.addValue(factory->copyrightProperty, string(fc->copyright, len) );
+- }
+- if (int32_t len = strlen(fc->comment)) {
+- ar.addValue(factory->commentProperty, string(fc->comment, len) );
+- }
+- if (int32_t len = strlen(fc->album)) {
+- const string album = ar.newAnonymousUri();
+- ar.addValue(factory->albumProperty, album);
++
++ entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *commentValue = entry->value;
++ if (int32_t len = strlen(commentValue)) {
++ ar.addValue(factory->commentProperty, string(commentValue, len) );
++ }
++ }
++
++ entry = av_metadata_get(fc->metadata, "album", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *albumValue = entry->value;
++ if (int32_t len = strlen(albumValue)) {
++ const string album = ar.newAnonymousUri();
++ ar.addValue(factory->albumProperty, album);
+ ar.addTriplet(album, typePropertyName, albumClassName);
+- ar.addTriplet(album, titlePropertyName, string(fc->album, len) );
++ ar.addTriplet(album, titlePropertyName, string(albumValue, len) );
++ }
+ }
+- if (int32_t len = strlen(fc->genre)) {
+- ar.addValue(factory->genreProperty, string(fc->genre, len) );
++
++ entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *genreValue = entry->value;
++ if (int32_t len = strlen(genreValue)) {
++ ar.addValue(factory->genreProperty, string(genreValue, len) );
++ }
+ }
+- if (fc->track) {
+- ar.addValue(factory->trackProperty, fc->track);
++
++ entry = av_metadata_get(fc->metadata, "track", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *trackValue = entry->value;
++ if (int32_t len = strlen(trackValue)) {
++ ar.addValue(factory->trackProperty, string(trackValue, len) );
++ }
+ }
+- if (fc->year) {
+- ar.addValue(factory->createdProperty, fc->year);
++
++ entry = av_metadata_get(fc->metadata, "year", NULL, 0);
++ if (entry != NULL)
++ {
++ const char *yearValue = entry->value;
++ if (int32_t len = strlen(yearValue)) {
++ ar.addValue(factory->createdProperty, string(yearValue, len) );
++ }
+ }
+
+ av_close_input_stream(fc);
diff --git a/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
new file mode 100644
index 000000000000..3f9944a27fe5
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.5-no-qt4.patch
@@ -0,0 +1,11 @@
+--- strigiclient/lib/CMakeLists.txt.orig 2011-07-13 19:57:19.000000000 +0200
++++ strigiclient/lib/CMakeLists.txt 2011-07-13 19:59:15.000000000 +0200
+@@ -1,4 +1,7 @@
+ if(NOT WIN32)
+ add_subdirectory(htmlgui)
+ endif(NOT WIN32)
+-add_subdirectory(searchclient)
++
++if(QT4_FOUND)
++ add_subdirectory(searchclient)
++endif(QT4_FOUND)
diff --git a/app-misc/strigi/files/strigi-0.7.6-crash.patch b/app-misc/strigi/files/strigi-0.7.6-crash.patch
new file mode 100644
index 000000000000..8696a47dc51b
--- /dev/null
+++ b/app-misc/strigi/files/strigi-0.7.6-crash.patch
@@ -0,0 +1,27 @@
+this was originally (now adapted for gentoo)
+commit 23d5ce636b7897dc3f233a5293f3164dac50566d
+Author: Jos van den Oever
+Date: Sun Jul 31 12:32:44 2011 +0200
+
+ Revert patch that breaks parsing of PDF files.
+ The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0.
+
+diff -ruN strigi-0.7.6.orig/libstreamanalyzer/lib/pdf/pdfparser.cpp strigi-0.7.6/libstreamanalyzer/lib/pdf/pdfparser.cpp
+--- strigi-0.7.6.orig/libstreamanalyzer/lib/pdf/pdfparser.cpp 2011-07-26 19:12:39.000000000 +0200
++++ strigi-0.7.6/libstreamanalyzer/lib/pdf/pdfparser.cpp 2011-10-19 00:18:51.583639819 +0200
+@@ -35,12 +35,13 @@
+ PdfParser::read(int32_t min, int32_t max) {
+ int32_t off = (int32_t)(pos-start);
+ int32_t d = (int32_t)(stream->position() - bufferStart);
+- bufferStart += off;
++ min += d;
++ if (max > 0) max += d;
+ stream->reset(bufferStart);
+ int32_t n = stream->read(start, min, max);
+ // printf("objstart %i %i\n", d, n);
+ if (n < min) return stream->status();
+- pos = start;
++ pos = start + off;
+ end = start + n;
+ return Ok;
+ }
diff --git a/app-misc/strigi/strigi-0.7.6-r1.ebuild b/app-misc/strigi/strigi-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..7d626bd80619
--- /dev/null
+++ b/app-misc/strigi/strigi-0.7.6-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.6-r1.ebuild,v 1.3 2011/12/07 22:01:26 hwoarang Exp $
+
+EAPI=4
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+ EGIT_REPO_URI="git://anongit.kde.org/strigi"
+ GIT_ECLASS="git-2"
+ EGIT_HAS_SUBMODULES="true"
+ KEYWORDS=""
+fi
+
+inherit cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
+
+COMMONDEPEND="
+ app-arch/bzip2:0
+ dev-libs/boost
+ dev-libs/libxml2:2
+ sys-libs/zlib:0
+ virtual/libiconv
+ clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
+ dbus? (
+ sys-apps/dbus
+ qt4? ( x11-libs/qt-dbus:4 )
+ )
+ exif? ( >=media-gfx/exiv2-0.17 )
+ fam? ( virtual/fam )
+ ffmpeg? ( virtual/ffmpeg )
+ hyperestraier? ( app-text/hyperestraier )
+ log? ( >=dev-libs/log4cxx-0.10.0 )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+"
+DEPEND="${COMMONDEPEND}
+ test? ( dev-util/cppunit )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.5-no-qt4.patch"
+ "${FILESDIR}/${PN}-0.7.6-crash.patch"
+)
+
+src_configure() {
+ # Enabled: POLLING (only reliable way to check for files changed.)
+ # Disabled: xine - recommended upstream to keep it this way
+ mycmakeargs=(
+ -DENABLE_POLLING=ON
+ -DFORCE_DEPS=ON
+ -DENABLE_CPPUNIT=OFF
+ -DENABLE_REGENERATEXSD=OFF
+ -DENABLE_XINE=OFF
+ $(cmake-utils_use_enable clucene)
+ $(cmake-utils_use_enable dbus)
+ $(cmake-utils_use_enable exif EXIV2)
+ $(cmake-utils_use_enable fam)
+ $(cmake-utils_use_enable ffmpeg)
+ $(cmake-utils_use_enable hyperestraier)
+ $(cmake-utils_use_enable inotify)
+ $(cmake-utils_use_enable log LOG4CXX)
+ $(cmake-utils_use_enable qt4)
+ $(cmake-utils_use_enable test CPPUNIT)
+ )
+
+ if use qt4; then
+ mycmakeargs+=(-DENABLE_DBUS=ON)
+ fi
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ if ! use clucene && ! use hyperestraier; then
+ echo
+ elog "Because you didn't enable either of the available backends:"
+ elog "clucene or hyperestraier, strigi may not be functional."
+ elog "If you intend to use standalone strigi indexer (not needed for KDE),"
+ elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
+ elog "or hyperestraier (unreliable) USE flag enabled."
+ echo
+ fi
+}
diff --git a/app-misc/strigi/strigi-0.7.7.ebuild b/app-misc/strigi/strigi-0.7.7.ebuild
index 9e9e5e09f58c..37ff5c3b6459 100644
--- a/app-misc/strigi/strigi-0.7.7.ebuild
+++ b/app-misc/strigi/strigi-0.7.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7.ebuild,v 1.6 2012/01/28 18:53:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7.ebuild,v 1.1 2011/12/15 10:34:06 johu Exp $
EAPI=4
if [[ "${PV}" != "9999" ]]; then
SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
else
EGIT_REPO_URI="git://anongit.kde.org/strigi"
GIT_ECLASS="git-2"
@@ -25,6 +25,7 @@ IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
COMMONDEPEND="
app-arch/bzip2:0
+ dev-libs/boost
dev-libs/libxml2:2
sys-libs/zlib:0
virtual/libiconv
@@ -44,9 +45,8 @@ COMMONDEPEND="
)
"
DEPEND="${COMMONDEPEND}
- dev-libs/boost
test? ( dev-util/cppunit )"
-RDEPEND=${COMMONDEPEND}
+RDEPEND="${COMMONDEPEND}"
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
diff --git a/app-misc/tasque/Manifest b/app-misc/tasque/Manifest
index 4d34f836d6e2..86ded5c7221c 100644
--- a/app-misc/tasque/Manifest
+++ b/app-misc/tasque/Manifest
@@ -1 +1,2 @@
+DIST tasque-0.1.8.tar.bz2 462945 RMD160 b9b126bd907c9f8386a9b157ea5db1f6e16412f5 SHA1 02eabde5ec9f0d37fa700942689f2962dd81bee2 SHA256 15650e043009524519d1acc34abcb5f15a9b5b0b43ef2f83f19a979cc921c7d0
DIST tasque-0.1.9.tar.bz2 478805 RMD160 4faf23be03ce7088d8937fd35a6bc741bbf82148 SHA1 ef5383c7368998b5019f79b46ea967d37167496d SHA256 1749b0c5a60d74f05f36193ff4aaf5b130ed3a47726f0b8e48c712805d1341af
diff --git a/app-misc/tasque/tasque-0.1.8.ebuild b/app-misc/tasque/tasque-0.1.8.ebuild
new file mode 100644
index 000000000000..e1ef7aacf409
--- /dev/null
+++ b/app-misc/tasque/tasque-0.1.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tasque/tasque-0.1.8.ebuild,v 1.5 2011/03/12 11:53:20 angelos Exp $
+
+EAPI=2
+
+inherit gnome.org mono autotools
+
+DESCRIPTION="Tasky is a simple task management app (TODO list) for the Linux Desktop"
+HOMEPAGE="http://live.gnome.org/Tasque"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+rememberthemilk eds +sqlite hiveminder debug"
+
+RDEPEND=">=dev-dotnet/gtk-sharp-2.12.7-r5
+ >=dev-dotnet/gnome-sharp-2.24.0
+ >=dev-dotnet/notify-sharp-0.4.0_pre20080912
+ >=dev-dotnet/ndesk-dbus-0.6
+ >=dev-dotnet/ndesk-dbus-glib-0.4
+ eds? ( >=dev-dotnet/evolution-sharp-0.18.1 )
+ sqlite? ( dev-db/sqlite:3 )
+ "
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ BACKEND=false
+ for usef in eds sqlite hiveminder rememberthemilk
+ do
+ use $usef && BACKEND=true
+ done
+ if [[ "${BACKEND}" != "true" ]]
+ then
+ eerror "You must select one of the following backends by enabling their useflag:"
+ eerror "eds ( integrates with the evolution schedule )"
+ eerror "sqlite ( uses a local, file-backed database to keep track of your TODO list )"
+ eerror "rememberthemilk ( integrates with www.rememberthemilk.com )"
+ eerror "hiveminder ( integrates with www.hiveminder.com )"
+ die "Please select a backend"
+ fi
+}
+
+src_prepare() {
+ #http://bugzilla.gnome.org/show_bug.cgi?id=566355
+ epatch "${FILESDIR}"/${P}-debug-fixup.patch
+ eautoreconf
+}
+
+src_configure() {
+ #http://bugzilla.gnome.org/show_bug.cgi?id=568910
+ export GTK_DOTNET_20_LIBS=" " \
+ GTK_DOTNET_20_CFLAGS=" "
+ econf --disable-backend-icecore \
+ --enable-backend-rtm \
+ $(use_enable sqlite backend-sqlite) \
+ $(use_enable eds backend-eds) \
+ $(use_enable hiveminder backend-hiveminder) \
+ $(use_enable debug)
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "emake failed"
+ dodoc NEWS TODO README AUTHORS || die "docs installation failed"
+ mv_command="cp -pPR" mono_multilib_comply
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index d44913cfe684..c6228209c10e 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,3 +1,2 @@
DIST tmux-1.4.tar.gz 259614 RMD160 d8d09ccac7c1c79244f96beccbd6d52f1cc50d1b SHA1 c0cb9b01aee9b2b5c939bacccd5c78cf6fa6773e SHA256 c7e005f32e256b8ece214b71c51947f4081af8c5f0400083e4adaac2c258bbc7
DIST tmux-1.5.tar.gz 374093 RMD160 08eec02bcbd91b3c37a36a05167f3758e7911973 SHA1 e26132f02f344f8d6d06ae87d11f6a7aad880f67 SHA256 eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306
-DIST tmux-1.6.tar.gz 388633 RMD160 e88d1ac4751920bf5a6b52be80f332f1eb2e8694 SHA1 8756f6bcecb18102b87e5d6f5952ba2541f68ed3 SHA256 faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6
diff --git a/app-misc/tmux/tmux-1.6.ebuild b/app-misc/tmux/tmux-1.6.ebuild
deleted file mode 100644
index e2ee165886cd..000000000000
--- a/app-misc/tmux/tmux-1.6.ebuild
+++ /dev/null
@@ -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-misc/tmux/tmux-1.6.ebuild,v 1.1 2012/01/25 09:03:16 wired Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
-SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="vim-syntax"
-
-DEPEND="
- || ( >=dev-libs/libevent-2.0.10
dotnet
+ Enable tomboy applet for
+ gnome-base/gnome-panel
Add support for the galago desktop presence framework
(dev-dotnet/galago-sharp)
diff --git a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
index 20fe5f48ae6f..1fe1de8ca881 100644
--- a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
+++ b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.9 2012/01/16 12:55:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.8 2011/10/27 06:02:25 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE="eds galago"
+IUSE="+applet eds galago"
RDEPEND=">=dev-lang/mono-2
>=dev-dotnet/gtk-sharp-2.12.6-r1:2
@@ -26,6 +26,9 @@ RDEPEND=">=dev-lang/mono-2
>=dev-libs/atk-1.2.4
>=gnome-base/gconf-2:2
>=app-text/gtkspell-2.0.9:2
+ applet? (
+ || ( gnome-base/gnome-panel[bonobo] =dev-dotnet/gnome-panel-sharp-2.24.0:2 )
eds? ( dev-libs/gmime:2.4[mono] )
galago? ( =dev-dotnet/galago-sharp-0.5* )"
DEPEND="${RDEPEND}
@@ -38,7 +41,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
G2CONF="${G2CONF}
- --disable-panel-applet
+ $(use_enable applet panel-applet)
$(use_enable eds evolution)
$(use_enable galago)
--disable-update-mimedb"
diff --git a/app-misc/tomboy/tomboy-1.6.1.ebuild b/app-misc/tomboy/tomboy-1.6.1.ebuild
index 7fc82ac121fe..7ab5dd4fd7e8 100644
--- a/app-misc/tomboy/tomboy-1.6.1.ebuild
+++ b/app-misc/tomboy/tomboy-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.6.1.ebuild,v 1.6 2012/01/16 12:55:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.6.1.ebuild,v 1.5 2011/10/27 06:02:25 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE="eds galago"
+IUSE="+applet eds galago"
RDEPEND="app-text/gtkspell:2
dev-dotnet/gconf-sharp:2
@@ -27,6 +27,9 @@ RDEPEND="app-text/gtkspell:2
dev-libs/atk
gnome-base/gconf:2
x11-libs/gtk+:2
+ applet? ( dev-dotnet/gnome-sharp:2
+ dev-dotnet/gnome-panel-sharp:2
+ gnome-base/gnome-panel[bonobo] )
eds? ( dev-libs/gmime:2.4[mono] )
galago? ( dev-dotnet/galago-sharp )"
DEPEND="${RDEPEND}
@@ -38,7 +41,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
G2CONF="${G2CONF}
- --disable-panel-applet
+ $(use_enable applet panel-applet)
$(use_enable eds evolution)
$(use_enable galago)
--disable-update-mimedb"
diff --git a/app-misc/tomboy/tomboy-1.8.3.ebuild b/app-misc/tomboy/tomboy-1.8.3.ebuild
index cedc9003b84f..9d4331681a40 100644
--- a/app-misc/tomboy/tomboy-1.8.3.ebuild
+++ b/app-misc/tomboy/tomboy-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.8.3.ebuild,v 1.2 2012/01/16 12:55:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.8.3.ebuild,v 1.1 2011/11/20 16:16:42 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/tomboy/"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="eds test"
+IUSE="+applet eds test"
# galago support dropped due upstream bug #660244
RDEPEND="app-text/gtkspell:2
@@ -27,6 +27,9 @@ RDEPEND="app-text/gtkspell:2
dev-libs/atk
gnome-base/gconf:2
x11-libs/gtk+:2
+ applet? ( dev-dotnet/gnome-sharp:2
+ dev-dotnet/gnome-panel-sharp:2
+ gnome-base/gnome-panel[bonobo] )
eds? ( dev-libs/gmime:2.4[mono] )"
# galago? ( dev-dotnet/galago-sharp )"
DEPEND="${RDEPEND}
@@ -38,7 +41,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
G2CONF="${G2CONF}
- --disable-panel-applet
+ $(use_enable applet panel-applet)
$(use_enable eds evolution)
$(use_enable test tests)
--disable-galago
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 8a9778736809..f754efe1b181 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,4 +1,4 @@
DIST tracker-0.10.27.tar.xz 5721444 RMD160 63e3609ac51fae013fc0daf9935ec50ef3a4c609 SHA1 01f0a52a21c3aecaaf6cfb140f7a4b5085a7bc5f SHA256 30ca97cc8a1c82cb0e09a921c0ebe8acbfe7be6908b2303266f447477465444f
DIST tracker-0.10.35.tar.xz 5754872 RMD160 6919a7623bf3f041b617d7c2a2b55856863b5e9e SHA1 93fdeb6be256085e72f1ab9f9e578332de9605f0 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3
+DIST tracker-0.12.7.tar.xz 5969180 RMD160 e31b85538145404640c303968ecbbb8f729d2564 SHA1 188c9aaa5478302be818e36c3ef126267971289d SHA256 e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4
DIST tracker-0.12.8.tar.xz 5876100 RMD160 10f29842973c0489d5e0c2e0c0c977ca87d47fee SHA1 a1a528bdcaacce4350c2368026083236db7cd165 SHA256 92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473
-DIST tracker-0.12.9.tar.xz 5867980 RMD160 1c6054ffc9f3588db0d355fcfb02703ab8d403c2 SHA1 b5fc5465f3da00c0b2b23cddc0f55a3d1b66d0b7 SHA256 ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c
diff --git a/app-misc/tracker/tracker-0.10.27.ebuild b/app-misc/tracker/tracker-0.10.27.ebuild
index c77ad04fe3a2..35380edb0e0a 100644
--- a/app-misc/tracker/tracker-0.10.27.ebuild
+++ b/app-misc/tracker/tracker-0.10.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.27.ebuild,v 1.2 2012/01/18 07:45:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.27.ebuild,v 1.1 2011/09/15 21:22:20 eva Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ PYTHON_DEPEND="2:2.6"
inherit eutils gnome2 linux-info python virtualx
DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
+HOMEPAGE="http://www.tracker-project.org/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-misc/tracker/tracker-0.10.35.ebuild b/app-misc/tracker/tracker-0.10.35.ebuild
index 1829b283687e..5551b24216ce 100644
--- a/app-misc/tracker/tracker-0.10.35.ebuild
+++ b/app-misc/tracker/tracker-0.10.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.2 2012/01/18 07:45:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.1 2011/11/08 21:45:34 eva Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ PYTHON_DEPEND="2:2.6"
inherit eutils gnome2 linux-info python virtualx
DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
+HOMEPAGE="http://www.tracker-project.org/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-misc/tracker/tracker-0.12.7.ebuild b/app-misc/tracker/tracker-0.12.7.ebuild
new file mode 100644
index 000000000000..63de79a65825
--- /dev/null
+++ b/app-misc/tracker/tracker-0.12.7.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.3 2011/11/26 19:27:22 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 linux-info multilib python versionator
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="http://www.tracker-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE="doc" is managed by eclass.
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+
+# Test suite highly disfunctional, loops forever
+# putting aside for now
+RESTRICT="test"
+
+# vala is built with debug by default (see VALAFLAGS)
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+RDEPEND="
+ >=app-i18n/enca-1.9
+ >=dev-db/sqlite-3.7[threadsafe]
+ >=dev-libs/glib-2.28:2
+ >=dev-libs/gobject-introspection-0.9.5
+ >=dev-libs/icu-4
+ || (
+ >=media-gfx/imagemagick-5.2.1[png,jpeg=]
+ media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+ >=media-libs/libpng-1.2
+ >=x11-libs/pango-1
+ sys-apps/util-linux
+
+ applet? (
+ >=gnome-base/gnome-panel-2.91.6
+ >=x11-libs/gdk-pixbuf-2.12:2
+ >=x11-libs/gtk+-3.0:3 )
+ eds? (
+ >=mail-client/evolution-2.91.90
+ >=gnome-extra/evolution-data-server-2.91.90 )
+ elibc_glibc? ( >=sys-libs/glibc-2.12 )
+ exif? ( >=media-libs/libexif-0.6 )
+ firefox-bookmarks? ( || (
+ >=www-client/firefox-4.0
+ >=www-client/firefox-bin-4.0 ) )
+ flac? ( >=media-libs/flac-1.2.1 )
+ flickr? ( net-libs/rest:0.7 )
+ gif? ( media-libs/giflib )
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
+ gsf? (
+ app-text/odt2txt
+ >=gnome-extra/libgsf-1.13 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10.31:0.10
+ upnp? ( >=media-libs/gupnp-dlna-0.5 )
+ !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
+ !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+ gtk? (
+ >=dev-libs/libgee-0.3:0
+ >=x11-libs/gtk+-3.0.0:3 )
+ iptc? ( media-libs/libiptcdata )
+ jpeg? ( virtual/jpeg:0 )
+ laptop? ( >=sys-power/upower-0.9 )
+ mp3? (
+ >=media-libs/taglib-1.6
+ gtk? ( x11-libs/gdk-pixbuf:2 ) )
+ networkmanager? ( >=net-misc/networkmanager-0.8 )
+ pdf? (
+ >=x11-libs/cairo-1
+ >=app-text/poppler-0.16[cairo,utils]
+ >=x11-libs/gtk+-2.12:2 )
+ playlist? ( dev-libs/totem-pl-parser )
+ rss? ( net-libs/libgrss )
+ thunderbird? ( || (
+ >=mail-client/thunderbird-5.0
+ >=mail-client/thunderbird-bin-5.0 ) )
+ tiff? ( media-libs/tiff )
+ vorbis? ( >=media-libs/libvorbis-0.22 )
+ xine? ( >=media-libs/xine-lib-1 )
+ xml? ( >=dev-libs/libxml2-2.6 )
+ xmp? ( >=media-libs/exempi-2.1 )"
+# strigi? ( >=app-misc/strigi-0.7 )
+# mp3? ( qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ >=dev-util/pkgconfig-0.20
+ applet? ( >=dev-lang/vala-0.12:0.12 )
+ gtk? (
+ >=dev-lang/vala-0.12:0.12
+ >=dev-libs/libgee-0.3 )
+ doc? (
+ app-office/dia
+ >=dev-util/gtk-doc-1.8
+ media-gfx/graphviz )
+ test? (
+ >=dev-libs/dbus-glib-0.82-r1
+ >=sys-apps/dbus-1.3.1[X] )
+"
+# strigi? ( >=dev-lang/vala-0.12:0.12 )
+PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )"
+
+function inotify_enabled() {
+ if linux_config_exists; then
+ if ! linux_chkconfig_present INOTIFY_USER; then
+ ewarn "You should enable the INOTIFY support in your kernel."
+ ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+ ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+ die 'missing CONFIG_INOTIFY'
+ fi
+ else
+ einfo "Could not check for INOTIFY support in your kernel."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ inotify_enabled
+
+ if use gstreamer ; then
+ G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
+ if use upnp; then
+ G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
+ else
+ G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
+ fi
+ elif use xine ; then
+ G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
+ else
+ G2CONF="${G2CONF} --enable-generic-media-extractor=external"
+ fi
+
+ # if use applet || use gtk || use strigi; then
+ if use applet || use gtk; then
+ G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
+ fi
+
+ # if use mp3 && (use gtk || use qt4); then
+ if use mp3 && use gtk; then
+ #G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+ G2CONF="${G2CONF} --enable-gdkpixbuf"
+ fi
+
+ # unicode-support: libunistring, libicu or glib ?
+ # According to NEWS, introspection is required
+ # FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
+ # is not being generated
+ # XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
+ # nautilus extension is in a separate package, nautilus-tracker-tags
+ G2CONF="${G2CONF}
+ --disable-hal
+ --disable-libcue
+ --enable-tracker-fts
+ --with-enca
+ --with-unicode-support=libicu
+ --enable-guarantee-metadata
+ --enable-introspection
+ --disable-libstreamanalyzer
+ --disable-qt
+ --disable-nautilus-extension
+ $(use_enable applet tracker-search-bar)
+ $(use_enable eds miner-evolution)
+ $(use_enable exif libexif)
+ $(use_enable firefox-bookmarks miner-firefox)
+ $(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
+ FIREFOX=${S}/firefox-version.sh
+ $(use_enable flac libflac)
+ $(use_enable flickr miner-flickr)
+ $(use_enable gnome-keyring)
+ $(use_enable gsf libgsf)
+ $(use_enable gtk tracker-explorer)
+ $(use_enable gtk tracker-preferences)
+ $(use_enable gtk tracker-needle)
+ $(use_enable iptc libiptcdata)
+ $(use_enable jpeg libjpeg)
+ $(use_enable laptop upower)
+ $(use_enable mp3 taglib)
+ $(use_enable networkmanager network-manager)
+ $(use_enable pdf poppler)
+ $(use_enable playlist)
+ $(use_enable rss miner-rss)
+ $(use_enable test functional-tests)
+ $(use_enable test unit-tests)
+ $(use_enable thunderbird miner-thunderbird)
+ $(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
+ THUNDERBIRD=${S}/thunderbird-version.sh
+ $(use_enable tiff libtiff)
+ $(use_enable vorbis libvorbis)
+ $(use_enable xml libxml2)
+ $(use_enable xmp exempi)"
+ # $(use_enable strigi libstreamanalyzer)
+
+ DOCS="AUTHORS ChangeLog NEWS README"
+
+ python_set_active_version 2
+}
+
+src_prepare() {
+ # Fix build failures with USE=strigi
+ epatch "${FILESDIR}/${PN}-0.12.3-strigi.patch"
+
+ # Fix functional tests scripts
+ find "${S}" -name "*.pyc" -delete
+ python_convert_shebangs -r 2 tests utils examples
+
+ # Don't run 'firefox --version' or 'thunderbird --version'; it results in
+ # access violations on some setups (bug #385347, #385495).
+ create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+ create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+ # FIXME: report broken tests
+ sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
+ -e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
+ -i tests/libtracker-miner/tracker-password-provider-test.c || die
+
+ gnome2_src_prepare
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Manually symlink extensions for {firefox,thunderbird}-bin
+ if use firefox-bookmarks; then
+ dosym /usr/share/xul-ext/trackerfox \
+ /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org || die
+ fi
+
+ if use thunderbird; then
+ dosym /usr/share/xul-ext/trackerbird \
+ /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org || die
+ fi
+}
+
+create_version_script() {
+ # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+ local v=$(best_version ${1})
+ v=${v#${1}-}
+ local vbin=$(best_version ${1}-bin)
+ vbin=${vbin#${1}-bin-}
+
+ if [[ -z ${v} ]]; then
+ v=${vbin}
+ else
+ version_compare ${v} ${vbin}
+ [[ $? -eq 1 ]] && v=${vbin}
+ fi
+
+ echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+ chmod +x "$3" || die
+}
diff --git a/app-misc/tracker/tracker-0.12.8.ebuild b/app-misc/tracker/tracker-0.12.8.ebuild
index b46f826508f1..481ca5c608a1 100644
--- a/app-misc/tracker/tracker-0.12.8.ebuild
+++ b/app-misc/tracker/tracker-0.12.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.8.ebuild,v 1.2 2012/01/18 07:45:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.8.ebuild,v 1.1 2011/11/26 19:27:22 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ PYTHON_DEPEND="2:2.6"
inherit eutils gnome2 linux-info multilib python versionator
DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
+HOMEPAGE="http://www.tracker-project.org/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-misc/tracker/tracker-0.12.9.ebuild b/app-misc/tracker/tracker-0.12.9.ebuild
deleted file mode 100644
index c29507338ff5..000000000000
--- a/app-misc/tracker/tracker-0.12.9.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.9.ebuild,v 1.3 2012/01/18 07:45:47 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info multilib python versionator
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
- >=app-i18n/enca-1.9
- >=dev-db/sqlite-3.7[threadsafe]
- >=dev-libs/glib-2.28:2
- >=dev-libs/gobject-introspection-0.9.5
- >=dev-libs/icu-4
- || (
- >=media-gfx/imagemagick-5.2.1[png,jpeg=]
- media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
- >=media-libs/libpng-1.2
- >=x11-libs/pango-1
- sys-apps/util-linux
-
- applet? (
- >=gnome-base/gnome-panel-2.91.6
- >=x11-libs/gdk-pixbuf-2.12:2
- >=x11-libs/gtk+-3.0:3 )
- eds? (
- >=mail-client/evolution-2.91.90
- >=gnome-extra/evolution-data-server-2.91.90 )
- elibc_glibc? ( >=sys-libs/glibc-2.12 )
- exif? ( >=media-libs/libexif-0.6 )
- firefox-bookmarks? ( || (
- >=www-client/firefox-4.0
- >=www-client/firefox-bin-4.0 ) )
- flac? ( >=media-libs/flac-1.2.1 )
- flickr? ( net-libs/rest:0.7 )
- gif? ( media-libs/giflib )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
- gsf? (
- app-text/odt2txt
- >=gnome-extra/libgsf-1.13 )
- gstreamer? (
- >=media-libs/gstreamer-0.10.31:0.10
- upnp? ( >=media-libs/gupnp-dlna-0.5 )
- !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
- !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
- gtk? (
- >=dev-libs/libgee-0.3:0
- >=x11-libs/gtk+-3.0.0:3 )
- iptc? ( media-libs/libiptcdata )
- jpeg? ( virtual/jpeg:0 )
- laptop? ( >=sys-power/upower-0.9 )
- mp3? (
- >=media-libs/taglib-1.6
- gtk? ( x11-libs/gdk-pixbuf:2 ) )
- networkmanager? ( >=net-misc/networkmanager-0.8 )
- pdf? (
- >=x11-libs/cairo-1
- >=app-text/poppler-0.16[cairo,utils]
- >=x11-libs/gtk+-2.12:2 )
- playlist? ( dev-libs/totem-pl-parser )
- rss? ( net-libs/libgrss )
- thunderbird? ( || (
- >=mail-client/thunderbird-5.0
- >=mail-client/thunderbird-bin-5.0 ) )
- tiff? ( media-libs/tiff )
- vorbis? ( >=media-libs/libvorbis-0.22 )
- xine? ( >=media-libs/xine-lib-1 )
- xml? ( >=dev-libs/libxml2-2.6 )
- xmp? ( >=media-libs/exempi-2.1 )"
-# strigi? ( >=app-misc/strigi-0.7 )
-# mp3? ( qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=dev-util/pkgconfig-0.20
- applet? ( >=dev-lang/vala-0.12:0.12 )
- gtk? (
- >=dev-lang/vala-0.12:0.12
- >=dev-libs/libgee-0.3 )
- doc? (
- app-office/dia
- >=dev-util/gtk-doc-1.8
- media-gfx/graphviz )
- test? (
- >=dev-libs/dbus-glib-0.82-r1
- >=sys-apps/dbus-1.3.1[X] )
-"
-# strigi? ( >=dev-lang/vala-0.12:0.12 )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )"
-
-function inotify_enabled() {
- if linux_config_exists; then
- if ! linux_chkconfig_present INOTIFY_USER; then
- ewarn "You should enable the INOTIFY support in your kernel."
- ewarn "Check the 'Inotify support for userland' under the 'File systems'"
- ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
- die 'missing CONFIG_INOTIFY'
- fi
- else
- einfo "Could not check for INOTIFY support in your kernel."
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- inotify_enabled
-
- if use gstreamer ; then
- G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
- if use upnp; then
- G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
- else
- G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
- fi
- elif use xine ; then
- G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
- else
- G2CONF="${G2CONF} --enable-generic-media-extractor=external"
- fi
-
- # if use applet || use gtk || use strigi; then
- if use applet || use gtk; then
- G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
- fi
-
- # if use mp3 && (use gtk || use qt4); then
- if use mp3 && use gtk; then
- #G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
- G2CONF="${G2CONF} --enable-gdkpixbuf"
- fi
-
- # unicode-support: libunistring, libicu or glib ?
- # According to NEWS, introspection is required
- # FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
- # is not being generated
- # XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
- # nautilus extension is in a separate package, nautilus-tracker-tags
- G2CONF="${G2CONF}
- --disable-hal
- --disable-libcue
- --enable-tracker-fts
- --with-enca
- --with-unicode-support=libicu
- --enable-guarantee-metadata
- --enable-introspection
- --disable-libstreamanalyzer
- --disable-qt
- --disable-nautilus-extension
- $(use_enable applet tracker-search-bar)
- $(use_enable eds miner-evolution)
- $(use_enable exif libexif)
- $(use_enable firefox-bookmarks miner-firefox)
- $(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
- FIREFOX=${S}/firefox-version.sh
- $(use_enable flac libflac)
- $(use_enable flickr miner-flickr)
- $(use_enable gnome-keyring)
- $(use_enable gsf libgsf)
- $(use_enable gtk tracker-explorer)
- $(use_enable gtk tracker-preferences)
- $(use_enable gtk tracker-needle)
- $(use_enable iptc libiptcdata)
- $(use_enable jpeg libjpeg)
- $(use_enable laptop upower)
- $(use_enable mp3 taglib)
- $(use_enable networkmanager network-manager)
- $(use_enable pdf poppler)
- $(use_enable playlist)
- $(use_enable rss miner-rss)
- $(use_enable test functional-tests)
- $(use_enable test unit-tests)
- $(use_enable thunderbird miner-thunderbird)
- $(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
- THUNDERBIRD=${S}/thunderbird-version.sh
- $(use_enable tiff libtiff)
- $(use_enable vorbis libvorbis)
- $(use_enable xml libxml2)
- $(use_enable xmp exempi)"
- # $(use_enable strigi libstreamanalyzer)
-
- DOCS="AUTHORS ChangeLog NEWS README"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix build failures with USE=strigi
- epatch "${FILESDIR}/${PN}-0.12.3-strigi.patch"
-
- # Fix functional tests scripts
- find "${S}" -name "*.pyc" -delete
- python_convert_shebangs -r 2 tests utils examples
-
- # Don't run 'firefox --version' or 'thunderbird --version'; it results in
- # access violations on some setups (bug #385347, #385495).
- create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
- create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
- # FIXME: report broken tests
- sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
- -e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
- -i tests/libtracker-miner/tracker-password-provider-test.c || die
-
- gnome2_src_prepare
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
- gnome2_src_install
-
- # Manually symlink extensions for {firefox,thunderbird}-bin
- if use firefox-bookmarks; then
- dosym /usr/share/xul-ext/trackerfox \
- /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
- fi
-
- if use thunderbird; then
- dosym /usr/share/xul-ext/trackerbird \
- /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
- fi
-}
-
-create_version_script() {
- # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
- local v=$(best_version ${1})
- v=${v#${1}-}
- local vbin=$(best_version ${1}-bin)
- vbin=${vbin#${1}-bin-}
-
- if [[ -z ${v} ]]; then
- v=${vbin}
- else
- version_compare ${v} ${vbin}
- [[ $? -eq 1 ]] && v=${vbin}
- fi
-
- echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
- chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 062c76951a28..fd892a566516 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.48 2012/01/18 07:45:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.47 2011/11/08 22:25:58 eva Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ PYTHON_DEPEND="2:2.6"
inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
+HOMEPAGE="http://www.tracker-project.org/"
EGIT_REPO_URI="git://git.gnome.org/${PN}
http://git.gnome.org/browse/${PN}"
SRC_URI=""
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 933cd1dbce95..2f6e6ee74d73 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,2 +1 @@
DIST when-1.1.28.tar.gz 50153 RMD160 0245e6d8bd8beacb7f75d72b4f691b0eb8c516a6 SHA1 82650d69154b1098eee9ea3702ac96866b0dcbe9 SHA256 16f7a00a6133b41bb8e05378e4be15514ad474ba9284d4acd7ab5f6da1173681
-DIST when-1.1.29.tar.gz 50826 RMD160 71172485326b2f08767ee9fae38f5c64e943199e SHA1 fba571196d347bb3017af3551fe5e0920a54ef8e SHA256 e1c6a6e60f173f697c03b97d68c5441be954bfbd4408a312ece85f053d92e830
diff --git a/app-misc/when/when-1.1.29.ebuild b/app-misc/when/when-1.1.29.ebuild
deleted file mode 100644
index 241d6a2e5af0..000000000000
--- a/app-misc/when/when-1.1.29.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/when/when-1.1.29.ebuild,v 1.1 2011/12/22 01:11:13 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/when_dist
-
-src_prepare() {
- # Fix path for tests
- sed -i 's,^ when, ./when,' Makefile
-}
-
-src_compile() { :; }
-
-src_test() {
- # The when command requires these files, or attempts to run setup function.
- mkdir "${HOME}"/.when
- touch "${HOME}"/.when/{calendar,preferences}
- emake test
-}
-
-src_install() {
- dobin ${PN}
- doman ${PN}.1
- dodoc README
-}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index 591111538477..bbd4443af909 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,3 +1,2 @@
DIST ytree-1.92.tar.gz 120953 RMD160 f971c40d0388a1b65deb7a191b55b79f2c59b86a SHA1 05387dc413af77b737d8d4bd76f20f5b87c86109 SHA256 9dc5154cf8fe07cd22d50dc9f29b576c8a680bc2a53c2bdfbf1adf99a2a0322f
DIST ytree-1.94.tar.gz 121704 RMD160 2266a82a5b8d743c1267f876e4d5950fc0223108 SHA1 2a4703a26d14dc0dda9d933d89f64c4fbff29ff9 SHA256 d6ab6983960108d1cc225dbacfc5ab1d3d0778555d7f70d36ec18c507148e020
-DIST ytree-1.97.tar.gz 121571 RMD160 1e8d00e0e2da160e580486c98369919c6d718cd4 SHA1 d9f66b41bda7ed28414a56388d0d9fb6ed3975c2 SHA256 9db152524d08ec0d61b2b83a37435c5e77ebfc4b21f973fddfb571beb445a60d
diff --git a/app-misc/ytree/ytree-1.97.ebuild b/app-misc/ytree/ytree-1.97.ebuild
deleted file mode 100644
index faa435b8d1ae..000000000000
--- a/app-misc/ytree/ytree-1.97.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ytree/ytree-1.97.ebuild,v 1.1 2012/01/30 17:21:14 jer Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A (curses-based) file manager"
-HOMEPAGE="http://www.han.de/~werner/ytree.html"
-SRC_URI="http://www.han.de/~werner/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-libs/readline
- sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.94-bindir.patch
-}
-
-pkg_setup() {
- tc-export CC
-}
-
-src_install() {
- emake DESTDIR="${D}usr" install || die "emake install failed"
- dodoc ytree.conf
-}
diff --git a/app-mobilephone/anyremote/Manifest b/app-mobilephone/anyremote/Manifest
index 137001acbf44..8b4d030c9345 100644
--- a/app-mobilephone/anyremote/Manifest
+++ b/app-mobilephone/anyremote/Manifest
@@ -1,3 +1,4 @@
+DIST anyremote-5.3.tar.gz 1704024 RMD160 14df95a751b2895b652260209176baebd25b1dec SHA1 5e7176ef9b71440c00e0858a8298f791c3dd8d62 SHA256 46db995ee34f4ce133dc31f22b33581eed88dad6bc988da6d3e29918f8f1bce9
DIST anyremote-5.4.1.tar.gz 1705766 RMD160 618e2c0fe38b9498556fb75d1456a2d564017e7c SHA1 cc6246fdcc47d80fd86b50c1cd191b260790edc4 SHA256 6f1277b008b96d6fd1cc4c5832c6bd9d054135889c8f0021134f1bd84b158bb7
DIST anyremote-5.4.2.tar.gz 1714090 RMD160 bb2f2b6455c57715a27575f0187ea99fd7e6c237 SHA1 532d677f1172589e08d0b7b121f503f47c4bddef SHA256 7eacdd001bd2ae9c11966ec2d18ce0698a30b651f12c43468893e7a14b2d5670
-DIST anyremote-5.5.tar.gz 1737718 RMD160 12115064351d93ce0f0cec58152562a5a9111add SHA1 486b4f0d74bcfe6c334b65d8a8193d7e9470b592 SHA256 0dab10f1569fbfc2d6f316dfde0590450eee6422b977fda1861d92c327fc9d04
+DIST anyremote-5.4.tar.gz 1705367 RMD160 eace7ffea8c64c41fd3b2f27c4919fe6326581ff SHA1 8ff07dfe1f273452084fda191d2e19ea2f3714da SHA256 a2f4c3c7c55149e8ef2eb9b08f7f950607361da8c7c8e47587d67ccb83516782
diff --git a/app-mobilephone/anyremote/anyremote-5.3.ebuild b/app-mobilephone/anyremote/anyremote-5.3.ebuild
new file mode 100644
index 000000000000..50461ef98e0d
--- /dev/null
+++ b/app-mobilephone/anyremote/anyremote-5.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/anyremote/anyremote-5.3.ebuild,v 1.3 2011/01/24 14:47:37 phajdan.jr Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="Anyremote provides wireless bluetooth, infrared or cable remote control service"
+HOMEPAGE="http://anyremote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth dbus"
+
+RDEPEND="bluetooth? ( net-wireless/bluez )
+ dbus? ( sys-apps/dbus )
+ x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_configure() {
+ econf --docdir="/usr/share/doc/${PF}/" $(use_enable bluetooth) $(use_enable dbus)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README || die "install doc failed"
+}
diff --git a/app-mobilephone/anyremote/anyremote-5.4.ebuild b/app-mobilephone/anyremote/anyremote-5.4.ebuild
new file mode 100644
index 000000000000..a461df5de51e
--- /dev/null
+++ b/app-mobilephone/anyremote/anyremote-5.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/anyremote/anyremote-5.4.ebuild,v 1.3 2011/04/13 20:16:58 maekke Exp $
+
+EAPI="2"
+
+DESCRIPTION="Anyremote provides wireless bluetooth, infrared or cable remote control service"
+HOMEPAGE="http://anyremote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bluetooth dbus"
+
+RDEPEND="bluetooth? ( net-wireless/bluez )
+ dbus? ( sys-apps/dbus )
+ x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_configure() {
+ econf --docdir="/usr/share/doc/${PF}/" $(use_enable bluetooth) $(use_enable dbus)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README || die "install doc failed"
+}
diff --git a/app-mobilephone/anyremote/anyremote-5.5.ebuild b/app-mobilephone/anyremote/anyremote-5.5.ebuild
deleted file mode 100644
index 079a19e57af6..000000000000
--- a/app-mobilephone/anyremote/anyremote-5.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/anyremote/anyremote-5.5.ebuild,v 1.1 2012/01/22 21:01:11 hwoarang Exp $
-
-EAPI="2"
-
-DESCRIPTION="Anyremote provides wireless bluetooth, infrared or cable remote control service"
-HOMEPAGE="http://anyremote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth dbus"
-
-RDEPEND="bluetooth? ( net-wireless/bluez )
- dbus? ( sys-apps/dbus )
- x11-libs/libXtst"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_configure() {
- econf --docdir="/usr/share/doc/${PF}/" $(use_enable bluetooth) $(use_enable dbus)
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS README || die "install doc failed"
-}
diff --git a/app-mobilephone/obexd/Manifest b/app-mobilephone/obexd/Manifest
index a089c05f6973..059f18bee60f 100644
--- a/app-mobilephone/obexd/Manifest
+++ b/app-mobilephone/obexd/Manifest
@@ -1,2 +1 @@
DIST obexd-0.42.tar.gz 426826 RMD160 0bf271bb34954d51759350f7e50772ca36dab6b6 SHA1 5b9f701ef562c0f900af792b024367d3383f41ad SHA256 b2e8c084b77584a0e326cd7d45c573d4f12a33454cf5d629f22980fa2368fd4f
-DIST obexd-0.44.tar.xz 320852 RMD160 7a8672335f0bf4dcc857cf54f27872922c908fd6 SHA1 6b01b9f8045aea0d4553268ce61d76567ddd5c5e SHA256 e2aba4a74ac0ec76249d550bb1d4d6423dfbeb48e95f39029ad268d0657041b3
diff --git a/app-mobilephone/obexd/obexd-0.44.ebuild b/app-mobilephone/obexd/obexd-0.44.ebuild
deleted file mode 100644
index 89bc6c118f99..000000000000
--- a/app-mobilephone/obexd/obexd-0.44.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.44.ebuild,v 1.2 2012/01/23 15:13:49 ago Exp $
-
-EAPI="4"
-
-DESCRIPTION="OBEX Server and Client"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
-IUSE="-eds nokia -server usb"
-
-RDEPEND="eds? ( gnome-extra/evolution-data-server )
- !eds? ( dev-libs/libical )
- net-wireless/bluez
- >=dev-libs/openobex-1.4
- >=dev-libs/glib-2.16:2
- sys-apps/dbus
- server? ( !app-mobilephone/obex-data-server )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_configure() {
- econf \
- --disable-debug \
- $(use_with eds phonebook ebook) \
- $(use_enable nokia pcsuite) \
- $(use_enable server) \
- $(use_enable usb)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README doc/*.txt
-}
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
index 03b97f41d43d..207cf8ed16c9 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild,v 1.4 2011/12/21 08:37:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild,v 1.2 2009/03/20 13:30:28 josejx Exp $
inherit eutils autotools
@@ -10,7 +10,7 @@ SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="media-sound/gsm"
diff --git a/app-office/abiword/abiword-2.8.6-r2.ebuild b/app-office/abiword/abiword-2.8.6-r2.ebuild
index 98f0d7707ba4..e8bd5e4a0eb3 100644
--- a/app-office/abiword/abiword-2.8.6-r2.ebuild
+++ b/app-office/abiword/abiword-2.8.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.5 2012/01/31 15:53:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.1 2011/12/04 20:03:03 pacho Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -16,11 +16,8 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="collab cups gnome grammar latex math ots openxml +plugins readline spell wordperfect wmf thesaurus" # svg
-
-# You need 'plugins' enabled if want to enable the extra plugins
-REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="collab cups gnome grammar latex math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
# libgsf raised to make sure it provides gio backend
# not enabling telepathy backend for collab, it depends on libempathy-gtk which
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index f634e1bd674b..bc820f5a9081 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,3 +1,3 @@
+DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a1 SHA1 b6e97634878fe52785f3dec7d6394a18579d4a50 SHA256 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd
DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
-DIST akonadi-1.7.0.tar.bz2 210281 RMD160 0125b31a02143be7e50f427162bc9e7d0421a94d SHA1 794be377ed42d6ec906a3c9eb36af28493d7ea56 SHA256 bfb9228d83c1dfe1787883682afc4b9ac8b35096888a2b1ba0d3bc604d96b580
diff --git a/app-office/akonadi-server/akonadi-server-1.3.1.ebuild b/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
new file mode 100644
index 000000000000..bbd307d0e697
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.3.1.ebuild,v 1.12 2011/10/17 17:08:57 jer Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="+mysql postgres sqlite +server"
+
+CDEPEND="
+ dev-libs/boost
+ >=dev-libs/soprano-2.2
+ >=x11-libs/qt-gui-4.5.0:4[dbus]
+ >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?,sqlite?]
+ >=x11-libs/qt-test-4.5.0:4
+ x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt
+ >=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+ server? (
+ postgres? ( dev-db/postgresql-server )
+ )
+"
+
+S="${WORKDIR}/${P/-server/}"
+
+src_install() {
+ # Set default storage backend in order: MySQL, PostgreSQL, SQLite
+ if use mysql; then
+ driver="QMYSQL"
+ elif use postgres; then
+ driver="QPSQL"
+ elif use sqlite; then
+ driver="QSQLITE"
+ fi
+ # Who knows, maybe it accidentally fixes our permission issues
+ cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${driver}
+EOF
+ insinto /usr/share/config/akonadi
+ doins "${T}"/akonadiserverrc || die "doins failed"
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ if use mysql || use postgres || use sqlite; then
+ local func=elog
+ ( use postgres || use sqlite ) && func=ewarn
+ echo
+ ${func} "${driver} has been set as your default akonadi storage backend."
+ ${func} "You can override it in your ~/.config/akonadi/akonadiserverrc."
+ ${func} "Available drivers are:"
+ ${func} "QMYSQL, QPSQL (testing), QSQLITE (experimental)"
+ ${func} "Be advised that QMYSQL is the one fully tested and officially supported."
+ use sqlite && ewarn "If you experience random data losses using QSQLITE driver, you have been warned."
+ echo
+ else
+ echo
+ ewarn "You have decided to build akonadi-server with"
+ ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
+ ewarn "akonadi-server will not be functional."
+ echo
+ fi
+}
diff --git a/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
deleted file mode 100644
index 8bc959488166..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,102 +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/akonadi-server/akonadi-server-1.6.2-r1.ebuild,v 1.4 2012/01/16 20:56:01 ago Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
- dev-libs/boost
- >=dev-libs/soprano-2.6.51
- >=x11-libs/qt-gui-4.5.0:4[dbus]
- >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
- >=x11-libs/qt-test-4.5.0:4
- x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
- dev-libs/libxslt
- >=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
- postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
- # Set default storage backend in order: SQLite, MySQL, PostgreSQL
- # reverse driver check to keep the order
-
- if use postgres; then
- DRIVER="QPSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use mysql; then
- DRIVER="QMYSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use sqlite; then
- DRIVER="QSQLITE3"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- # Notify about driver name change
- if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
- ewarn
- ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
- ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
- fi
-
- # Notify about MySQL not being default anymore
- if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
- ewarn
- ewarn "MySQL driver is not enabled by default in Gentoo anymore."
- ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
- ewarn "${CATEGORY}/${PN}."
- ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
- ewarn "Available drivers are:${AVAILABLE}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DAKONADI_USE_STRIGI_SEARCH=OFF"
- $(cmake-utils_use test AKONADI_BUILD_TESTS)
- $(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- # Who knows, maybe it accidentally fixes our permission issues
- cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
- insinto /usr/share/config/akonadi
- doins "${T}"/akonadiserverrc
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- echo
- elog "${DRIVER} has been set as your default akonadi storage backend."
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are: ${AVAILABLE}"
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.6.2.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
new file mode 100644
index 000000000000..c876fd1eb19a
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.6.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.6.2.ebuild,v 1.4 2011/12/07 22:06:37 hwoarang Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+ dev-libs/boost
+ >=dev-libs/soprano-2.6.51
+ >=x11-libs/qt-gui-4.5.0:4[dbus]
+ >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+ >=x11-libs/qt-test-4.5.0:4
+ x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt
+ >=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+ postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+ # Set default storage backend in order: SQLite, MySQL, PostgreSQL
+ if use sqlite; then
+ DRIVER="QSQLITE3"
+ AVAILABLE+=" ${driver}"
+ elif use mysql; then
+ DRIVER="QMYSQL"
+ AVAILABLE+=" ${driver}"
+ elif use postgres; then
+ DRIVER="QPSQL"
+ AVAILABLE+=" ${driver}"
+ fi
+
+ # Notify about driver name change
+ if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+ ewarn
+ ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+ ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+ fi
+
+ # Notify about MySQL not being default anymore
+ if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+ ewarn
+ ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+ ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+ ewarn "${CATEGORY}/${PN}."
+ ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+ ewarn "Available drivers are:${AVAILABLE}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DAKONADI_USE_STRIGI_SEARCH=OFF"
+ $(cmake-utils_use test AKONADI_BUILD_TESTS)
+ $(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ # Who knows, maybe it accidentally fixes our permission issues
+ cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+ insinto /usr/share/config/akonadi
+ doins "${T}"/akonadiserverrc
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ echo
+ elog "${DRIVER} has been set as your default akonadi storage backend."
+ elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+ elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
deleted file mode 100644
index e0393deca50f..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
+++ /dev/null
@@ -1,101 +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/akonadi-server/akonadi-server-1.7.0.ebuild,v 1.1 2012/01/25 14:51:10 johu Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="mysql postgres +sqlite test"
-
-CDEPEND="
- dev-libs/boost
- >=dev-libs/soprano-2.6.51
- >=x11-libs/qt-gui-4.5.0:4[dbus]
- >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
- >=x11-libs/qt-test-4.5.0:4
- x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
- dev-libs/libxslt
- >=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
- postgres? ( dev-db/postgresql-server )
-"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-S=${WORKDIR}/${P/-server/}
-
-pkg_setup() {
- # Set default storage backend in order: SQLite, MySQL, PostgreSQL
- # reverse driver check to keep the order
- if use postgres; then
- DRIVER="QPSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use mysql; then
- DRIVER="QMYSQL"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- if use sqlite; then
- DRIVER="QSQLITE3"
- AVAILABLE+=" ${DRIVER}"
- fi
-
- # Notify about driver name change
- if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
- ewarn
- ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
- ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
- fi
-
- # Notify about MySQL not being default anymore
- if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
- ewarn
- ewarn "MySQL driver is not enabled by default in Gentoo anymore."
- ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
- ewarn "${CATEGORY}/${PN}."
- ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
- ewarn "Available drivers are:${AVAILABLE}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DAKONADI_USE_STRIGI_SEARCH=OFF
- $(cmake-utils_use test AKONADI_BUILD_TESTS)
- $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- # Who knows, maybe it accidentally fixes our permission issues
- cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
- insinto /usr/share/config/akonadi
- doins "${T}"/akonadiserverrc
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- echo
- elog "${DRIVER} has been set as your default akonadi storage backend."
- elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are: ${AVAILABLE}"
-}
diff --git a/app-office/akonadi-server/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch b/app-office/akonadi-server/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch
new file mode 100644
index 000000000000..49228ef8b8f0
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch
@@ -0,0 +1,64 @@
+commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c
+Author: Sergio Martins
+Date: Mon Sep 12 13:48:33 2011 +0100
+
+ Fix crash on agent_launcher exit.
+
+ Don't unload plugins here. They will be unloaded on application exit,
+ so it's redundant.
+
+ Seems they are being unloaded too early, before QThreadStorage
+ cleanup occurs:
+
+ ==18802== Invalid read of size 8
+ ==18802== at 0x53178AE: QThreadStorage::deleteData(void*) (in
+ /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1)
+ ==18802== by 0x5E8F8CF: QThreadStorageData::set(void*)
+ (qthreadstorage.cpp:165)
+ ==18802== by 0x5317940: void
+ qThreadStorage_setLocalData(QThreadStorageData&, QFontCache**)
+ (qthreadstorage.h:92)
+ ==18802== by 0x53165BA:
+ QThreadStorage::setLocalData(QFontCache*) (qthreadstorage.h:148)
+ ==18802== by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632)
+ ==18802== by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182)
+ ==18802== by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647)
+ ==18802== by 0x50603B2: QApplication::~QApplication()
+ (qapplication.cpp:1172)
+ ==18802== by 0x41B1F6: main (agentlauncher.cpp:28)
+ ==18802== Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd
+
+ CCBUG: 261788
+
+diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp
+index 2d62d3b..456a124 100644
+--- a/agentserver/agentpluginloader.cpp
++++ b/agentserver/agentpluginloader.cpp
+@@ -25,13 +25,8 @@ using namespace Akonadi;
+
+ AgentPluginLoader::~AgentPluginLoader()
+ {
+- QHash::iterator it = m_pluginLoaders.begin();
+- while ( it != m_pluginLoaders.end() ) {
+- it.value()->unload();
+- ++it;
+- }
+-
+ qDeleteAll( m_pluginLoaders );
++ m_pluginLoaders.clear();
+ }
+
+ QPluginLoader *AgentPluginLoader::load( const QString &pluginName )
+diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h
+index 77f5de9..c8c815f 100644
+--- a/agentserver/agentpluginloader.h
++++ b/agentserver/agentpluginloader.h
+@@ -26,7 +26,7 @@ class AgentPluginLoader
+ {
+ public:
+ /**
+- Unloads and deletes all instantiated QPluginLoaders.
++ Deletes all instantiated QPluginLoaders.
+ */
+ ~AgentPluginLoader();
+
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index 8d1e86a9cefb..f580a202f05f 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,4 +2,7 @@
kde
+
+ Use locally installed database server.
+
diff --git a/app-office/borg/Manifest b/app-office/borg/Manifest
index b5bb46c0fa9b..e90703afc437 100644
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -1 +1,3 @@
+DIST borg_src_1.4.zip 1205432 RMD160 7dede3d37db1c12d5f4415fba86a09e37afe37e0 SHA1 44ec2153d796d144ac0aa741b99876e70d55c479 SHA256 f832654ad6acbe54593cf326cd483044de8cd0d23d75e272d61dfa4aaa4e0dad
+DIST borg_src_1_5_2.zip 4173264 RMD160 c3a1b3eac1000b58c1722dd9d04270a743902a3d SHA1 40819e73062c1a485362aafc605a448843628e57 SHA256 410060ff5e5b4fe3eef61d2b83b19ecc497084a465d72e72382f3a0844f65c0a
DIST borg_src_1_7_4.zip 4012440 RMD160 a425cefee55f10d5fbc1a32ec60979e8b19aa53b SHA1 9961530ae6e6d3249a3755500832e10592005454 SHA256 b27eb694987c25134d8381d70f4daeb13c6702f75887768e49c0746ad4fb0d1c
diff --git a/app-office/borg/borg-1.4-r1.ebuild b/app-office/borg/borg-1.4-r1.ebuild
new file mode 100644
index 000000000000..4a53fe9341e9
--- /dev/null
+++ b/app-office/borg/borg-1.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.4-r1.ebuild,v 1.1 2006/09/12 19:54:03 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Calendar and task tracker, written in Java"
+HOMEPAGE="http://borg-calendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/borg-calendar/borg_src_${PV}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip
+ dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/borg_src/BORG Calendar Common/"
+
+src_compile() {
+
+ cd ant
+ eant borg-jar || die "compile problem"
+
+}
+
+src_install() {
+
+ java-pkg_dojar dist/${PN}.jar
+
+ echo "#!/bin/sh" > ${PN}
+ echo "cd /usr/share/${PN}" >> ${PN}
+ echo "\${JAVA_HOME}/bin/java -jar \$(java-config -p borg) \$*" >> ${PN}
+
+ dobin ${PN}
+
+}
diff --git a/app-office/borg/borg-1.5.2.ebuild b/app-office/borg/borg-1.5.2.ebuild
new file mode 100644
index 000000000000..fd2f236a6dea
--- /dev/null
+++ b/app-office/borg/borg-1.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.5.2.ebuild,v 1.4 2009/12/17 10:49:53 ssuominen Exp $
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="Calendar and task tracker, written in Java"
+HOMEPAGE="http://borg-calendar.sourceforge.net/"
+MY_PN="${PN}_src"
+MY_PV="$(replace_all_version_separators _ )"
+SRC_URI="mirror://sourceforge/borg-calendar/${MY_PN}_${MY_PV}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+COMMON_DEP="
+ =dev-java/commons-httpclient-3*
+ dev-java/sun-javamail
+ dev-java/ical4j
+ dev-java/javahelp
+ dev-java/jdictrayapi
+ =dev-java/servletapi-2.4*"
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip
+ ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # Upstream is dead and we already have dev-java/jcalendar
+ # but it's not the same thing
+ mv BORGCalendarCommon/lib/jcalendar.jar "${T}"
+ rm -v */lib/*.jar || die
+ rm -v */*/lib/*.jar || die
+ cd BORGCalendarCommon/lib/ || die
+ java-pkg_jar-from sun-javamail
+ java-pkg_jar-from commons-httpclient-3
+ java-pkg_jar-from ical4j
+ java-pkg_jar-from javahelp
+ java-pkg_jar-from jdictrayapi
+ java-pkg_jar-from servletapi-2.4
+ mv "${T}/jcalendar.jar" . || die
+}
+
+EANT_BUILD_XML="BORGCalendarCommon/ant/build.xml"
+EANT_BUILD_TARGET=" "
+
+src_install() {
+ java-pkg_dojar ./BORGCalendarCommon/dist/*.jar
+ java-pkg_dojar BORGCalendarCommon/lib/jcalendar.jar
+ java-pkg_dolauncher ${PN} --main net.sf.borg.control.Borg
+}
diff --git a/app-office/calligra-l10n/Manifest b/app-office/calligra-l10n/Manifest
index acd4be2fcb1f..ca920e0453f4 100644
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@@ -1,46 +1,44 @@
-DIST calligra-l10n-ca-2.3.85.tar.bz2 491596 RMD160 2e62962f2fca4b43965da82b6e5b4a93cc53a832 SHA1 20c9766f0d87651bb6fef6ac0d53497b8d658be7 SHA256 ff67632ee1be60c9dca2e116922749fd48de7897913bb3a506ec364cd76256b6
-DIST calligra-l10n-ca-2.3.86.tar.bz2 486728 RMD160 a3344a6a5b35699bd2c05716d69085c8c9b0037d SHA1 cea97054ed3c711b1f81ffe54fc3ab3581fd89ed SHA256 2c49ac38573f928345cd8720cc9accecd5a87e95273c7abe2b27479f44e18026
-DIST calligra-l10n-ca@valencia-2.3.85.tar.bz2 374813 RMD160 b4beec26c5450d116b206142cf815a8c5bc4f8d7 SHA1 5d736646c356a4c21c44714979c2232881e24ea8 SHA256 d6f86839ba42fb575cca17ca3922ffab9ab9f3456698451c234061abd08600bf
-DIST calligra-l10n-ca@valencia-2.3.86.tar.bz2 374966 RMD160 a641e2acaf76d670cc9c15f56afe8c6bf1bcb175 SHA1 7f6d99ed133eef021490de11e95fed1033a160ca SHA256 762b0eb4582348f877a7e59f9d5e9ea1965f77f31db47d757bff7c07d2a538c7
-DIST calligra-l10n-cs-2.3.85.tar.bz2 344866 RMD160 f9c916b8c07bab084fbc39b9cc31fb786f40e4e3 SHA1 0ac229f73e66385269a73ee9563a19786cb6584b SHA256 879ac73673bbdbfd8cd5d15dbbbfc2557bec954eccc19c084fe8b81b9b2ab87e
-DIST calligra-l10n-cs-2.3.86.tar.bz2 344825 RMD160 b5f682f6da7603241fd51a53f066915c5b0583af SHA1 5e142a3ac4cc222307ff5405e833a2ccbcc85dd2 SHA256 3dc8f2f159cdc154e53b8295b6274d049b9246628daf00082d426e86e2f8b1e1
-DIST calligra-l10n-da-2.3.85.tar.bz2 485117 RMD160 d7d4e33b55ce814cf0bcef1e1aaa4452b1e4214e SHA1 6a355162008646ac0218873ce365d440c852258f SHA256 b4656c4f0e806340e2b96dd60394b342e90ea573bf0c5eeac5ccf3f3a8094447
-DIST calligra-l10n-da-2.3.86.tar.bz2 485121 RMD160 d6000c2fc44a7492cee3ff661c8823323c3bcc68 SHA1 79e6b53ef8c8655b49f4dd8663b4475792eae94d SHA256 796be3c8947a5b70d21d2381eb16a5caf361633b002ccfdb07442446036109df
-DIST calligra-l10n-de-2.3.85.tar.bz2 552548 RMD160 db646e5542411969a7b43c40636dfd5cb793c3e7 SHA1 11e1d6b9370702694bfc49d714828a7c0a0ba540 SHA256 54c831099ee19ff90c5d4a8da2ce106eb7bc5f7fb7efaebb76af59984dd19711
-DIST calligra-l10n-de-2.3.86.tar.bz2 438769 RMD160 6f92c7dfacce2f86e21e773ff4c5cc02d496732f SHA1 d1199badc7d88d82c7ade931aa57f83134492b71 SHA256 8a59a923437365c2814072e1fa375682195e7a8c9c0d8ff5506ec09be0333ce4
-DIST calligra-l10n-el-2.3.85.tar.bz2 410278 RMD160 c9287c68141411f86ba8838f92c360880406cedd SHA1 5d05a7d7d6fd0ea51dbe4ed4462da51fb0504737 SHA256 5e49103efe1aaa9274344535e1e9c63ee1e0147ee019d43bf5f0f62be165d85a
-DIST calligra-l10n-el-2.3.86.tar.bz2 409323 RMD160 dca1b48491bdc285a0d8b91b472c29354b0ed0cb SHA1 d540c3cbf8bbb244da5463e0a20b046d18ca2529 SHA256 57b86de85983430442e23b98f0e9b1c7cab52a612dcbbe1bd8a3deb7f31c7b54
-DIST calligra-l10n-en_GB-2.3.85.tar.bz2 384651 RMD160 e3aea25e649d87c95173df748ea436024b79bfff SHA1 4d115af9b17dfd1178633f320dfcc77687555b11 SHA256 b5221680d2a31f6be2047e705750dfea4de27f464ff3b7f1ac3e8bb8e1aee245
-DIST calligra-l10n-en_GB-2.3.86.tar.bz2 384671 RMD160 0929f1f053d7e8be3627b44f5827dfa2a7689faa SHA1 4245ea002d345496dd35b373354640aaa4d18bd6 SHA256 d70528020c69b35dd4215d1bad9f467d47e1dcabfd41d38d39d79c7741fc470e
-DIST calligra-l10n-es-2.3.85.tar.bz2 4510451 RMD160 30a46d9e55c0d605b3a5260c9ab8f2cd29a823bd SHA1 9d14e9df34ae688fc49658cc59756b888e48af72 SHA256 f9091393d8908d30eb724c34e833069514886e7b4b9e9b5912b3a28ab6bf731f
-DIST calligra-l10n-es-2.3.86.tar.bz2 4511356 RMD160 d4fb53f6110317ac606c16ec01e0e4487286877e SHA1 af31f15fedbf5dd26e896e4e03cc6f9be2a9cd4b SHA256 55ff2d4e0c0be5d6ba256feb78a98c561e9c76a78d7094a2445bfe41a5f066b6
-DIST calligra-l10n-et-2.3.85.tar.bz2 599490 RMD160 bd0dcacfaa4c4c6c19a3c4fc94b060ffd1664754 SHA1 e08aa51fed706cf2f5b9e3009d60be6d932dab4b SHA256 46e9a5076cdc9b4c3cf3e487e6f90bcc30861d5962f0179b17c8a736af0e6a8f
-DIST calligra-l10n-et-2.3.86.tar.bz2 599342 RMD160 757829cc0ec2613132681212044bf6c0618785ed SHA1 690eaf87782d31c279212e36fb82a9a5a409a12e SHA256 8b420b8e5c845f4edf2651c13475ca11c1fc002d88991fe0f9efa7290b3e6fb2
-DIST calligra-l10n-fr-2.3.85.tar.bz2 5532154 RMD160 90f6abe26b5a025267ce2b3dd153d30136ea55df SHA1 451e06acb98c84a87f2d1417049494f13a8694d2 SHA256 9ac36a0797202e7e8adb16ac887696b129d846186d4242c274be9aa8a8333bff
-DIST calligra-l10n-fr-2.3.86.tar.bz2 5532701 RMD160 aa85978d847712b8d4de1a1095b17ee25f423982 SHA1 ee48f4fe54937e91aac05477ee8c87a312135f64 SHA256 cb7c6649e774fceebe26793401b27f96e9f8a2df9cf2dc7ea61baf640b2e1fce
-DIST calligra-l10n-it-2.3.85.tar.bz2 543735 RMD160 b98478768957dd1552ba7b2074975d3d313725b0 SHA1 40dac49dabd90391c6aababc2ce2df2bdcd21928 SHA256 ced6ff1e0648128e58ee5e2e151bde1e7b415cf04a86333a07abed56e600e92f
-DIST calligra-l10n-it-2.3.86.tar.bz2 544625 RMD160 160f3d6c65dc95daecd9d111eaeb1fd75fdb5e2c SHA1 a29fbcbd682603ec1636b5293d59060cb1073b3f SHA256 bfac502e0f94f67922428fc8f96782729a427b9d5aac399e6e9576ab0e2873f2
-DIST calligra-l10n-kk-2.3.85.tar.bz2 387284 RMD160 60d66cbb583d8de25bac870649414c24709b48f3 SHA1 0d3b4da6cf7925bf001e12737795032f6af5d950 SHA256 9921eb2ac9bdb5c05ba14c6e41dd1e52e8bc9efd27cd4733410725b6d8f81a78
-DIST calligra-l10n-kk-2.3.86.tar.bz2 391114 RMD160 2c6e39158ee34a806e146d645ec79498f62d9da7 SHA1 aecd212cd93d4f72fa1dc0ee29177d632223a469 SHA256 b18f9629bac0454bcb8a2d9f819d5dfc22155fdc701f8ff468a50f0a74f83a0e
-DIST calligra-l10n-nb-2.3.85.tar.bz2 367044 RMD160 414f8b0dac79f1213b5d0f24c928e5649df6dc5e SHA1 88189077b20d1a76ad36fb7ef58521924648827a SHA256 61a7fa056d79fdb0cf2b13fdfc83d0752b7a7ad372e64497369c52eb3d319919
-DIST calligra-l10n-nb-2.3.86.tar.bz2 366905 RMD160 093476f1c71fc5901ee07e96ef329d21ae1e677e SHA1 d27197f85f3e47734c2976bd6ed53fbd74a04f1f SHA256 d510ffb005efba873ad298101c6596a12541d11bab5ca5d90355135f9aed9d6d
-DIST calligra-l10n-nds-2.3.85.tar.bz2 408492 RMD160 a1f3813db475594ec2bda4f172e2213ad4275e17 SHA1 c24a80581c77c4cc2d668038d939ea8a3bb5035c SHA256 7edad3556740a6f13a85af9c83f40764f96cc23c6b6e792bbbd1d9c32c48d74c
-DIST calligra-l10n-nds-2.3.86.tar.bz2 408731 RMD160 e7c00db07e2c34c1b145cfa39a092a564d621e95 SHA1 8c075509019f5915e4e205e9e3d619ad7863592d SHA256 a1d372a5b9bcb102135ce3f6f4f718f0fdc3b111fb88231d77b5b71051fb5d14
-DIST calligra-l10n-nl-2.3.85.tar.bz2 2388082 RMD160 355d2f93d8d57dbb45fb4e0ab2d56e3b995e9172 SHA1 e6a56a93c72b0ccf3c2718243623f0a3d6e818db SHA256 d5c1096356e4848cd541ad75ee0cf82cdfbed03812112df0eed2dc4f44b1a345
-DIST calligra-l10n-nl-2.3.86.tar.bz2 2388419 RMD160 6995002a5e9247627aff7af5af19b8a024695839 SHA1 1aee59696ad69e50b95d1a70ee61eb3b902926a8 SHA256 65d8b71ca9a25bae91fd924d176e4491c2decf83d7a5d90011c13e826eaa08b5
-DIST calligra-l10n-pl-2.3.85.tar.bz2 426284 RMD160 d6c9288939052bc8de530aeb8b83443079b02ccd SHA1 b6e0640bb32ad809a2e371f3ab9e19804c27d12c SHA256 1725bc8a4a319aaf3f44ffd853cf3e7e25f3f80d4441a33a6a0c608fa5977509
-DIST calligra-l10n-pl-2.3.86.tar.bz2 427540 RMD160 7cad3b5f4b442ad7812109ee2c42988749150df8 SHA1 75f3e0cab788166875eaf5fe818c927602b28483 SHA256 acd5c9c858494b0c3d2b00d0c3462f1a0be57ee9637084b12ae9906104c032b6
-DIST calligra-l10n-pt-2.3.85.tar.bz2 453507 RMD160 56448966d609cb42383d181a28efb9d7a7c9042b SHA1 720554360e4d1c14984f5d2f1e80fc6289698d05 SHA256 d1c593f5b556fa03967bf6c23f90a5991cced5bf345406f00dd3c9d21b092d70
-DIST calligra-l10n-pt-2.3.86.tar.bz2 453262 RMD160 636201b769a5320b4beb66a1007db7e4d2d84b66 SHA1 fd8f38cf4185fab281f129d649bc6b7c65f20dd5 SHA256 9a28834436c2ee5bd3104f52ca43c2a84eb4d8a8c64c295999047509396e9594
-DIST calligra-l10n-pt_BR-2.3.85.tar.bz2 534339 RMD160 a6da2c93306eca0ad6e26497e56155766678ef41 SHA1 6a262bbd3a9d0225622192bff8a965ba7b57d277 SHA256 f45001d0cc27b6031e3f21e0666e3a4cf6c5cdbcf8bd8b563ff03a016bc9f410
-DIST calligra-l10n-pt_BR-2.3.86.tar.bz2 531256 RMD160 1e71481c33d70727d3080ad38b629c0512d7f427 SHA1 94fed438f1bbadf0ccbd555f2a9db1da47dfabf1 SHA256 969034756f2931240a6691f639aae97bceca56b4b20690d94c6a6b7ae932831a
-DIST calligra-l10n-ru-2.3.85.tar.bz2 519640 RMD160 8289d92f53e2c38a819ec68b70d4f57e998b588a SHA1 2443fbbf3a10b704901f4a1f52310ae8d14a1db0 SHA256 1b5e27d4508dc7b4bb4bc4730d3097911dd04c349710b7be856a1050c56965c6
-DIST calligra-l10n-ru-2.3.86.tar.bz2 519775 RMD160 145f99859a73cc515a9c438d74f8deb64e5ed48c SHA1 2ec2780f6e83237070d40094b8c8ee4c6d73826c SHA256 d2614044c80ef9462dcaccde12083e3b3dd0de59ec041534fc8d0218ab7f55e7
-DIST calligra-l10n-sv-2.3.85.tar.bz2 1841873 RMD160 f17c15406b5a64f4adff315fe51e70db6f97aa32 SHA1 a6a0d04404b8b7d659b6fa91f716d6134122239b SHA256 7abab98288996bf890651f44ae195b78a13121d485d43f61c83827697b79a7ca
-DIST calligra-l10n-sv-2.3.86.tar.bz2 1841167 RMD160 86da0b692dde9e077bf210b72086e65ce8081b3a SHA1 1fd5c369f00d15efb477fe58245136042820c4fe SHA256 3768beb5018789c3356f86339fbfeb222baeb070e81555824d1baf67bde9da72
-DIST calligra-l10n-uk-2.3.85.tar.bz2 489755 RMD160 101b1a5d9ad10812c508ef9e2b7c52ac22fd189c SHA1 a83441d1560570bd84fb78e04d123f82119a9aca SHA256 7c525e4a2ea5530babf090df6247bb63357eec49b2ea74f5cf56db0be3819895
-DIST calligra-l10n-uk-2.3.86.tar.bz2 490356 RMD160 c2f78076a4acc5a606699c72c9486db0bf7a9787 SHA1 a4c78d224c57bdd319ee735c2e11671ff99b0099 SHA256 5eed85fa7ed4035fd26eae47ae8c89bdf54347cdd734fa7cd0205d79087380d6
-DIST calligra-l10n-zh_CN-2.3.85.tar.bz2 343091 RMD160 67f402b2d037b78c58614bf1a324abae5697651f SHA1 51ae5227ef623e3a31aebe0a6483bfe43ef73816 SHA256 f614843dff214741987d173d3d1be269a53ebc8c7764807bbe19331af51a5151
-DIST calligra-l10n-zh_CN-2.3.86.tar.bz2 343158 RMD160 9849605717f3b67ca5ad6cd3c0e1e891232340eb SHA1 050a3f20fb1aa5b75ce4a226e02e838760aa09e0 SHA256 f1dcaf31ebad67fd68c11dbbb0bbe0fd065197de195a2ca0ce0fefbb3b052229
-DIST calligra-l10n-zh_TW-2.3.85.tar.bz2 383102 RMD160 574e9411cd24581b9421cff8bbdbf16d56fb2229 SHA1 8b2747aa8822d10b1e4c24032a2dd93dc18d8716 SHA256 afd3c09841a10e1bdaa307f3bbf60760826a948c057432d6b840820e4ff630a4
-DIST calligra-l10n-zh_TW-2.3.86.tar.bz2 383125 RMD160 9975550dcaa0e418d1e66dd11e257eb7537a58e8 SHA1 3109d41575b89fb8e205610d670c346ca29bb28f SHA256 03212c44c8f94a978691cbb87ab42d9d25ca8bdadd67e0889804d7f1c2c30de1
+DIST calligra-l10n-ca-2.3.83.tar.bz2 491692 RMD160 82e3e238e5025a825bc39f59cee41c343b35c598 SHA1 2cb24987c5641eaf05dba540b7d8565b3c96ecfa SHA256 16e766bff0e5bca65efef6ed68832515db0df27185ab034ddbf8fddb7fd5260b
+DIST calligra-l10n-ca-2.3.84.tar.bz2 491430 RMD160 2813392e0b3bf692e391a87edf187ed0e390b9ae SHA1 0a717af78532078ba0f93a09e3c5710a83f11f03 SHA256 40a306f2f7f38fb44cb8c933e8068e6d523b569bf5713840bb965e2aab9bb54f
+DIST calligra-l10n-ca@valencia-2.3.83.tar.bz2 374434 RMD160 97247f48dd2a0b5dc0479df6243f76c36850db28 SHA1 2202e821ff4f657569651e9c5b7c763bde9bccb3 SHA256 3545472ecbae07a0b3c0de39a814253c17724177e6a9f5d28099286cba6f3daa
+DIST calligra-l10n-ca@valencia-2.3.84.tar.bz2 374721 RMD160 87a736f2f0a43f71f93857b5153889da4291209b SHA1 eaa89845937e1701720e5f29033ed14e46fa56b4 SHA256 a3789c7c302c6dbd70d25c6912f86512681a91d10f32d3d0addabaf6aa150627
+DIST calligra-l10n-cs-2.3.83.tar.bz2 341416 RMD160 61fa0b468c45cef6f77dbf6a03c9beb4e957de6c SHA1 425ded724de52efaf669ca3ac557f3ba33e80e99 SHA256 0bc459eb1b8a53d261cb1dae720bc3783aefc2d25af2193bae5829f559faca21
+DIST calligra-l10n-cs-2.3.84.tar.bz2 344625 RMD160 1e079bad73e43d88724b49ff8bca5d434e86b2e2 SHA1 1d2b5c241b5d600dc8dfd42944dc2dbee7e805a8 SHA256 e8c7358af376e359e80e05ce385e0c9f6da8d9351940633ca302f6592b7c4d94
+DIST calligra-l10n-da-2.3.83.tar.bz2 485118 RMD160 45508d63073751760dfb4676875d8ff89d2a28e0 SHA1 83e12de3e4ef23c443e858c10e36bc7c3d431761 SHA256 852fd20af6630bf0cb68136bf68015496f9f18ff10e21cb5bc4c8aae71210945
+DIST calligra-l10n-da-2.3.84.tar.bz2 484569 RMD160 bec9511395194fa33a2d2ce712c028de2ebd5c34 SHA1 8d44823ef7d9d2e3592aad18aac2523e170c4413 SHA256 acd8a6501c27151075808218d2f15b48fd56ac3c0ced651d11a9fdec72a3320a
+DIST calligra-l10n-de-2.3.83.tar.bz2 551435 RMD160 52fc9a0df4d90f0cfe45f0a59b9abc4d1c3454f8 SHA1 c540b7fffd5809f01eb84b5797e0c9a6e8ecdae7 SHA256 64a124322840eebdf4e2a296b692d3408a4e33f0f6fe44fda0d25b32e40923c5
+DIST calligra-l10n-de-2.3.84.tar.bz2 552088 RMD160 24eecfa884b1a857d5b20c391cc3b5963e394a58 SHA1 1a626966b311bc6c71825a00d664c6ccc20568f4 SHA256 c70aa902130371ea82d6d221f298666bf03b35d34471916a36942ec09cb36317
+DIST calligra-l10n-el-2.3.83.tar.bz2 409299 RMD160 59684dbba0f264ef0cfcb34a0ee13c6cf1a5ec0e SHA1 6186baa6251f1365e6b3fe06e10b30b703365a32 SHA256 c5ab4b1976166794f4e9fc2bb666a273e11bf3addc08e8ce9422df2339c40d3a
+DIST calligra-l10n-el-2.3.84.tar.bz2 409458 RMD160 ad5df3e313f194361a29fa2059e2b6056cdfe891 SHA1 d83ff2138c8481c44bf4216c60d6b33eb27a87c2 SHA256 be6b97f68ca600f4fb2822f943c8347ec69ed153c460aa786621c27e834fef92
+DIST calligra-l10n-en_GB-2.3.83.tar.bz2 384574 RMD160 2ee7bdb2b719153b4cffc3b5ba0b4ed2cbc3d72e SHA1 aad30fcae2c43bd67ad834d9b86d7777ce797af6 SHA256 93cba2fb51bb97c21d7b26f96ef142d7f9d4e40a620e7067a4677c009eb08d82
+DIST calligra-l10n-en_GB-2.3.84.tar.bz2 384584 RMD160 537f4a63a2c8e76e7f08ab1574387be7cf2aaaa8 SHA1 de788b35b7975c0380b9e330d11411a4811c6af5 SHA256 cefdd0e6681f2d8a78da39ea214b3d2f9057e85c70d8087e3e91c6e1fd664f78
+DIST calligra-l10n-es-2.3.83.tar.bz2 4509207 RMD160 5e6c8c28fc03a00fa0bba086ea08a7e7d9b6bab9 SHA1 3c6f84ac628bf854e3b417526bb1dc7012ecb791 SHA256 dd4dd3ae641d2863505af24b52c0e10d93f21c74bae769eceb645e59218c77eb
+DIST calligra-l10n-es-2.3.84.tar.bz2 4510504 RMD160 80c9029a78531c13a37272b6f0254656b81dd371 SHA1 ea10b0606995e115afb27c076846aa5fe85e8b48 SHA256 192a7df56094882d4a32ca7cd50772316b067f75f92e4753611af9ed6bd826f9
+DIST calligra-l10n-et-2.3.83.tar.bz2 599272 RMD160 df13f0d16cc24159c0043bd4e42dd31e8d0dc480 SHA1 968a1f246854975446dc70ba2fcba16cea4729e8 SHA256 cf3b0320b3f2c915a07a93b79e8661a53bbb4f70adf2fe7b9f28e07d92880862
+DIST calligra-l10n-et-2.3.84.tar.bz2 599379 RMD160 c39ec8464bc989382d5e6abb0cc5f76655303fe1 SHA1 c280bfdb76b2f85ac1eee9994ee41bd233f0e1c2 SHA256 77cdc4df2719e5aac105e8261ffb2f73dc7fdd9a9b0097f49ec70df4f959a88b
+DIST calligra-l10n-fr-2.3.83.tar.bz2 5532562 RMD160 f075cb4fae6fc9850aa8e2f8679f480a5fb88792 SHA1 ab8f70d70bd66c4b3b6b800493656aec16836d92 SHA256 cbfd6c961e192f2955c1299b9a43b94bcf6cde01dd55d281193628cb02a7c74f
+DIST calligra-l10n-fr-2.3.84.tar.bz2 5532910 RMD160 52fda656e4e286c5b8479fbeb12d0dddc78ff367 SHA1 c2c9117307e832900397594745caac918423f46d SHA256 b1289bf5420b1d79103be52f753df739499569fa48c0012388748dc8bdb9536a
+DIST calligra-l10n-it-2.3.83.tar.bz2 544173 RMD160 7cbe3cc69a65df6b7ed610497f1e83c4334b3bbe SHA1 575269cc6ab76978d77e9290bebe9005b44d9845 SHA256 7b5e28cb49a0397b4a24837037b4c815fb3273d9c10854e49c74af95dfd671a9
+DIST calligra-l10n-it-2.3.84.tar.bz2 543055 RMD160 ab5853780670674aefd45aff1b710936378c0af1 SHA1 b4ad4bb8f0cd320f3eb10d225f7e26bf9ee7761b SHA256 cddc617dbd5ec51cea19109a0701bb7712d1e0803b8d8524d97935ded186413e
+DIST calligra-l10n-kk-2.3.83.tar.bz2 387031 RMD160 324e9ccd5840ee7254a5a9ab3fffdc01c0a0657b SHA1 12edcc8b14465da41b99dfc2bd581ea217cfc30c SHA256 9918c1aea2f815420194fd7e9337bd130765a73174689d1be502cbf5344f999c
+DIST calligra-l10n-kk-2.3.84.tar.bz2 387015 RMD160 fd019937c1b57a221268dd1b871e0ed189a2b770 SHA1 8ff6d790dec0dca27678445db6bd12dac36676d5 SHA256 0d7379f3590501bc9bc8086740ac5a2d0a4c4b022655916d1a403e7b5284ab76
+DIST calligra-l10n-nb-2.3.83.tar.bz2 367040 RMD160 833fba6923a8987b36d113d63fc0159bdcda423b SHA1 e47b158d421e03dfbe2e3d733fe764a8dceeeca6 SHA256 53543d7ea4b0b139ff76e8bfa60de7d65e4ff733de4ee628c2db33b773468e0b
+DIST calligra-l10n-nb-2.3.84.tar.bz2 367243 RMD160 e9aa79bfe4a5bf4e19af19a80373de2a23e9d79a SHA1 791e93d69abf0bf3144011230d8ef0f9f7dc9124 SHA256 5633632b1fe951de4cf4ee2e4981cce0b36c87074cbe6f90c6662840f0a138e5
+DIST calligra-l10n-nds-2.3.83.tar.bz2 408873 RMD160 1ae5a561c88b4024d4c7539abde2938e71f4a659 SHA1 e5e33aa0e0860bc548dc8e85c8662936590e3c05 SHA256 3ca3a49ad7d745a2cfafa3dc979f67f5ee55d70e086ee8ad51371045e1a6b9a6
+DIST calligra-l10n-nds-2.3.84.tar.bz2 408727 RMD160 973ec4d93af59bfbde2bc578ee9f2900e40d5884 SHA1 219bd16a58f3b319f6e735622bb839102dcc4764 SHA256 fa0dc905393e7fdfad4ffe9412e906f6a8e0270aa5558ab9d10b18a9e50270eb
+DIST calligra-l10n-nl-2.3.83.tar.bz2 2387373 RMD160 75e203f8aa556e3d563b16ff1e5494cd1fc7e650 SHA1 cebb7ff7e0e520aeefb8ee7d4560f1abdd01d1b6 SHA256 eb5215807e9825198158c4b804a61537f7c48b81597489cc41cd0e6651344d98
+DIST calligra-l10n-nl-2.3.84.tar.bz2 2387911 RMD160 68bb408d00e5bdf2f1e0d7d01822eb4c459ae9fa SHA1 dff1d4f7e5c84e9ecffb6436b040899a9160da51 SHA256 af14b9602b1c923c004f1db503d01cfcbc87f2275df55838b35d178a6f1cd0a6
+DIST calligra-l10n-pl-2.3.83.tar.bz2 425775 RMD160 0aede2fa112228680cb384bd3c51b71e76207cbb SHA1 466907249008b5b567d387ae9ccb3cb36a8be78f SHA256 67240bb911e2e060bed6630a9d7183285837d3399e8f289a78a529f60e962b38
+DIST calligra-l10n-pl-2.3.84.tar.bz2 425852 RMD160 4656adcc265aa5c42c08c93a6a17b8b74cd3d5ba SHA1 13d53efd2559c0c8f0e4773c6406311b49645dc3 SHA256 b8cf7f4f51404e6e82a97c0bf5e03fd54b4578dabd6e9bd1063cb83045466d85
+DIST calligra-l10n-pt-2.3.83.tar.bz2 453354 RMD160 05ad0bd48cee62fac78eae6672d40f4a3389f67e SHA1 4abfe7bffa82222332d123cdad6804edd7b8cc83 SHA256 a6978b4921bb4dc86835839387cdfa735a45eea20f59e0cc7a9eb110b3f4a13d
+DIST calligra-l10n-pt-2.3.84.tar.bz2 453274 RMD160 340c372e29ae9f7ceb9fc1897858d10d386a7e9f SHA1 258102f9cd5ba99645392cc27dac787e2cc447fe SHA256 7a816d275cbf70b65a9a91c486d9dd589ab3d1716162199df0bdc05f6f2c58fb
+DIST calligra-l10n-pt_BR-2.3.83.tar.bz2 535660 RMD160 f963b3f79163a5060505f9ea6bd466d503a59c26 SHA1 66bcd52c07d866b165d7e90870d7bcb683da5b27 SHA256 395188d15346b3c113d0218da45143c0d5317c887677827fcaf47b31ee9290a7
+DIST calligra-l10n-pt_BR-2.3.84.tar.bz2 534136 RMD160 28942d2f564871e441c29c6f23a6f3d486117eb4 SHA1 9ab952882a014d10d4d92f80534eaf90a43253f7 SHA256 1d995826d96fb5a876c5b3ac75604fa4712f3a1f64d7f00e061936b581aff979
+DIST calligra-l10n-ru-2.3.83.tar.bz2 513749 RMD160 cbf5d2b0831fc50bc44759253a741fdcf73d12eb SHA1 1471db11fcc067acefdcf2b59b41702557c2574b SHA256 112e016eb63fb63cfda0db1a5acbbc22f7ae995174e1cddf74d4edcdfbf8db9c
+DIST calligra-l10n-ru-2.3.84.tar.bz2 513945 RMD160 fb96b9f38447409ef5a10843b0f0bc8b3c545f24 SHA1 9ac91222a4ad5fcc3cb8170a6611d721002b9a65 SHA256 3490783682dbf7e34f730906817792743e9868b5cb6192dc248787df3bb0df2a
+DIST calligra-l10n-sv-2.3.83.tar.bz2 1841203 RMD160 623cd4b64b6efcf05b3b744b9357c99bf94498be SHA1 ff35d5526e4c1b1fdda7519619732128593d9939 SHA256 9dc36cd45ed9fe20cb266c69b4bbebdf5185d0fda0dd4b8b43f9e4aa851ba5da
+DIST calligra-l10n-sv-2.3.84.tar.bz2 1840621 RMD160 e5b6a4387884a03256295ce3b1363eb6ed907c11 SHA1 5b9f6108e28738b34cf059bea4000231149e27c6 SHA256 b5276702366e7edb2a140dfba5cac594ebe144cecb60dedfdeb1d48577518640
+DIST calligra-l10n-uk-2.3.83.tar.bz2 489806 RMD160 6ee10ff0eee557d9abf32bc5a215da00c2889380 SHA1 be39b4942e96586f87408562a6dd4c2e4d19bf40 SHA256 2f62d49ecc2a9f552e3aa73a37fb6df9d174596067569593a2f66e6f73bbd4b9
+DIST calligra-l10n-uk-2.3.84.tar.bz2 489602 RMD160 1a9ac2fc67ec0909e94e17b60a4e074c7c9cd355 SHA1 82a01ad57165557f90009d7bb5e978b3b84eaa40 SHA256 47537ce9c1f973b383b1d529743f41094bb02d78d9a53aed3acd38bb3932ba76
+DIST calligra-l10n-zh_TW-2.3.83.tar.bz2 382843 RMD160 11be352dfc360a03111e94b381c14c05f5761b6a SHA1 0ee4fab861632ef30a8bc2b197fbfc362ddd1ae2 SHA256 6c1ebf3aa46241dd7fe4dd8814bf36f6d57436da0b992f4bdda3942f4fe8bded
+DIST calligra-l10n-zh_TW-2.3.84.tar.bz2 382733 RMD160 841ba65bded584a9054069051a58a40b2f758f70 SHA1 aa36fc665839bbd7638af70d811171e94d669534 SHA256 ffec9693b9a3c218f6769666be1123756dc4676afdeef1a428d28a21f64f858a
diff --git a/app-office/calligra-l10n/calligra-l10n-2.3.83.ebuild b/app-office/calligra-l10n/calligra-l10n-2.3.83.ebuild
new file mode 100644
index 000000000000..39846cb5d62e
--- /dev/null
+++ b/app-office/calligra-l10n/calligra-l10n-2.3.83.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.3.83.ebuild,v 1.1 2011/10/29 17:56:47 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Calligra localization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="sys-devel/gettext"
+RDEPEND=""
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+MY_LANGS="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_TW"
+URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
+SRC_URI=""
+SLOT="4"
+
+for MY_LANG in ${MY_LANGS} ; do
+ IUSE="${IUSE} linguas_${MY_LANG}"
+ SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
+done
+unset MY_LANG
+
+S="${WORKDIR}"
+
+src_unpack() {
+ local lng dir
+ if [[ -z ${A} ]]; then
+ elog
+ elog "You either have the LINGUAS variable unset, or it only"
+ elog "contains languages not supported by ${P}."
+ elog "You won't have any additional language support."
+ elog
+ elog "${P} supports these language codes:"
+ elog "${MY_LANGS}"
+ elog
+ fi
+
+ [[ -n ${A} ]] && unpack ${A}
+ cd "${S}"
+
+ # add all linguas to cmake
+ if [[ -n ${A} ]]; then
+ for lng in ${MY_LANGS}; do
+ dir="${PN}-${lng}-${PV}"
+ if [[ -d "${dir}" ]] ; then
+ echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
+ fi
+ done
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
+ $(cmake-utils_use_build doc)
+ )
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
+}
+
+src_compile() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
+}
+
+src_test() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
+}
+
+src_install() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
+}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.3.84.ebuild b/app-office/calligra-l10n/calligra-l10n-2.3.84.ebuild
new file mode 100644
index 000000000000..e7825153fede
--- /dev/null
+++ b/app-office/calligra-l10n/calligra-l10n-2.3.84.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.3.84.ebuild,v 1.1 2011/11/20 17:58:57 dilfridge Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Calligra localization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="sys-devel/gettext"
+RDEPEND=""
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+MY_LANGS="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_TW"
+URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
+SRC_URI=""
+SLOT="4"
+
+for MY_LANG in ${MY_LANGS} ; do
+ IUSE="${IUSE} linguas_${MY_LANG}"
+ SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
+done
+unset MY_LANG
+
+S="${WORKDIR}"
+
+src_unpack() {
+ local lng dir
+ if [[ -z ${A} ]]; then
+ elog
+ elog "You either have the LINGUAS variable unset, or it only"
+ elog "contains languages not supported by ${P}."
+ elog "You won't have any additional language support."
+ elog
+ elog "${P} supports these language codes:"
+ elog "${MY_LANGS}"
+ elog
+ fi
+
+ [[ -n ${A} ]] && unpack ${A}
+ cd "${S}"
+
+ # add all linguas to cmake
+ if [[ -n ${A} ]]; then
+ for lng in ${MY_LANGS}; do
+ dir="${PN}-${lng}-${PV}"
+ if [[ -d "${dir}" ]] ; then
+ echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
+ fi
+ done
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
+ $(cmake-utils_use_build doc)
+ )
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
+}
+
+src_compile() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
+}
+
+src_test() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
+}
+
+src_install() {
+ [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
+}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.3.85.ebuild b/app-office/calligra-l10n/calligra-l10n-2.3.85.ebuild
deleted file mode 100644
index 0742e9ac7349..000000000000
--- a/app-office/calligra-l10n/calligra-l10n-2.3.85.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.3.85.ebuild,v 1.1 2011/12/22 22:29:11 dilfridge Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
- IUSE="${IUSE} linguas_${MY_LANG}"
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
- local lng dir
- if [[ -z ${A} ]]; then
- elog
- elog "You either have the LINGUAS variable unset, or it only"
- elog "contains languages not supported by ${P}."
- elog "You won't have any additional language support."
- elog
- elog "${P} supports these language codes:"
- elog "${MY_LANGS}"
- elog
- fi
-
- [[ -n ${A} ]] && unpack ${A}
- cd "${S}"
-
- # add all linguas to cmake
- if [[ -n ${A} ]]; then
- for lng in ${MY_LANGS}; do
- dir="${PN}-${lng}-${PV}"
- if [[ -d "${dir}" ]] ; then
- echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
- fi
- done
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
- $(cmake-utils_use_build doc)
- )
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.3.86.ebuild b/app-office/calligra-l10n/calligra-l10n-2.3.86.ebuild
deleted file mode 100644
index a7bc73a1d91b..000000000000
--- a/app-office/calligra-l10n/calligra-l10n-2.3.86.ebuild
+++ /dev/null
@@ -1,77 +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/calligra-l10n/calligra-l10n-2.3.86.ebuild,v 1.1 2012/01/14 14:51:49 dilfridge Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
- IUSE="${IUSE} linguas_${MY_LANG}"
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
- local lng dir
- if [[ -z ${A} ]]; then
- elog
- elog "You either have the LINGUAS variable unset, or it only"
- elog "contains languages not supported by ${P}."
- elog "You won't have any additional language support."
- elog
- elog "${P} supports these language codes:"
- elog "${MY_LANGS}"
- elog
- fi
-
- [[ -n ${A} ]] && unpack ${A}
- cd "${S}"
-
- # add all linguas to cmake
- if [[ -n ${A} ]]; then
- for lng in ${MY_LANGS}; do
- dir="${PN}-${lng}-${PV}"
- if [[ -d "${dir}" ]] ; then
- echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
- fi
- done
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_MESSAGES=ON -DBUILD_DATA=ON
- $(cmake-utils_use_build doc)
- )
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
- [[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 316f520b1c4e..75a3ed077648 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,3 @@
-DIST calligra-2.3.86.tar.bz2 123497239 RMD160 1d9049da3491b2567fa3686d84ac580825bffc25 SHA1 719c7ed8293d27576ef178af621af89cddc5fab5 SHA256 3e8471e36ac492e00e80d65ad38446ce7c40eb03eece7b91adc492f3cdb78440
+DIST calligra-2.3.83.tar.bz2 101025152 RMD160 88e0489f02eaa1a5a54f2c00d749b2b6b53298e6 SHA1 ee07ba8d856d85955c8c8e811e666eb91b86e5f9 SHA256 538f126e1b2fc5c73fbfdba71d134f560a804acee2ea598e1c3fde8c92ae6570
+DIST calligra-2.3.84.tar.bz2 103848582 RMD160 7dc52e44ac2bb6a2cb838e7d188a55458718a0a9 SHA1 0af76057c1eca55fff2541be3d0c47b911a1063f SHA256 eb916fcaec549175b6e01b122dba576e61515348a483bbf97bb1149967d4f090
+DIST calligra-2.3.85.tar.bz2 103240902 RMD160 92ff5ee2969e106969ca86d35b3c6761224f10c1 SHA1 d7d5101a693d80cf641ae64a0aeca8806c33ee1d SHA256 ab84169cf07298b56825d495c86339e4457dc89741ffd6af9bbf7a0963802ac3
diff --git a/app-office/calligra/calligra-2.3.83.ebuild b/app-office/calligra/calligra-2.3.83.ebuild
new file mode 100644
index 000000000000..7b3e531c244e
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.83.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.83.ebuild,v 1.1 2011/10/29 17:44:14 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+OPENGL_REQUIRED=optional
+
+# KDE_HANDBOOK=optional
+# no handbook in 83
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
++wmf word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+ IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+ calligra_features_kexi? ( calligra_features_tables )
+ calligra_features_krita? ( eigen exif lcms )
+ calligra_features_plan? ( kdepim )
+ calligra_features_tables? ( eigen )
+ test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+ !app-office/karbon
+ !app-office/koffice-data
+ !app-office/koffice-l10n
+ !app-office/koffice-libs
+ !app-office/koffice-meta
+ !app-office/krita
+ !app-office/kplato
+ !app-office/kpresenter
+ !app-office/kspread
+ !app-office/kword
+ dev-db/sqlite:3
+ dev-lang/perl
+ dev-libs/boost
+ dev-libs/libxml2
+ $(add_kdebase_dep knewstuff)
+ media-libs/libpng
+ sys-libs/zlib
+ crypt? ( app-crypt/qca:2 )
+ eigen? ( dev-cpp/eigen:2 )
+ exif? ( media-gfx/exiv2 )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ freetds? ( dev-db/freetds )
+ gif? ( media-libs/giflib )
+ glew? ( media-libs/glew )
+ glib? ( dev-libs/glib:2 )
+ gsf? ( gnome-extra/libgsf )
+ gsl? ( sci-libs/gsl )
+ iconv? ( virtual/libiconv )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/openjpeg )
+ kdcraw? ( $(add_kdebase_dep libkdcraw) )
+ kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ lcms? ( media-libs/lcms:2 )
+ marble? ( $(add_kdebase_dep marble) )
+ mysql? ( virtual/mysql )
+ okular? ( $(add_kdebase_dep okular) )
+ openctl? ( >=media-libs/opengtl-0.9.15 )
+ openexr? ( media-libs/openexr )
+ pdf? (
+ app-text/poppler
+ media-gfx/pstoedit
+ )
+ postgres? (
+ dev-db/postgresql-base
+ =dev-libs/libpqxx-3*
+ )
+ semantic-desktop? ( dev-libs/soprano )
+ ssl? ( dev-libs/openssl )
+ sybase? ( dev-db/freetds )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2 )
+ word-perfect? (
+ app-text/libwpd
+ app-text/libwps
+ app-text/libwpg
+ )
+ xbase? ( dev-db/xbase )
+ xslt? ( dev-libs/libxslt )
+ calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local cal_ft
+
+ # first write out things we want to hard-enable
+ local mycmakeargs=(
+ "-DWITH_Boost=ON"
+ "-DWITH_LibXml2=ON"
+ "-DWITH_PNG=ON"
+ "-DWITH_ZLIB=ON"
+ "-DGHNS=ON"
+ "-DWITH_X11=ON"
+ "-DWITH_Qt4=ON"
+ )
+
+ # default disablers
+ mycmakeargs+=(
+ "-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+ "-DWITH_LCMS=OFF" # we use lcms:2
+ "-DWITH_XBase=OFF" # i am not the one to support this
+ "-DCREATIVEONLY=OFF"
+ "-DWITH_TINY=OFF"
+ "-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+ "-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+ "-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+ )
+
+ # regular options
+ mycmakeargs+=(
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with eigen Eigen2)
+ $(cmake-utils_use_with exif Exiv2)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fontconfig Fontconfig)
+ $(cmake-utils_use_with freetds FreeTDS)
+ $(cmake-utils_use_with gif GIF2)
+ $(cmake-utils_use_with glew GLEW)
+ $(cmake-utils_use_with glib GLIB2)
+ $(cmake-utils_use_with glib GObject)
+ $(cmake-utils_use_with gsf LIBGSF)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with iconv Iconv)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with kdcraw Kdcraw)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with lcms LCMS2)
+ $(cmake-utils_use_with marble Marble)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with okular Okular)
+ $(cmake-utils_use_with openctl OpenCTL)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with pdf Pstoedit)
+ $(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_with semantic-desktop Soprano)
+ $(cmake-utils_use semantic-desktop NEPOMUK)
+ $(cmake-utils_use_with ssl OpenSSL)
+ $(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with threads Threads)
+ $(cmake-utils_use_with truetype Freetype)
+ $(cmake-utils_use_with word-perfect WPD)
+ $(cmake-utils_use_with word-perfect WPG)
+ $(cmake-utils_use_with xbase XBase)
+ $(cmake-utils_use_with xslt LibXslt)
+ $(cmake-utils_use_build wmf libkowmf)
+ $(cmake-utils_use_build mso libmsooxml)
+ )
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+ done
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+ # filters
+
+ kde4-base_src_configure
+}
diff --git a/app-office/calligra/calligra-2.3.84.ebuild b/app-office/calligra/calligra-2.3.84.ebuild
new file mode 100644
index 000000000000..5ff085d2f69f
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.84.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.84.ebuild,v 1.1 2011/11/20 17:54:57 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+OPENGL_REQUIRED=optional
+
+# KDE_HANDBOOK=optional
+# no handbook in 83
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
++wmf word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+ IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+ calligra_features_kexi? ( calligra_features_tables )
+ calligra_features_krita? ( eigen exif lcms )
+ calligra_features_plan? ( kdepim )
+ calligra_features_tables? ( eigen )
+ test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+ !app-office/karbon
+ !app-office/koffice-data
+ !app-office/koffice-l10n
+ !app-office/koffice-libs
+ !app-office/koffice-meta
+ !app-office/krita
+ !app-office/kplato
+ !app-office/kpresenter
+ !app-office/kspread
+ !app-office/kword
+ >=dev-db/sqlite-3.7.9:3
+ dev-lang/perl
+ dev-libs/boost
+ dev-libs/libxml2
+ $(add_kdebase_dep knewstuff)
+ media-libs/libpng
+ sys-libs/zlib
+ crypt? ( app-crypt/qca:2 )
+ eigen? ( dev-cpp/eigen:2 )
+ exif? ( media-gfx/exiv2 )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ freetds? ( dev-db/freetds )
+ gif? ( media-libs/giflib )
+ glew? ( media-libs/glew )
+ glib? ( dev-libs/glib:2 )
+ gsf? ( gnome-extra/libgsf )
+ gsl? ( sci-libs/gsl )
+ iconv? ( virtual/libiconv )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/openjpeg )
+ kdcraw? ( $(add_kdebase_dep libkdcraw) )
+ kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ lcms? ( media-libs/lcms:2 )
+ marble? ( $(add_kdebase_dep marble) )
+ mysql? ( virtual/mysql )
+ okular? ( $(add_kdebase_dep okular) )
+ openctl? ( >=media-libs/opengtl-0.9.15 )
+ openexr? ( media-libs/openexr )
+ pdf? (
+ app-text/poppler
+ media-gfx/pstoedit
+ )
+ postgres? (
+ dev-db/postgresql-base
+ =dev-libs/libpqxx-3*
+ )
+ semantic-desktop? ( dev-libs/soprano )
+ ssl? ( dev-libs/openssl )
+ sybase? ( dev-db/freetds )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2 )
+ word-perfect? (
+ app-text/libwpd
+ app-text/libwps
+ app-text/libwpg
+ )
+ xbase? ( dev-db/xbase )
+ xslt? ( dev-libs/libxslt )
+ calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local cal_ft
+
+ # first write out things we want to hard-enable
+ local mycmakeargs=(
+ "-DWITH_Boost=ON"
+ "-DWITH_LibXml2=ON"
+ "-DWITH_PNG=ON"
+ "-DWITH_ZLIB=ON"
+ "-DGHNS=ON"
+ "-DWITH_X11=ON"
+ "-DWITH_Qt4=ON"
+ )
+
+ # default disablers
+ mycmakeargs+=(
+ "-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+ "-DWITH_LCMS=OFF" # we use lcms:2
+ "-DWITH_XBase=OFF" # i am not the one to support this
+ "-DCREATIVEONLY=OFF"
+ "-DWITH_TINY=OFF"
+ "-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+ "-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+ "-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+ )
+
+ # regular options
+ mycmakeargs+=(
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with eigen Eigen2)
+ $(cmake-utils_use_with exif Exiv2)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fontconfig Fontconfig)
+ $(cmake-utils_use_with freetds FreeTDS)
+ $(cmake-utils_use_with gif GIF2)
+ $(cmake-utils_use_with glew GLEW)
+ $(cmake-utils_use_with glib GLIB2)
+ $(cmake-utils_use_with glib GObject)
+ $(cmake-utils_use_with gsf LIBGSF)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with iconv Iconv)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with kdcraw Kdcraw)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with lcms LCMS2)
+ $(cmake-utils_use_with marble Marble)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with okular Okular)
+ $(cmake-utils_use_with openctl OpenCTL)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with pdf Pstoedit)
+ $(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_with semantic-desktop Soprano)
+ $(cmake-utils_use semantic-desktop NEPOMUK)
+ $(cmake-utils_use_with ssl OpenSSL)
+ $(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with threads Threads)
+ $(cmake-utils_use_with truetype Freetype)
+ $(cmake-utils_use_with word-perfect WPD)
+ $(cmake-utils_use_with word-perfect WPG)
+ $(cmake-utils_use_with xbase XBase)
+ $(cmake-utils_use_with xslt LibXslt)
+ $(cmake-utils_use_build wmf libkowmf)
+ $(cmake-utils_use_build mso libmsooxml)
+ )
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+ done
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+ # filters
+
+ kde4-base_src_configure
+}
diff --git a/app-office/calligra/calligra-2.3.85.ebuild b/app-office/calligra/calligra-2.3.85.ebuild
new file mode 100644
index 000000000000..8245723b407b
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.85.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.85.ebuild,v 1.2 2011/12/11 01:23:12 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
++wmf word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+ IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+ calligra_features_kexi? ( calligra_features_tables )
+ calligra_features_krita? ( eigen exif lcms )
+ calligra_features_plan? ( kdepim )
+ calligra_features_tables? ( eigen )
+ test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+ !app-office/karbon
+ !app-office/koffice-data
+ !app-office/koffice-l10n
+ !app-office/koffice-libs
+ !app-office/koffice-meta
+ !app-office/krita
+ !app-office/kplato
+ !app-office/kpresenter
+ !app-office/kspread
+ !app-office/kword
+ >=dev-db/sqlite-3.7.9:3
+ dev-lang/perl
+ dev-libs/boost
+ dev-libs/libxml2
+ $(add_kdebase_dep knewstuff)
+ media-libs/libpng
+ sys-libs/zlib
+ crypt? ( app-crypt/qca:2 )
+ eigen? ( dev-cpp/eigen:2 )
+ exif? ( media-gfx/exiv2 )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ freetds? ( dev-db/freetds )
+ gif? ( media-libs/giflib )
+ glew? ( media-libs/glew )
+ glib? ( dev-libs/glib:2 )
+ gsf? ( gnome-extra/libgsf )
+ gsl? ( sci-libs/gsl )
+ iconv? ( virtual/libiconv )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/openjpeg )
+ kdcraw? ( $(add_kdebase_dep libkdcraw) )
+ kdepim? ( $(add_kdebase_dep kdepimlibs) )
+ lcms? ( media-libs/lcms:2 )
+ marble? ( $(add_kdebase_dep marble) )
+ mysql? ( virtual/mysql )
+ okular? ( $(add_kdebase_dep okular) )
+ openctl? ( >=media-libs/opengtl-0.9.15 )
+ openexr? ( media-libs/openexr )
+ pdf? (
+ app-text/poppler
+ media-gfx/pstoedit
+ )
+ postgres? (
+ dev-db/postgresql-base
+ =dev-libs/libpqxx-3*
+ )
+ semantic-desktop? ( dev-libs/soprano )
+ ssl? ( dev-libs/openssl )
+ sybase? ( dev-db/freetds )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2 )
+ word-perfect? (
+ app-text/libwpd
+ app-text/libwps
+ app-text/libwpg
+ )
+ xbase? ( dev-db/xbase )
+ xslt? ( dev-libs/libxslt )
+ calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-asneeded.patch"
+)
+
+src_configure() {
+ local cal_ft
+
+ # first write out things we want to hard-enable
+ local mycmakeargs=(
+ "-DWITH_Boost=ON"
+ "-DWITH_LibXml2=ON"
+ "-DWITH_PNG=ON"
+ "-DWITH_ZLIB=ON"
+ "-DGHNS=ON"
+ "-DWITH_X11=ON"
+ "-DWITH_Qt4=ON"
+ "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+ )
+
+ # default disablers
+ mycmakeargs+=(
+ "-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+ "-DWITH_LCMS=OFF" # we use lcms:2
+ "-DCREATIVEONLY=OFF"
+ "-DWITH_TINY=OFF"
+ "-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+ "-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+ "-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+ )
+
+ # regular options
+ mycmakeargs+=(
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with eigen Eigen2)
+ $(cmake-utils_use_with exif Exiv2)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fontconfig Fontconfig)
+ $(cmake-utils_use_with freetds FreeTDS)
+ $(cmake-utils_use_with gif GIF2)
+ $(cmake-utils_use_with glew GLEW)
+ $(cmake-utils_use_with glib GLIB2)
+ $(cmake-utils_use_with glib GObject)
+ $(cmake-utils_use_with gsf LIBGSF)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with iconv Iconv)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with kdcraw Kdcraw)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with lcms LCMS2)
+ $(cmake-utils_use_with marble Marble)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with okular Okular)
+ $(cmake-utils_use_with openctl OpenCTL)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with pdf Pstoedit)
+ $(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_with semantic-desktop Soprano)
+ $(cmake-utils_use semantic-desktop NEPOMUK)
+ $(cmake-utils_use_with ssl OpenSSL)
+ $(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with threads Threads)
+ $(cmake-utils_use_with truetype Freetype)
+ $(cmake-utils_use_with word-perfect WPD)
+ $(cmake-utils_use_with word-perfect WPG)
+ $(cmake-utils_use_with xbase XBase)
+ $(cmake-utils_use_with xslt LibXslt)
+ $(cmake-utils_use_build wmf libkowmf)
+ $(cmake-utils_use_build mso libmsooxml)
+ )
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+ done
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+ # filters
+
+ kde4-base_src_configure
+}
diff --git a/app-office/calligra/calligra-2.3.86.ebuild b/app-office/calligra/calligra-2.3.86.ebuild
deleted file mode 100644
index e2b776a279c8..000000000000
--- a/app-office/calligra/calligra-2.3.86.ebuild
+++ /dev/null
@@ -1,197 +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/calligra/calligra-2.3.86.ebuild,v 1.2 2012/01/22 22:26:53 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-+wmf word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
- IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
- calligra_features_kexi? ( calligra_features_tables )
- calligra_features_krita? ( eigen exif lcms )
- calligra_features_plan? ( kdepim )
- calligra_features_tables? ( eigen )
- test? ( calligra_features_karbon )
-"
-
-RDEPEND="
- !app-office/karbon
- !app-office/koffice-data
- !app-office/koffice-l10n
- !app-office/koffice-libs
- !app-office/koffice-meta
- !app-office/krita
- !app-office/kplato
- !app-office/kpresenter
- !app-office/kspread
- !app-office/kword
- dev-lang/perl
- dev-libs/boost
- dev-libs/libxml2
- $(add_kdebase_dep knewstuff)
- media-libs/libpng
- sys-libs/zlib
- attica? ( dev-libs/libattica )
- crypt? ( app-crypt/qca:2 )
- eigen? ( dev-cpp/eigen:2 )
- exif? ( media-gfx/exiv2 )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- freetds? ( dev-db/freetds )
- gif? ( media-libs/giflib )
- glew? ( media-libs/glew )
- glib? ( dev-libs/glib:2 )
- gsf? ( gnome-extra/libgsf )
- gsl? ( sci-libs/gsl )
- iconv? ( virtual/libiconv )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/openjpeg )
- kdcraw? ( $(add_kdebase_dep libkdcraw) )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
- lcms? ( media-libs/lcms:2 )
- marble? ( $(add_kdebase_dep marble) )
- mysql? ( virtual/mysql )
- okular? ( $(add_kdebase_dep okular) )
- openctl? ( >=media-libs/opengtl-0.9.15 )
- openexr? ( media-libs/openexr )
- pdf? (
- app-text/poppler
- media-gfx/pstoedit
- )
- postgres? (
- dev-db/postgresql-base
- =dev-libs/libpqxx-3*
- )
- semantic-desktop? ( dev-libs/soprano )
- ssl? ( dev-libs/openssl )
- sybase? ( dev-db/freetds )
- tiff? ( media-libs/tiff )
- truetype? ( media-libs/freetype:2 )
- word-perfect? (
- app-text/libwpd
- app-text/libwps
- app-text/libwpg
- )
- xbase? ( dev-db/xbase )
- xslt? ( dev-libs/libxslt )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.7.9:3[extensions]
- dev-libs/icu
- )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
- local cal_ft
-
- # first write out things we want to hard-enable
- local mycmakeargs=(
- "-DWITH_Boost=ON"
- "-DWITH_LibXml2=ON"
- "-DWITH_PNG=ON"
- "-DWITH_ZLIB=ON"
- "-DGHNS=ON"
- "-DWITH_X11=ON"
- "-DWITH_Qt4=ON"
- "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
- )
-
- # default disablers
- mycmakeargs+=(
- "-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
- "-DWITH_LCMS=OFF" # we use lcms:2
- "-DCREATIVEONLY=OFF"
- "-DWITH_TINY=OFF"
- "-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
- "-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
- "-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
- )
-
- # regular options
- mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen2)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with gif GIF2)
- $(cmake-utils_use_with glew GLEW)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with glib GObject)
- $(cmake-utils_use_with gsf LIBGSF)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with iconv Iconv)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble Marble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openctl OpenCTL)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres PostgreSQL)
- $(cmake-utils_use_with semantic-desktop Soprano)
- $(cmake-utils_use semantic-desktop NEPOMUK)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with word-perfect WPD)
- $(cmake-utils_use_with word-perfect WPG)
- $(cmake-utils_use_with xbase XBase)
- $(cmake-utils_use_with xslt LibXslt)
- $(cmake-utils_use_build wmf libkowmf)
- $(cmake-utils_use_build mso libmsooxml)
- )
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
- done
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
- # filters
-
- kde4-base_src_configure
-}
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 03cc264b279d..a37398cc1abb 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.7 2012/01/22 22:26:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.5 2011/12/10 14:46:39 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.calligra-suite.org/"
LICENSE="GPL-2"
SLOT="4"
[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+wmf word-perfect xbase +xml +xslt"
@@ -55,13 +55,13 @@ RDEPEND="
!app-office/kpresenter
!app-office/kspread
!app-office/kword
+ >=dev-db/sqlite-3.7.9:3
dev-lang/perl
dev-libs/boost
dev-libs/libxml2
$(add_kdebase_dep knewstuff)
media-libs/libpng
sys-libs/zlib
- attica? ( dev-libs/libattica )
crypt? ( app-crypt/qca:2 )
eigen? ( dev-cpp/eigen:2 )
exif? ( media-gfx/exiv2 )
@@ -104,16 +104,10 @@ RDEPEND="
)
xbase? ( dev-db/xbase )
xslt? ( dev-libs/libxslt )
- calligra_features_kexi? (
- >=dev-db/sqlite-3.7.9:3[extensions]
- dev-libs/icu
- )
+ calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
"
DEPEND="${RDEPEND}"
-RESTRICT=test
-# bug 394273
-
src_configure() {
local cal_ft
@@ -142,7 +136,6 @@ src_configure() {
# regular options
mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
$(cmake-utils_use_with crypt QCA2)
$(cmake-utils_use_with eigen Eigen2)
$(cmake-utils_use_with exif Exiv2)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 4f2f812324ca..608cd4656872 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -7,7 +7,6 @@
kde
openoffice
- Get hot stuff with dev-libs/libattica
Enable dev-cpp/eigen mathematical templates support
Enable media-libs/glew opengl extension library support
Enable support for C library routines from dev-libs/glib
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 19900dbdd21a..61bc0cab571c 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,2 +1 @@
DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-DIST dia-0.97.2.tar.xz 5507004 RMD160 f9270f1f2cb6ad505219463827d02e3759693796 SHA1 dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba SHA256 a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1
diff --git a/app-office/dia/dia-0.97.2.ebuild b/app-office/dia/dia-0.97.2.ebuild
deleted file mode 100644
index 96df98f500a4..000000000000
--- a/app-office/dia/dia-0.97.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2.ebuild,v 1.2 2011/12/22 17:37:55 ssuominen Exp $
-
-EAPI=4
-
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils gnome2 python multilib
-
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://live.gnome.org/Dia"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-# the doc USE flag doesn't seem to do anything without docbook2html
-IUSE="cairo doc gnome python"
-
-RDEPEND=">=dev-libs/glib-2
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/popt
- >=media-libs/freetype-2
- >=media-libs/libart_lgpl-2
- media-libs/libpng
- sys-libs/zlib
- x11-libs/gtk+:2
- x11-libs/pango
- cairo? ( x11-libs/cairo )
- doc? (
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- )
- gnome? (
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- )
- python? ( >=dev-python/pygtk-2 )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig
- doc? ( dev-libs/libxslt )"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-
- # --exec-prefix makes Python look for modules in the Prefix
- G2CONF="--exec-prefix=${EPREFIX}/usr
- --docdir=${EPREFIX}/usr/share/doc/${PF}
- $(use_enable gnome)
- --disable-libemf
- $(use_enable doc db2html)
- $(use_with cairo)
- $(use_with python)
- --without-swig
- --without-hardbooks"
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159831
-
- if use python; then
- python_convert_shebangs -r 2 .
- sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
- fi
-
- if ! use doc; then
- # Skip man generation
- sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
- fi
-
- # Fix naming conflict on Darwin/OSX
- sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
-
- intltoolize --force --copy --automake || die
- eautoreconf
-
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use python; then
- python_need_rebuild
- python_mod_optimize /usr/share/dia
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- use python && python_mod_cleanup /usr/share/dia
-}
diff --git a/app-office/glabels/glabels-3.0.0.ebuild b/app-office/glabels/glabels-3.0.0.ebuild
index 815d13a4b492..dc2ed721822d 100644
--- a/app-office/glabels/glabels-3.0.0.ebuild
+++ b/app-office/glabels/glabels-3.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.0.ebuild,v 1.3 2012/01/14 16:05:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.0.ebuild,v 1.1 2011/11/21 12:11:57 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.glabels.org/"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="barcode doc eds"
RDEPEND=">=dev-libs/glib-2.28.2:2
diff --git a/app-office/gnucash/gnucash-2.4.8.ebuild b/app-office/gnucash/gnucash-2.4.8.ebuild
index 3cbc7b6ea96e..6d5cd46e55b2 100644
--- a/app-office/gnucash/gnucash-2.4.8.ebuild
+++ b/app-office/gnucash/gnucash-2.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.8.ebuild,v 1.4 2012/01/14 16:06:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.8.ebuild,v 1.2 2011/12/04 20:11:34 pacho Exp $
EAPI="4"
GNOME2_LA_PUNT="yes"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="chipcard cxx debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 8238c163f48a..8f9db5af0ada 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,2 +1 @@
DIST gtg-0.2.4.tar.gz 598293 RMD160 cc599fe6cc7ccb683bfd79f7852b15da454fc7f7 SHA1 8aa5ff546e35850dd106b369aae6713e86e6e67d SHA256 8dcadc0d13acc50d6fab3c7627b5a5068d74ffbf50f5fb595edec8de01974911
-DIST gtg-0.2.5.tar.gz 604031 RMD160 0da8fecd4be4ad779ba1d8646424da8f6d8edc73 SHA1 b9aa35d9e98b1e25f0a498fca771a61ca41b8371 SHA256 e6a7504b3a780cee7a6374980336dce01d70b0e920ceb00e0649457a00fab94e
diff --git a/app-office/gtg/gtg-0.2.5.ebuild b/app-office/gtg/gtg-0.2.5.ebuild
deleted file mode 100644
index 0817cc27020f..000000000000
--- a/app-office/gtg/gtg-0.2.5.ebuild
+++ /dev/null
@@ -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-office/gtg/gtg-0.2.5.ebuild,v 1.1 2012/01/28 21:16:06 steev Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
-
-inherit eutils fdo-mime gnome2-utils distutils
-
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="http://gtg.fritalk.com/"
-SRC_URI="http://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-python/configobj
- dev-python/dbus-python
- dev-python/pycairo
- dev-python/pygobject:2
- dev-python/pygtk
- dev-python/pyxdg
- dev-python/simplejson"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # This is already fixed in trunk, not in 0.2.5
- epatch "${FILESDIR}"/${PN}-0.2.4-hamster.patch
- distutils_src_prepare
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
-
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-office/imposter/imposter-0.3.ebuild b/app-office/imposter/imposter-0.3.ebuild
index cf95cfe5db1a..15cba77675db 100644
--- a/app-office/imposter/imposter-0.3.ebuild
+++ b/app-office/imposter/imposter-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.7 2012/01/16 11:19:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.6 2011/03/13 19:54:43 suka Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ppc x86"
IUSE="iksemel nls"
RDEPEND=">=x11-libs/gtk+-2.4:2
diff --git a/app-office/kword/kword-2.3.3-r1.ebuild b/app-office/kword/kword-2.3.3-r1.ebuild
index da0d8c4867c7..75c17dcd9e23 100644
--- a/app-office/kword/kword-2.3.3-r1.ebuild
+++ b/app-office/kword/kword-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3-r1.ebuild,v 1.6 2011/12/26 14:34:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3-r1.ebuild,v 1.5 2011/12/11 15:38:48 ago Exp $
EAPI=3
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KOffice word processor"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
IUSE="wpd"
SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2"
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index ec8a3462cf78..29a48b384890 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,2 +1 @@
DIST 137323-libalkimia-4.3.1.tar.bz2 30529 RMD160 94d4e1a6d9e03ca8d5dbf70f51d7f20af31b246f SHA1 a8381bf4def252425aca31d0929e31b1aa82d0b5 SHA256 69a46d017350c2c5cc8d77d419cb4caf1d9d323a5bbc82c9d44113c6817bb2d0
-DIST 137323-libalkimia-4.3.2.tar.bz2 32687 RMD160 33b231fea22f6e64be5bec2accd4fc4aff3636ab SHA1 a747252fe6198d44f97d73a5c6cdf8b31af31732 SHA256 64379af992d5548a6757495f47568ebf8cb859a868ced8b5d3d5975f4dfcebdc
diff --git a/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch b/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch
deleted file mode 100644
index c88b95b65269..000000000000
--- a/app-office/libalkimia/files/libalkimia-4.3.2-doc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ruN libalkimia-4.3.1.orig/libalkimia/CMakeLists.txt libalkimia-4.3.1/libalkimia/CMakeLists.txt
---- libalkimia-4.3.1.orig/libalkimia/CMakeLists.txt 2011-08-01 12:14:46.000000000 +0200
-+++ libalkimia-4.3.1/libalkimia/CMakeLists.txt 2011-08-01 23:04:41.000000000 +0200
-@@ -86,6 +86,8 @@
- endif(NOT WIN32)
- ########### documentation ###################
-
-+if(BUILD_DOC)
-+
- # check for Doxygen
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
-@@ -95,9 +97,20 @@
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen IMMEDIATE)
-
-- add_custom_target(libalkimia_apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen)
-+ add_custom_target(libalkimia_apidoc ALL ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen)
-+else(DOXYGEN_FOUND)
-+ MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
- endif(DOXYGEN_FOUND)
-
-+ELSE(BUILD_DOC)
-+
-+ MESSAGE(STATUS "")
-+ MESSAGE(STATUS "Documentation will NOT be installed")
-+ MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
-+ MESSAGE(STATUS "")
-+
-+ENDIF(BUILD_DOC)
-+
- ########### tests ###################
-
- set( alkvaluetest_SRCS alkvaluetest.cpp )
diff --git a/app-office/libalkimia/libalkimia-4.3.2.ebuild b/app-office/libalkimia/libalkimia-4.3.2.ebuild
deleted file mode 100644
index b51dd4735dd5..000000000000
--- a/app-office/libalkimia/libalkimia-4.3.2.ebuild
+++ /dev/null
@@ -1,30 +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/libalkimia/libalkimia-4.3.2.ebuild,v 1.1 2012/01/29 18:34:56 dilfridge Exp $
-
-EAPI="4"
-
-inherit kde4-base
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="http://kde-apps.org/content/show.php/libalkimia?content=137323"
-SRC_URI="http://kde-apps.org/CONTENT/content-files/137323-${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="dev-libs/gmp[cxx]"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.2-doc.patch"
-)
-
-src_configure() {
- mycmakeargs=( $(cmake-utils_use_build doc) )
- kde4-base_src_configure
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild
index 717dd956d56b..b2ffb343f026 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild,v 1.4 2012/01/26 03:23:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.4.ebuild,v 1.3 2011/09/02 10:53:52 scarabeus Exp $
EAPI="3"
@@ -78,8 +78,6 @@ QA_PRESTRIPPED="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
usr/$(get_libdir)/${NM}/ure/bin/*
usr/$(get_libdir)/${NM}/ure/lib/*"
-PYTHON_UPDATER_IGNORE="1"
-
src_unpack() {
unpack ${A}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild
index d5e841b838a5..7c81e18e4103 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild,v 1.2 2012/01/26 03:23:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild,v 1.1 2011/09/03 21:03:58 scarabeus Exp $
EAPI="3"
@@ -66,8 +66,6 @@ QA_PRESTRIPPED="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
usr/$(get_libdir)/${NM}/ure/bin/*
usr/$(get_libdir)/${NM}/ure/lib/*"
-PYTHON_UPDATER_IGNORE="1"
-
src_unpack() {
unpack ${A}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
index 9aa06495ec9a..db6631627f43 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.9 2012/01/26 03:23:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.8 2011/11/30 10:17:57 scarabeus Exp $
EAPI=4
@@ -122,8 +122,6 @@ RESTRICT="test strip"
S="${WORKDIR}"
-PYTHON_UPDATER_IGNORE="1"
-
pkg_pretend() {
[[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index b389c7702fdf..f06286a91783 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -1,7 +1,6 @@
- maintainer-needed@gentoo.org
openoffice
LibreOffice is a free office suite.
This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 73569a3ce999..c009b9161f7c 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -2,167 +2,6 @@ DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654
DIST 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt 4998642 RMD160 61bbecc48c94393b9c04fa9c11282dd55d42a871 SHA1 d2b6a076b40d8d517075e52220ddd8f89f655c8f SHA256 f15b13b947d8690bf05c4dc4cb04ab89297565ccddf02cce37b831376151ba29
DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419 RMD160 1f01d5f4d8be121bc3aaa5c5d69c9bbb50cfd912 SHA1 bf25bef71f72a4622089c85958bfd6c58d8516a6 SHA256 4eb76551b548c0e7fdc5048be8462ddb61dfb7bba4bbc23b46189356b4b0976c
DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 RMD160 cf457953fd947bf7f60274377ef88124bb788108 SHA1 4fea33622d89c7ac62053e5ee3616cfe504e0f14 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_bg.tar.gz 11558539 RMD160 70048f8d4d6ebe5cc14570b4a36946a0f72de49d SHA1 e37dfa4f2c53825aafd528bd6ec7f5a068c4660b SHA256 2688468c46f82ba18b7418e183b656a0c21c028a28c6f674410af5ac5d9204da
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_bn.tar.gz 11781130 RMD160 56907a27abf4ab2e40e1a553ecb4662623ee787a SHA1 1caa75050f5d5e9a21c7eff3fea73b4893e53c99 SHA256 9b282b1221ff7f2f42ac720c4f9ce4e227e63d67ecaa99112fff1c7a7671f53f
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_bo.tar.gz 12417790 RMD160 d26a1bf6b936e385e68e887537c4ef33c785476c SHA1 0e3f38401c0cbc35e537e65d1383744768e02e2c SHA256 901a50c814b840e41d31b686fd40df26eadb74b8be0a60b9bdff8e4715598023
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_bs.tar.gz 10037773 RMD160 f11af8f9ffe2ee058d468b360a1dbc445d4259b3 SHA1 272ce454be8996dcb96560c967ed4361f8750d0b SHA256 7fa7b420176927e84f421f0e8199d54dc8dbd1cbe09788377f74f72b20344f9f
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ca-XV.tar.gz 10905684 RMD160 f6a91ac4897de4ad66820dee1e6358d2a82e5089 SHA1 13e8aedf7830d4bfa666de60cb249ea68eb119e9 SHA256 514de0dab47d5baa555d55f942b57dca027f285dbc35416fb76d0c51b01676f7
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ca.tar.gz 10899425 RMD160 10f3d2247a2ec47e19d722e85551422223ea8603 SHA1 e99e7a89dc65e05de84d8e372a8c388ae84c7d24 SHA256 47ac9321abac15822641affac9d6dc5100f25bf1f73f9e4e03eda65000244b13
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_cs.tar.gz 10630840 RMD160 67480252c61e679ea62a195392904ff477a684ab SHA1 436d1725bbaded93aae5f8f7997a5dbc881867db SHA256 e8e70ef87bc3008cc493b9c8e14569a84df73c745edf093add0f9e029d5a553d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_da.tar.gz 10506480 RMD160 698e3b70b3b53fbded62a79bc29c0d2cfa66781f SHA1 1970705da0e2c556699ab404432d29e01ccbed9d SHA256 8f88972b05860d52a9db11d9a1dd4dba17993dd8d572fff9cb2f8248878b099a
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_de.tar.gz 11104667 RMD160 d60e80a2dc7f9d880f370130ce434797e1fe740e SHA1 5bda5c891acab09a50cf5505c53ae74d223bcc59 SHA256 27067216035bae8f2093f74dee31c617ff7a9858e23df820532da6891f3dff95
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_dz.tar.gz 13271866 RMD160 9b81e890bfeb2ee9be4a56984a8662e276a6e150 SHA1 73bb05c479f154b11846bc704aa807fdd391205f SHA256 56a0f9e5b1695a799311af85437624aab1bbc05377f365db8929fff98734cceb
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_el.tar.gz 12315523 RMD160 e59b2d4f65fd0cda607d61cc530e6a9fa7e1460f SHA1 933cd00c0b5b2a94a4d7e7a295285c4b7883c7e1 SHA256 7f5e4437669bac7af97f38e136d526e1c7428144faa13709e78e3ae4b3961394
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_en-GB.tar.gz 9328768 RMD160 8600e89a1ea311db666a56372b5235e9d1901bc8 SHA1 29522c99fe56796f4152b210e0ecfa13d67b584e SHA256 b8637576108a9e2418957c35ca1d51b5a3da2a50440b12d39fa637f40f479fb7
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_en-US.tar.gz 9380478 RMD160 00d9f1e44796c909323a27bb0d8c2a476b2dbdd1 SHA1 6184893d6f9daf3fec9329792bacbf3b8ac26d28 SHA256 5b7c3516fce69ebd49fe3507427e8d91e701eeb74c37c68f4114b972fafbcc16
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_en-ZA.tar.gz 9309814 RMD160 7f9db8156e38642f8ee4776bffcfaba0570a1502 SHA1 44cfe8ca0229e03cbfd5e302905ea32aa32df65a SHA256 85081461fb23ee5b5c7491ba604bbb371a22d18be20cef2fe28afdf408e600f2
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_eo.tar.gz 9737424 RMD160 109571cd6eeb0eca0558f18c9116ab483c3bf71d SHA1 c0a626d8758824bdc8d603367c1211652691d9c3 SHA256 2ccad98dca81ba86282f35f2120d25ad1d47aeecb5281bb2be218e5bbb1e7d24
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_es.tar.gz 10993997 RMD160 9ff1448c3ba18251c79bfa19d1ba7ab2a95cbad1 SHA1 85839e4938c447b686b89df607110806b40d956f SHA256 81f9972f8107f3e6869451cabf9ce079b47fbd8a3769399193f763c92212a33b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_et.tar.gz 10403544 RMD160 e45afd9a68ea93483f7a9d40cbd74aafa9f76d94 SHA1 3b3d673c8dd9cd7275c071599a96cbdfe4a57508 SHA256 c1bc013bb2d04022cfcb2fed0971c3f2de22d687cc807c9c4e94108f07809f8f
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_eu.tar.gz 10521448 RMD160 93bdfe73a752a59afc7a68b5924c746e5b4efd44 SHA1 070e075779716af86c845407e34ef9aadee27b3a SHA256 2affcaa5733cb4aa433658cbbe27f10d09f3f8a8abd62f7098688f9a91acd27b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_fi.tar.gz 10762585 RMD160 464657cfd20d58b435657de4ca52c6882e91485a SHA1 63f4ff1dd4f1c1633d5d03607e6b37a246eaf861 SHA256 5066148bfc8772178db58355528e55001537ddb5329268ad661f324b5646c386
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_fr.tar.gz 11151670 RMD160 e744f37fb7a42b49acb9b7509b86e8fdfc9a5103 SHA1 1fbcde724078935b472409b43f8113dd01ca8f17 SHA256 b8a58dd096f9ba4e1d91ae502e2582b7af60bf5d4c80e644433d0a9040195d31
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_gl.tar.gz 10436544 RMD160 3745ee11988d54eacb046bcd917231c6f7f19924 SHA1 a3086bff28d567fd6a7fc31d0e62c0c01826610e SHA256 635c2de86339506a914e01dc1f96e1228da5f52bdf15a1b660c5faa48a575efe
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_gu.tar.gz 9474513 RMD160 e3b387be50344ba741f88c27679acfa2553afe3a SHA1 40a0e2f3fc129f244c1db1e40eb579a6cc6a163b SHA256 a3a28fc4f6a5f883090f05667fd20814d63df638d165e0a9fe7a2e63e9fd28f9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_he.tar.gz 9124608 RMD160 71ddd159a434dfd3cef04dae77034f8ed4ef37c9 SHA1 ba0e2aa88608192eafde4bb04bb24b0e5a034726 SHA256 513479fb0823f71fb02460c0ffdfbd4f7d9c7ae9b9315c61b9e88ca942fe92ab
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_hi.tar.gz 10131309 RMD160 cfac4c9c62dbf1a6dd1ef34781dc4f4f18089ef3 SHA1 c38eae719e20a0dd7cd4fbea0c42c54a6df5fda3 SHA256 759a71522bb615e49dcc89638e21a5d61ecb363c1ac7de6047f921baea247859
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_hr.tar.gz 9695794 RMD160 958bdbc50ed5732d663dacc7a9688c278cee275c SHA1 dea7973e913e7306c14c2b0ace71d8748978a68d SHA256 a2439814bdb58a51b59d5504521679735eddbd22ace9f56b89be696aea1ef905
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_hu.tar.gz 11060567 RMD160 f23d65bddb9e27f15ba7a40be5ec6ec0b1d3c263 SHA1 55c724e30892dca6d6266bcbe9c7b07f6c53b267 SHA256 5e916b3085b61063bc719ce274de0b2916597c3f5b1737cd4812fa8e6627f2ee
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_id.tar.gz 9601069 RMD160 837a294439e0396b5e35710970b3488160069f92 SHA1 282ef532a7bdccdd6324908fdfecbc46afa8386e SHA256 ce9290e63aebc7b19491506a63e29f5996e5694fe0e43090329e0c5683956b3d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_is.tar.gz 9783256 RMD160 2c8c7cdaaff4ca2fbe43c17f189eb52b5bb18a6e SHA1 e3d9dcda66481831adeb319202572948b5e98477 SHA256 69e1d12e7912f41e7431940e0d15eec704be6a93e94b946e732e7be30ead03a1
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_it.tar.gz 10893393 RMD160 e89ab847f028f17d2661c5ddf504eb986d599134 SHA1 8001d324decf8c7a8ee386e3bca12535b4c6b2c3 SHA256 c783ca947a4c645a2eb89ae98aa34b3125ac5c26d98dbcc9b56c97778d8fd9b6
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ja.tar.gz 16803759 RMD160 12fca9d5d138f7c1ecd0c308b5a19c679e926380 SHA1 35cbd1c603f11ab09395d0d6f0ab54e448c14e0c SHA256 0c39370ec1efeffc31ca30c01383249dc0758dac87529c0b227c321868369ca9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ka.tar.gz 10121718 RMD160 278862e4691c040d1505e1f6d04b9ff5c680a0b1 SHA1 e3b5df7a9ed2f0e5da63c35b2d84950442f0af9b SHA256 c8c7c9caad518a597109537080f57cfe63b4f3e13d3929da30a9464d55dd437c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_km.tar.gz 12174690 RMD160 1708f6900eaac047d5ca7ab16a3de79ef3c137de SHA1 816c88ea1ac86fc774045a0350498a9b715bbab1 SHA256 c24254fa941916211c53ebc141de787da459f9e068d95dc94db882ba202ff6a0
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ko.tar.gz 10695793 RMD160 288c9167c7294335e7af75b359c1d734953653fe SHA1 388d29f9065f9f58259c9940778edf1b681e3b5b SHA256 762ae3de7a79c95b23921585229222a2e99659ea2d0d283cff39f042234f6abc
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_lb.tar.gz 9380546 RMD160 cacc1a44704bbe37f411c7b2f67765a056f423ff SHA1 a3d1935460c8e05ffc7b08949dd3caf403e10ed8 SHA256 da18ba3f7758676439f9703af533abacf2269bb1e7a92e049d2fbc6a82ba093d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_mk.tar.gz 10398278 RMD160 183c761ac053adab780de1f7acdce10b6b63d479 SHA1 ab86ad4d53efcc919eebd93369cd04f0875355a3 SHA256 9f01b3d81ebca0ae89b11b94bcfac1a8a8b201ed815e87909f67667d61c0f0af
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_nb.tar.gz 10595980 RMD160 b4d94126130affc7a6dc9b790026cae8c7230387 SHA1 f4ca974080b5dc0a1960a8a2ec6de877a0f9addc SHA256 c953d464bfb2685fc2f4168b4ad78bc2c684ce254dea5eca6e4ecbd6a76283f4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ne.tar.gz 11755512 RMD160 e2e0f4555c4e358d5e11a25ef03fcd700be3ec6b SHA1 ee76395d007024f15736efa523e76f5e6fffb704 SHA256 f93a8bbaf02e4ffd09dbd24467c74f0711673feb8d82f0bfc41ee24b13d31cc2
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_nl.tar.gz 10686255 RMD160 c067457ecbdd25197c23cb0476e78da5b06f763e SHA1 9b8d9789bfa4c67dc5edcffaf8150c6b511fc5ba SHA256 4143eebf8d420648762c22c07a4be81eeedd93902388821e29dcd19b747971d2
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_nn.tar.gz 10173149 RMD160 63edecad8fcafd920c120bb0b6d9173915142795 SHA1 20923b1de6ae8271ca68fda7d8c215268b99cfab SHA256 0a77f37255ac417545df0004dddeb40758ed54611b20aab6db85e49ad5c808f4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_om.tar.gz 10929094 RMD160 1a76656e216914d41d2930d65d441082fc6560ca SHA1 ebc8b9b2d663dcd530194becb38f5885423f5f5f SHA256 e5370b5c19480c579627c33cb420f229b2374016f7e756f4fa0fbf4c5eb32ac1
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_pl.tar.gz 11027556 RMD160 82ebbfed88e565f09545f686f189539dcb3b1ff3 SHA1 dc814fd48baf7ed83c4c3b9e41ee2bf26e0c93ae SHA256 e4c78107a46c8b5935240df6d65c8de0029adfb7f9992b9f89fb946b805de1ca
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_pt-BR.tar.gz 10733050 RMD160 3475ad5e6d5d2faf2c284a1d5dd5639b99297f92 SHA1 0f701a34f295bb2d99f6b8059fcffe2fd04b90f6 SHA256 56787a9347bf80d591eb04863b3651c309fb4ed10e7890ac000475e00e25b712
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_pt.tar.gz 10750115 RMD160 d2c2a2164bff3fe98c42176c8f5e8ec40bcac495 SHA1 907efaa62d52a0ce5b3e9d1ddae121920793e745 SHA256 795a83472b9f898d8ccbc0b56d2f835d984074f4dac2eda262a74f607b20bbbf
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ru.tar.gz 11686583 RMD160 3b38e8f0c245cdd0b3dd505880128c85448660f7 SHA1 6b71748d637a55d5a0c2bc5ce38b3e1576786483 SHA256 5c0cc7695379a7e933e99dadabe265b86bd9ff6b45a89c95dd80d3c368d93dd4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_si.tar.gz 10011781 RMD160 276afa2fc812c2d4e29b1395acc298ad6b4b2f61 SHA1 fec3dd002cde4f72acf0c773a65c8af3a3d55c81 SHA256 9100553906287bd6646f99ab23e340a55e2371523714e4d1a767a7f48049e762
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_sk.tar.gz 10464619 RMD160 f30f16a6ebd43e837fe619807389eb6dc96ec003 SHA1 09f6e816dfff8ba752304f647ff2791c4d1b2e28 SHA256 37b909ae0bf990ec78ae5a1afc706e7faa9702ad1b1b348104ae05a722e83f22
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_sl.tar.gz 10651380 RMD160 a0b3b61c772073c96a79f7d57502d7cd2277590b SHA1 f9e7fc6e83bc695936cdad16e35f1639069c80b2 SHA256 5d0d0b6e104855ef737449d1792a6a6df82a918cce855715f481070f54733b9d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_sq.tar.gz 9797177 RMD160 70d98ae2052e52d6d95675a3122b59843fb568c5 SHA1 84d1795323d0d7d5d93fc5de7ee58e850b621434 SHA256 0d24232d062c836af651213089133cc4e2f93471c287e05662a621dfd0f742e0
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_sv.tar.gz 10604977 RMD160 437cef5e060662db96f749a6a3abb57dd2895d1f SHA1 873be0113d3a78d92ec3bdf717beab734431f2f6 SHA256 13bfc97cb7fb2652809e6bec7d85c605435da2895614a1dbc27363d44304a357
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_tg.tar.gz 10167361 RMD160 dbde930bf9e091ee0688c0f4eab26c5403854a76 SHA1 9d580b7745d62cb6911bc64654da1ea50e971d36 SHA256 baa9b6b4acda2fdf5431cead511c852b5cf4a962ae3d6bb76b9a985bd70d061e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_tr.tar.gz 10247097 RMD160 6bc5fc001c17f6ae1017d5a70cffe248a2a062e1 SHA1 0d8e936bf954c75a47d8dd14b50413439561a067 SHA256 36936e857f860a264b0d883d63027cb723a3e23dc0a36a91ae783078916b166d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_ug.tar.gz 9767776 RMD160 1af81d77d2d28292489a88e5c6889f56e20bba6a SHA1 ec7b1955497042bf4182bbd58671185069e4f0de SHA256 6547ece33d00605fd22ecd4dfd9b8dabd75a6171542538cf89d252660ed87a01
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_uk.tar.gz 9607602 RMD160 31b8fc4f60ffe0ae1fa5c70cd635f49159302f1f SHA1 ac773e467816e1f103d2de6edda493911a91c5ad SHA256 a0772d5c775bf753a473e6ae6aed8f39565566b1276ae39930eceee1c1d93a0a
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_vi.tar.gz 11263407 RMD160 6b17ea8d20e12e93d1abc98625fc9b79d856234f SHA1 d9df20bd0c6351a62e1a02524b7cc8aa5d7ee651 SHA256 736ee1d4b612ec0a9e04ff1b967086940c3c9098bb51c2c511a863a3a62cca56
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_zh-CN.tar.gz 11854467 RMD160 74c8102bc1d3620dd4399599556974b802725e3e SHA1 85f5760cc47fcb8740f8883f926710db3e75738c SHA256 ba97e5e2d35255cc47ea824e6028715b0dd6aa8164e5171029289f268e910dc7
-DIST LibO-Dev_3.5.0beta2_Linux_x86_helppack-rpm_zh-TW.tar.gz 12087625 RMD160 b27849a88d8a562f0f4e1e1e1f36dcda1a392e20 SHA1 2ee696aa956082af67d625f683ea5b092c96cca8 SHA256 d332329b6cbb304f748098e890a7b468767bda0044d2d8121f2bcab400bb76b9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_af.tar.gz 2262995 RMD160 8370b1880e12a370fb2215d68e2c2d7d80260c27 SHA1 82d4dcdcee706631db0b3226db7195f386fce024 SHA256 746d888ed7fd2fc1abdc753cf70712f9c1a834fee91dac722197be60daef2c85
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ar.tar.gz 3401314 RMD160 68cec28d32fb853c63d5a20cb50116b683797e35 SHA1 1960b5e3ae0bcb2a35779b7202510f6c23295193 SHA256 e0024ebf726ac19db78446ba247f8bb756344894b393460344c99b1a8782ca5d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_as.tar.gz 8202089 RMD160 056712cb98af604efe379d0c1314cbd073184386 SHA1 804f627ec90aa55b5ce00fe79685351fdefb8d56 SHA256 f82d360f26c207d224dbacd05063aadd7ea02b71e7b9eee3b02acc2de5839eeb
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ast.tar.gz 8155128 RMD160 33d1b6823e8c1f349e14c0294701f2eb2a6c589a SHA1 6d322d430413919ff7434ede555d2ad11f0cd2a8 SHA256 87dceb8eb98c3a3c4cc2edbe87e4cd8fd67287757e31e3a10944d09a517cd960
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_be.tar.gz 2042482 RMD160 fc4b49af1d549fd82fb8b31d8acedf9bc09101db SHA1 1fc8e3bf992ebb94afeafa143c255351233c8eb7 SHA256 acbf01f5e400f1fbd611f1218ae17602e60e330fb8bae5b09e74ef9b94290b04
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_bg.tar.gz 3055935 RMD160 3aedd5673aed595de35c300666635472a96e733e SHA1 53ed29e0e2c4ef7c9e12bf558c14f3164fabd520 SHA256 c0f406a7033d36cf6c1eb581ae034dd17dc37e74e241b65443eb1d5bfa40d57e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_bn.tar.gz 2071692 RMD160 95788c7679e420569c624f9964ec78db61fbe115 SHA1 8a84266eff85148852785713c336b9adab7d1d4c SHA256 35880a6b63586b8d96244694094b21a415e4a62abd830fb72eab7e7c376db52d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_bo.tar.gz 8215878 RMD160 3708805c55dfd3fc8c97eb4c644ca43ec8ff2093 SHA1 909c5a528fd33877e83b68ec4fbfe0b1086cf30e SHA256 05bb0da0c400834b065f58ed51005f891c468772e23a9a024901ef0309f59968
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_br.tar.gz 2856563 RMD160 b8da1a8fb24545bc00730ba803661b660b705711 SHA1 586073332a88938c59bc771c02f3c85405224d31 SHA256 18331759e61c3a840d461b6f29a63e1fa6607c281488110911dc398a5d51010c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_brx.tar.gz 8185185 RMD160 1d77268befe062f70294e75f278fd4024f2ddf73 SHA1 51c248aa8365e993fd2929d3153a04a279bff38c SHA256 c4dc03eadba33694259142ad0946da45555a036e9a3ee61ee7d8603c5a403451
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_bs.tar.gz 8151345 RMD160 81c857b1d6197d923fdb42236b28610a5d9fed1f SHA1 60d25bfed6496f02fceeab1c744220597db55b21 SHA256 6a58f43168c0bd7bb532795e2fff60962eab23f0d0094f19fc2c93fb393016d7
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ca-XV.tar.gz 8150461 RMD160 258ac58b67dc8655f7831be7630a32b4b3e68abc SHA1 636713df6065083cd1e146ffb7afbf5623ef57fe SHA256 839aaee25733dada9bcbe0d12bbb125c61c05b54fde345ae9e566fc00913a7eb
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ca.tar.gz 2291829 RMD160 7f0bd64a0d7d5a79e407a549905150890fff4ff5 SHA1 1242a3adcebe4273f2c29281cf8fcb7ca0bd44dc SHA256 8cd3690de2c4a5d6fa0ab6fa05aeac9b11e92b039a0568ccbe1fb1573735c2d8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_cs.tar.gz 2962078 RMD160 dd552cf58c008a48c092d03aab31f32a20008048 SHA1 e1d705455088a8a65275dfd1bff28975d24460b9 SHA256 2db3fc8465244c09acd1bbee8df0842c475130da2ca128c9ec18304060cfac38
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_cy.tar.gz 8133120 RMD160 d1889625bca55c35a301f7fe44a4cb263d147dea SHA1 04f4d5c2d4d65fc0f9aad5b034dfd7db1c3668fa SHA256 2b50243ecf6e437a6e8202844f4733625a859d20a5c09963a1c60052f815bff8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_da.tar.gz 3310714 RMD160 c9382d68b38a1e2d944d8a2e5ced84360b3b2e02 SHA1 51b4d8acf2caf4e351498ab0448409f6d26cea04 SHA256 6f3b4a87529d7d2cca5513639f3e3fb769fcbe36ad673a17183906dcf7586434
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_de.tar.gz 10118478 RMD160 82fc35381c3d5530d211bda269afaadaafb433d5 SHA1 3c2c364a0a0e4280e139282ebf38e5da0665e28c SHA256 5c276e34114fe9779648f02e73505f034d7326c8d0118ea3c216a79cbd1ea6e8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_dgo.tar.gz 8193021 RMD160 cc2af12b8c7e02eeb8fdc735f7eba83541dd5d1a SHA1 cdac09afd48d2fd4474f10d9354a37b3ce4b0d0c SHA256 9cab536e87a66f90b1cdee7f0f88464bcb04209a8ea5c5325fd7dffd81b353e9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_dz.tar.gz 8227220 RMD160 4f0689305726ef1f55da6786ff35aaa5ae1e35da SHA1 408f3b6f54139b805a39df075949874259aa361d SHA256 7f013577222397acf5bb0675cc5f2ccf2b9a3bde7fc1ed57fe5eb616c9d6fcb3
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_el.tar.gz 3237092 RMD160 4ff140de6bc018b6da1d67b297f47eef3c4a6ba2 SHA1 b5bcb8f92b6dcae31b76d057f09aadb4ade5ed7b SHA256 134fb350757ffb4c41bbfa23c8ac8da5feaaa1596b103829ece02f7b1607703d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_en-GB.tar.gz 8206029 RMD160 b1af26ff0c5856abb7940099cb2e7b7615c9eb76 SHA1 81da072b3ae3d7443a931b03d140242fd9dc35e0 SHA256 adaa30f31c748a74d4a7ee9ffbe27a9602c7ad72a302ccf4f86ebd906610f70e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_en-ZA.tar.gz 8121566 RMD160 389e45eb9289aeb4868d47cd0a2c29029ab0a2e1 SHA1 06e1f5b4f2dfdc53890d3f7d20319c81cc4063f1 SHA256 4ff81d23f534e7504052ae84e85436fff55cd43b16cc569603fc72c90b918dc9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_eo.tar.gz 8132642 RMD160 73670d9b981cd81fcc0e0d524aceb90eae29450f SHA1 f5ac0998a5c54d73b64e50c3de307c8cda4adf24 SHA256 2591250356f7377de759bddf22f34cbb8fb4e73b078fdbc38ff64d913c9cdec9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_es.tar.gz 1704758 RMD160 ac3cf5cda328e227bbe51b5cdf8815e6534b6df2 SHA1 042f1cb9761953486401a4309f77f5515cdd38d0 SHA256 49aebf00ab230ac2e06c6b8a223cd4b63b54cdcdf153b16c97a30d4803e9499b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_et.tar.gz 2534749 RMD160 981a1b673a790239e316b0b5cbbba05337ad023d SHA1 34455ab3dcdc1c65c0793bd4187b1b50414eb1a4 SHA256 e2c9108217dec47d95afe48528766878fd7225c12dc82872fa258d345fee8049
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_eu.tar.gz 8333904 RMD160 1b7a0b7ce440bfb588c88de17abc4eb456f24c00 SHA1 8f4a58a75cf2b2bbe93122f60f58e7f4fb6aa8f6 SHA256 86a0909d4d5262bf298e5b86f2e3a484f95faf0f34358819bfcdbf94ca289c7d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_fa.tar.gz 8170931 RMD160 eba2fddd9986d9d62499f044c30f96ba53b0ac74 SHA1 e8fd999afd5a7451261e9c355ae8eee493a9e09b SHA256 fc0ace880c05630357fb7922ba243856e3e0a685e58d867c50c3c1a25ef00a7c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_fi.tar.gz 8141119 RMD160 cb3bee1f5c1ae98b432dfd0e9ba9f5a335811696 SHA1 15bec6154d68ac333e5ced3a840119b1a36b2940 SHA256 e77585a04af9d1016e9aaf53cb54366f256bfdac97f76eb26a4ffb5e30e2bf71
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_fr.tar.gz 3826489 RMD160 793c8f8ceb6546e6e1889a730e9cd4a69cf25309 SHA1 82d29fbda7bb05d7dd2443178e8e10aa3947e37a SHA256 e3ae3ac5fab109e276dc51d06c50a7c9b3841e115b9241ad324a1a459a919e9b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ga.tar.gz 8157090 RMD160 2f7e2491908d225c0af30bd613bb130f766dea69 SHA1 cd8096dd1df6405dc4df2d425a75a7b00fc13e45 SHA256 26f6583901e3071eabf131e666bc49b6ab9aec8e414b1481b507d6152a134638
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_gd.tar.gz 1963310 RMD160 4cd417e93587f835eed32741e42945a45aad70b9 SHA1 9383b3c8d6d1c9507a3ecf36d81d4c5f7a29d1b3 SHA256 deb8a3f2b503324a4c9307840574a5ea57fefae64c30c38799ecf85386e1c3bb
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_gl.tar.gz 1863200 RMD160 5c13a12e45dbb7d60d1c9eb609065e88ae2d9214 SHA1 34b9f6b55b102524a9aa49fddc230c14938dc8c6 SHA256 bf03c749444b4d4653fcac2f9520f938c777685308d72e6eab75e1462e1661a3
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_gu.tar.gz 2339132 RMD160 edefe2adc7e02859fe30f00715a5d91407bb9512 SHA1 b27e50faf1083b35ff6cb9149eb0c631d98c9994 SHA256 bb1d80d7f7405e0d1be3c9b84374c9542282ea4c7e4867d164847843b874fb20
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_he.tar.gz 2256173 RMD160 3fcf6462ab0092a717c7127c46b64744e67f99b0 SHA1 a56c946107a90b1f37f0a2374698bcadf48fe4d1 SHA256 3cf7a392ac951e9e9c7cee2c3acbbf7d01e8464ef736f36487723b0e7d8d6b8c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_hi.tar.gz 1768317 RMD160 e069667fb24e7840c9eb13b331bfbef3e0d01a80 SHA1 e2c7acc9edaf309e43871213afdacc05ae3cf5f8 SHA256 0e9e02b38f6a6e09ee1ab55f40491e0fa51908cdb7580d8ff902dbba8368deba
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_hr.tar.gz 2400138 RMD160 618a79d44430da9d9751bd4f91e21139fe28e330 SHA1 a0d114e55b29975010a62994142b672b418c499a SHA256 bbef2024cafeef48f9dce41ab3b6c5113ee2a34818e1bc1151c7c53786823f07
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_hu.tar.gz 3786439 RMD160 a9fd2105835e43f77b3d44f37bf297f77ca0ae6f SHA1 664c467c923c6eae49a6559f0978101ebe4eaacd SHA256 782aaa7c47af055187a4adce46c7d6d22fc3981eaa36fd10fe2780e73e2c8f9a
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_id.tar.gz 8130893 RMD160 a07f57c3b4511a601484187cedf0758a457c07ed SHA1 58ceb6ff3bd9cb8585f0c5ae5a2608cda4a6680d SHA256 cb842d7cf20cea1cfdede786cedd68ab39aa4c17d55b9854b1d5a1c7dd5cdc26
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_is.tar.gz 8150623 RMD160 94898d3aa69bace6888e231d1794c05e5a02caa4 SHA1 c6a6ead13292be47064655df59c56eaebc85a917 SHA256 9b33db142395e52f4a112b2eafabd94260f8ce42cf7f6cc8c9827f947205e1fe
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_it.tar.gz 2874488 RMD160 9e8f65c478e135cfe3e71929e88c44ddd991e155 SHA1 a078e4ea56bc491b39496b5306705ae70931051b SHA256 e50c38f616cc485316e5106567c5cd19ac08e69a2438a10b487b624e7b49e318
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ja.tar.gz 1750398 RMD160 4413d13fcbe310f4b27fb4e2a36b0835b6df95e6 SHA1 cf8c9088b4fbb4019e714c6098321c2a594facc7 SHA256 572379c36f05e3972006532fe533325be6e4eb7a503ce143f21c0e78a6eeb82c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ka.tar.gz 8193461 RMD160 c648f2409aa07831b170a9aebfa141acf978cb6d SHA1 c2b26c6a7b446074ff83a533c52f77befe76f243 SHA256 94cfdb6a99b1431e3d9f27dfa123d091bf30e81316e6680f213edf2f47268b2e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_kk.tar.gz 8189802 RMD160 82a10d574b300aec23403d8b2384632886124cc7 SHA1 8e1ad9a83eff36f7d41cfdc1360e4e76b8226f6a SHA256 91feb4ef10d7bd1ad83cc43db9633efbb0a238c47181c20e428850b5f7708738
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_km.tar.gz 8375172 RMD160 202aff650856a6450d5344aef1dcd183c7ebe7e2 SHA1 3396320d7df0b1cc1d49272f20c4373c461f8110 SHA256 3e247a2ee63ff3e8a61296980699d66d8d62e51bcbfff7c6ede974883bb57aec
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_kn.tar.gz 8216002 RMD160 d97450b137d8fc0e645e3073a56361664ed14db0 SHA1 cbae845199df76d0910f8685e558ee82eff02ad0 SHA256 622f3e5b3db5f3a8f46dfd8e9688db695eb4e2aaa6d536ea61f8f8a1be4ca364
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ko.tar.gz 1620577 RMD160 c8681772638de739b280b05eba09e6c6dc075c92 SHA1 2d753b5e0c6c5ba27c7ab23c65af690f1d8def25 SHA256 8ed7cbed8c7b6f3409971d7019239d6d633293c8b409282ad07dd3d21329e783
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_kok.tar.gz 8183620 RMD160 a623ab3690a606dad0f3e89ca0a444eb164f412a SHA1 0747bc6d1ea0271f7cada990f885d28662bbbb50 SHA256 6da72ba5243bfbf516df5b0c4d564068be8ea273a030a653974926a9c6a226ca
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ks.tar.gz 8189267 RMD160 3bb355da6db150a58d2b04ca57d308fe17f61966 SHA1 ad31570284f36b520d3901c5e2286497d0c370a1 SHA256 1f43cc15dceef8416f54c4fa02fb7f1035796088b16f83b65024c524d445417b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ku.tar.gz 1713297 RMD160 14864cecfc669cdd79204dd5ef72995103d55bc5 SHA1 0d0a07b4e97bd0ace116e5a0c7ad0a491e16fef8 SHA256 5e71c1f29b26d0c03314d54331605fc6df2b85d39dd99dd699454cfc2e27a9e5
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_lb.tar.gz 8128253 RMD160 f099175253794beea2943388e3a400bd87997434 SHA1 4d943d30f6015d3f921cc1cb8fc485e32f36e09e SHA256 ce72fe45eebeec68d42d933d7c5e42b086f1092783ac04c6522694dab48c05a9
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_lo.tar.gz 8177712 RMD160 3b93aba8484667fcc821cc686714d9a03973782c SHA1 38dcac6d71dc5b62fb838091c1681db7068b7590 SHA256 6e29e35833cc14bdb11161bbbbdee871a34d427f6fbda258844d308e46c3680c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_lt.tar.gz 2015655 RMD160 412b751c0f6be388256ea3a6a566df6041bfe9ca SHA1 336e2cb5b1776178e5ac66384ce2d94fc8bede9c SHA256 0520bd113fb200e91ad531207b9237ba8cacd5ff19e72bda443e11456c036e38
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_lv.tar.gz 2396423 RMD160 54a110f9f0b9ac67de132cf840fb170f1bca05aa SHA1 2ffd38dc28629fc5bd66eaded963618f68059c45 SHA256 84ade6ec5d8dcf49fc75c7e44a84752c2c30d2f2054b197e365af9c9cc7ae3e8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_mai.tar.gz 8193549 RMD160 ce8d875a820e732155b78b077a3ba68b01b5ab53 SHA1 3b9e6d59afe0f21ea8b22df4010ec6ebeb88dea5 SHA256 add0bc25dad53c7ae0ddea92494b4b3a2b29704ce730ab25045d39639e4e741b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_mk.tar.gz 8192115 RMD160 9288fbc1a9b208295c7f6a4d70783df5ef4d5a7e SHA1 417005b2566657ecb51cba37f2d6079bcbfae0c9 SHA256 c4c0e38e8cf1a4cd640849bac84578e734fb6179411fd8ea111a8ae4ba30ab51
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ml.tar.gz 8216248 RMD160 a7756d61cc3344a11f614219fd7a2adb9695353f SHA1 df15990098299c55a3844018d2212932b6251501 SHA256 ef715542912a73791887f0c564f63ecb6bf107fea18fc9aa25ea1775214563d8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_mn.tar.gz 8196096 RMD160 68eec77e8e37eed51fe6487f6173525c9eadb6a7 SHA1 ecacdaf3b6db4e8d25ab86bc86ba227c9e993892 SHA256 8f6bef7e324fbf757941409c470f6b7d243239923af391c6766b58531237959a
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_mni.tar.gz 8188271 RMD160 7f4c49f6b6b735f4fa11a29e63634ceb630146a0 SHA1 b3f6c61952a40bf047edc351737617d1c71e3600 SHA256 1ee6533ce5240267537808578f24d83e2f9f1c47a0c1e8d594dad18ffc11327c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_mr.tar.gz 8210573 RMD160 1db72e4d0cf2b981000869353ad6a97d6de7fa47 SHA1 7417ad39efbcb57b79ef75b40b23e127c1b377e0 SHA256 fefec43f4c0751a0a6ef5827e7790471476b9a67f4333370eb00600298e819fa
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_my.tar.gz 8228993 RMD160 6f33458b818fe78a7d027e15eefa40b4819cac6a SHA1 970ed49c61418880d438b0378ab84a58b9894c4e SHA256 f1500af9bbaf8d658ce9b16a752065eb70ee696e1793f80b910c06ff000744ee
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_nb.tar.gz 4844028 RMD160 0a39ac90a39ca98a83451c8705c99105fefb4557 SHA1 07741f5947e905765607e1a3eb0ac0fb431f3a2d SHA256 05dc6f3ef2e0e0a5b46699a53ac18b48acc1058d4a5846f958c557a141cdbeac
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ne.tar.gz 2080195 RMD160 dee610e263d4bae133b1684ed9264b8030f47358 SHA1 31e42c1d7a8c05a6a8cc6a79b9e8e491f92ab5c2 SHA256 0ba8a017dae9cadec1b44c863dd5b6a9789a234204871eceb8510129556f5812
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_nl.tar.gz 2369135 RMD160 027b967007212ad58382bc186b9e7098d1a8290d SHA1 c65ee18affcbaecf99b0a43326bd18c68ab8ef51 SHA256 109defc1a7554458c1b8bb7c84bb863ad9e8b149f309aedfd0e07d3a0bc64b69
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_nn.tar.gz 4848187 RMD160 7cdaa733ef4d87c87f6c0e7e493ffb05d5e361b2 SHA1 1f2a66b08970fbec76034c9d809399277e6566c6 SHA256 01be3014c6565934d1d19a24d0e3071e7a0052ffdc5cecc2cd329f8aeb5117a8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_nr.tar.gz 8164724 RMD160 5741aeed258dce9cbd00abd71a2adfbe63d2c00f SHA1 1294cf222007af84f78bf56ca6b8a6a8a9dea199 SHA256 a7fa8035a5439bdaecd0f42a71442ed31120876f8c7ab106a40ee050d9628e5b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_nso.tar.gz 8156821 RMD160 428104d828aa8c7fc1d6cdfa57b756ba9e3fd50f SHA1 ff4be623c941e36b536b1e5b96c5f73fb1bf1e4d SHA256 3aeade541f4bbd694cd1694bad8dd8f8b4936d005653e78d2fcb52d6ed584dbc
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_oc.tar.gz 1840888 RMD160 f7929a1c83567fa72d7e4a84852a1fca81dc428d SHA1 239a3be6478b2b1effad274c51905d2e0afd6256 SHA256 05eb66aead82f970adfd15e82e655be3e28b9d0c685e57bbaddad96d2544222e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_om.tar.gz 8139491 RMD160 7ae5da1670032eea0c2ffb5c0a59a3a6791f1125 SHA1 dde160b0111aae494bdd47a1b744feb578362fe5 SHA256 230c7c23ae8b0f96eceeadc6c2a1af95ff347c8007dfde7ff86de21e7e7f8e1e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_or.tar.gz 8202971 RMD160 8097f11075202fe631e2f32326c8082d4afdb8eb SHA1 93caa788c40da16286b541c19093facb596b1744 SHA256 b3f57109ffc1ac40b623f6a2bbe7da84652635a64e0e552ebbd0e168957bebc4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_pa-IN.tar.gz 8185226 RMD160 7b64a7c16fec658534260c9ab3128578536ee326 SHA1 e2466d7e87b9df80e12622660152489713069532 SHA256 5d8f8ddf6f38bdcfb45368486c7aba7c5c82658f05265c78ffa650dadfeb0335
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_pl.tar.gz 4352697 RMD160 90a2ee65a6b2007b8f9790d73b82c27b2bb4ab8d SHA1 2c27114d4882ed8d5f4ab6f4796b99816d73180e SHA256 6cab0182325bb3519e01736b23e87a19d51fce102d1d439c6b8638bdf19be9f2
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_pt-BR.tar.gz 2944244 RMD160 f898c8ebabbc51a4c4abf8b2e60fba280156b106 SHA1 8525a4ad4c60d90234da28e7db659879f42c3d3c SHA256 b61ec6e0671f3ac7078fb8e68aebb64cd8d77fadd6e010f477a0c1384b58c810
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_pt.tar.gz 2210500 RMD160 3ae7f409ae082af6efe7f804cb65e71e3a096d34 SHA1 df37bcda3872d21a78fa4c0b204b692c303c74b2 SHA256 d5f3c65938bebf197f3231b928fb199ad1c19a1ce2be7de1177dd82e9fd22c1d
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ro.tar.gz 3463149 RMD160 957d93e514d30ed4537ff9134bbaa7190cced2cf SHA1 67b7bf740e4a8b494df76b88570208ee1d6a2dae SHA256 6214a4b331010e05440a03be8c9bc80b5d89ebfff2245262e7f5f8de550dd735
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ru.tar.gz 2744264 RMD160 515c2e41e8a1b7c88afc57db49e00c192f705ffd SHA1 d6e7ff634eb274ab825b7395f3548b75fceb0f0c SHA256 7f8aea1d58d769ee8e96e61f27b257978b5d3c626830493aed3d81a4fdcffb77
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_rw.tar.gz 8147539 RMD160 df97e7fe1f7b390def546bfbcc1900cc8b6b0a18 SHA1 4168370d0298a83b047ec0b0723434e0ce7a61ef SHA256 bfa328820073a8217431fe8e777c95cca64b5e81f77793ea28a96c64babdf43c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sa-IN.tar.gz 8192888 RMD160 723043dd5d492b3789c4395869818c1fefa56a2d SHA1 0ae240b5bce76db942b349ae20b3bdaa3ec0b551 SHA256 2ba3108c6c120b7ca15a45e7bcf2d33f78bb2f3ff515a4dce87f1808eaf31e61
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sat.tar.gz 8186233 RMD160 080a7fc8a683d4b370988cf63a0f2b59da43c902 SHA1 f58f38c326a5b4b0f9e692b57509d2de2b6d6a5c SHA256 0ea91f25c9c4ee6b1e8ce6632a37e62f9ba1aa1279fe2029077e6404bca1c165
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sd.tar.gz 8178540 RMD160 81820030ba68a3d9d6299add413edd748172ae3e SHA1 be2de6edaf11fb6b83592eb7d84840d6931773d6 SHA256 b9126443286af1306ea4a92ffca340c2a9515285960362e81cf88e82d5e07483
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sh.tar.gz 2830929 RMD160 f7116352dcda4808df352763e072888169638037 SHA1 7368add6a6cb9159e0d420b738c534cbf6b89a9f SHA256 d7031d70ba6db2b41141095563505a092f85756be0f4f95e26addb4c6603e8ef
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_si.tar.gz 1985352 RMD160 c780d7e44c6777e5f0ff53c8680f6221fb20c54d SHA1 98873a03aa86a4197406c80471f604d1d4a950f7 SHA256 71c17dd9f30a58a3ef0cfee1a6efc3cef7abf5500aeaf5d1e7248ab81dea9015
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sk.tar.gz 3018367 RMD160 77e2cbc5bfc880ef0aff0090f65890a22c96a1c6 SHA1 cefca4def9be0955c4fef0414b11f55047e2dba3 SHA256 fe9a802f3834d88ecbfb672ff859106ed37a8efd9d0be5fa3207d519548204c0
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sl.tar.gz 3174388 RMD160 3934d1e3e51fd9cbab2b0f839403194261dd5dea SHA1 d5ce6b11c921a39cc4df55a8a1db601cbb12f0c5 SHA256 7002796bdc7a33d33ca11d22af7338cf77a1a5ed88f06e1b7b727e567bd14dd7
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sq.tar.gz 8155858 RMD160 3a98dd540d25b042db489f1f64e30762cdb2aa87 SHA1 9e9da4496b9edd97ba791a2dfd38fec403401e39 SHA256 ce4241a5b658d2ef80ced75c43a7b25390975cdacb905b854eddbc1c355cf727
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sr.tar.gz 2873378 RMD160 da4e4c43727a7b9f3c180bdeecabbfde58bbd3ea SHA1 43998fedb5d1ff722421a50b8526606765d5c306 SHA256 715be9b68efe0d4929f7561a75b1bfc9cf04100963ec91a085ef6ed18ec1afbd
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ss.tar.gz 8162050 RMD160 99dff8e3bc4bfb39450407bebaefbd08e6c55a37 SHA1 2017daadd0e69517599f4f9db97c656c2e2d89c3 SHA256 028d286645c789b74f2295925faaefefa12e9c13e1584f0f6f2d933b1c2002dc
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_st.tar.gz 8160392 RMD160 51fbcdd2a2553376e800acb3e03cf23057105382 SHA1 aff2a0cf536eac7731760851c564316459368730 SHA256 3fdd9606582371541b13c342559fc72c003d65d6e91019c586886edc3eafb1f8
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sv.tar.gz 2257758 RMD160 29d80bd80a9aa474c8e9f184c762f6e983793969 SHA1 cd420ad5972c0e5e763386a6d91c59d3c8e55d8f SHA256 f806021f55f22388bd5b7dc15778ff9235a0f322fb74b0340972caa07c50e955
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_sw-TZ.tar.gz 8136345 RMD160 7eb97123664f390965a9265707a4ebd75ea0ba8a SHA1 ca8915141afd6a91aa4c8cfaa1a805461f3f79a1 SHA256 476bfeb668ec1f6fdbc30e35c2d8a2c175f85983fbc745e7b6900098d3b5c42a
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ta.tar.gz 8203483 RMD160 a869eaa5cc2c7507dd1ae2c4833acfdee28ea163 SHA1 d46fb6c51ae548ffbc317d3755c46721ea970194 SHA256 39d86dd57b79f740e1ff99314f59dfcc4cc7f6da17b23de54ad8e62b4ca25bf0
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_te.tar.gz 2262013 RMD160 fc15c20a2793f0c68a501b10b296e6ffb1c3e1af SHA1 81ab3d875e62b75ae66c57a6b2a0a7cba9d8c74e SHA256 fdb139af1427d49e81704b1cae28011c4349fd0a107164a77ac5a413341e2402
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_tg.tar.gz 8179063 RMD160 f623a0e46690f811cd245ecfdbb6024abbc0c859 SHA1 836cb25e1e63ae6af3c359900d2ec9334d1bee31 SHA256 f0d8fec0d3b21716250b06a3fb61a0fa4c4e8447b7abf930d5b0b5f249ff155c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_th.tar.gz 1837004 RMD160 32e3f2c83da484ed5b8ca90f44b23b7de8c393dd SHA1 32c9d353633e963deb1a25fb1d45d4b1d5bdfdda SHA256 940b4616e61ff1ac5feef26bb565a0022e7cd22babb2fe0b5a691d2f83e70d0b
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_tn.tar.gz 8145771 RMD160 a07ee2c0437fd5897a4dbb3796ddff131f0b0844 SHA1 a09deef1f326d5563922e792cc56aec78fefdc2b SHA256 9abc6fc6412a41059ccbfa676bc84222d12f824020fa211f5b420e97643abfe4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_tr.tar.gz 8108038 RMD160 7613c1cfcd5c13ce330d90039bff622737730a1f SHA1 f047053a0603d444437c13201ae198b227c1476e SHA256 baf86991f0f9882dba34b85e28ff3d0b5c4a80bc8aaa778ce23e69a5377f8fe4
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ts.tar.gz 8162460 RMD160 6eea3775b02755a1d30759350ffd3061c9eee43c SHA1 0996f0deadf70409e91f26ab27590def90e42f83 SHA256 3c0fdb43db1bcfefea451ec16676d090796871def95e70a651663c39e74556af
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ug.tar.gz 8181064 RMD160 750f88c04d9cef0d07e743e4c1adcbb052d6a110 SHA1 f26b2f908a43c410617492af8519499930a83294 SHA256 cbfd8f0367294a7673718cc3e06963c2c3cb9bd9e7a100ea8ae976db2bdc032e
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_uk.tar.gz 2517415 RMD160 8de260b08a6bb656c07841816855fff43c9cf5b5 SHA1 cff6b7362f06bb91689f66d727636ddef8d27227 SHA256 9e34994d2965ccf0b691cfa71c84102796a4f2b92c1709de02373293b904cd07
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_uz.tar.gz 8146711 RMD160 e9b7d2d42e78fb63eca5634eed06f837eb683ac3 SHA1 58aaacc71d413438a9bf06e1ba60652019fefa95 SHA256 6b3cbf155c0bf691d4bf45d3faf71a3eb9577269ddf6b5192da780838d29a28c
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_ve.tar.gz 8166038 RMD160 0819b2bf21184c4e43c3e375d824e05b42f944d6 SHA1 95d1aa51d3dfbf2292b1909c69140369be48b355 SHA256 14b7948764f47a3c2a626c539ca96e495b00dc7fa7086c7e4b861f3b3b151788
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_vi.tar.gz 1804499 RMD160 00240fe223f1a3193c07d8d13e7d7d9992cb0939 SHA1 0628a72d3ac45d2de1db0616bb4e58168e6b5a2c SHA256 7f5684cd95d4684ce721dfed35efea9cf510e88e9f6029f06eabde99e0290bfc
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_xh.tar.gz 8176896 RMD160 1cf24411f8d83814121f15234850388ab27c8d4e SHA1 2df5e89912607d6d2541f0425acb45b9906d203e SHA256 5422396a7b0febac020b00a5a9d33f9a364633cf739438b99e6abae5b0d74fe5
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_zh-CN.tar.gz 1712338 RMD160 bc238d7893691e40d03b56739ae567b51b28170a SHA1 b18f34f059bc5e7661eab99d5b5ef1f225169d11 SHA256 4183c6314b882803cb671c5ff662355a39aaf332135b3db976d5ff403a1ed036
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_zh-TW.tar.gz 1706221 RMD160 509e4539bad21ee0604bdfa7538a38bdb9fa8cd1 SHA1 8d7fa8501faa0aa32429a395e9be6c9eadcde8c8 SHA256 4367dbba273f883562ba0e897cb5d56f6ce27e852eaef13d0bf6bf73599adef2
-DIST LibO-Dev_3.5.0beta2_Linux_x86_langpack-rpm_zu.tar.gz 1665531 RMD160 6c2073c3a5f62c0eff330dd29c44585d3c0ba0c5 SHA1 1fe53371dcdcd14bd2456863aaf4977709980382 SHA256 c22d0cab23d43a04aacbf0dc7ff1ba14160f9045b911ae454fe3b31f3a374be2
DIST LibO_3.4.3_Linux_x86_helppack-rpm_bg.tar.gz 11600726 RMD160 9f1f6103f8a203de5c698eb61a0393ec717801bc SHA1 9aaab4bac6aaeed367222203695837892745ae74 SHA256 35e82464e7df2ce29d6581cc99fcd3d4ec8599e8502ccd32423c60012fe80eb5
DIST LibO_3.4.3_Linux_x86_helppack-rpm_bn.tar.gz 11827442 RMD160 7c0ea12129b91284baf4a7d560e8375d09116775 SHA1 7a9a19087f7dc483f2488b58da6e9168c01e2cda SHA256 da7cf25d126f885ef5ef5a4ab146d1decc279bc31ebf4ea7fc82e56c63ccc060
DIST LibO_3.4.3_Linux_x86_helppack-rpm_bo.tar.gz 12481157 RMD160 259d98e9cd0c0036482908aea4148b9a8d7f9771 SHA1 7080b887ced84f476ecdbe7ac248e07725b48f28 SHA256 5bb6e175e624c2765b35e6b730a37b5ce9cab7d7632eb49bb8177f5576b3fe63
@@ -316,164 +155,323 @@ DIST LibO_3.4.3_Linux_x86_langpack-rpm_xh.tar.gz 8219580 RMD160 d0275c82d5078c57
DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-CN.tar.gz 1772291 RMD160 19218e0cf581a0381662008a8d48857964e9ac1d SHA1 31780f19f2ec0577a73586c5e14020e95a815ebc SHA256 5f13189f7f689e71fe2556dca8e53240af3d7df91839de368c57b330545c7033
DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764731 RMD160 33de70443758e3cc38d62c254ea1bc98574f2bfc SHA1 d813ab13c16fba69e549b143d6948f08b1c0d62c SHA256 e1dcba904952b3feef0b9c3957960c49cb6d720b1d135becac1ddc71e67344a6
DIST LibO_3.4.3_Linux_x86_langpack-rpm_zu.tar.gz 1721114 RMD160 058a2e21902ab9312464c9976ed6fa1edb341afe SHA1 0875fd47bb40fb0875c5c492cedcca60917dcee3 SHA256 5f866e2061b9dabee78a81fe9743b539e25a725d17312a66eecfd0139eab4a65
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_bg.tar.gz 11595924 RMD160 428fe7f066328a05aae370835f8a78cfdd4cee94 SHA1 9a6d64813282394f5ea4cd89db4d99f4ac34d52b SHA256 75b4320224ac9c80b3a2967d7e44a89e022de7b7221986d38859975302f0d4a6
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_bn.tar.gz 11823989 RMD160 dd91f50882cc0238ad5b40ff0a1bcfdc757f8a09 SHA1 2eaf271e706a825a4c4c4f97cbed654e8f99515d SHA256 f7b276b7fb87e1f52b6c76fdc2307aeece753b2aecbe2cbdd45c6fa9ac6a3189
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_bo.tar.gz 12479268 RMD160 c30b7a653bc011fe39fd5a7662a9d168d03a3f88 SHA1 698ab77e21881ef7fdbce73dfbf5a4f43eb0cfef SHA256 0c0dc8dd38bf3e91e295ca948b8b1e46ec049b7bf7fa795b113f9f336e78ac85
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_bs.tar.gz 10073288 RMD160 1d2257f3bc02a5d51f705b700aadae0199a832fc SHA1 cec01c9207f53053829dd41fd3a843320a875032 SHA256 0e52f58e77bfe9d7065bbf879dec5f3a8d7997f5d728e9bc14599ce12e46cca3
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ca-XV.tar.gz 10935571 RMD160 34833e7eb8d8455063c78dbc4c4ad8dba53598b9 SHA1 80897c6d6aef1f10e9a5267b756a026ff05bec85 SHA256 111bec4893bb6c6eb4f3fe0f40c846d41bd56efbb4006599824c59140cd70365
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ca.tar.gz 10927703 RMD160 fa80d5d2431bf94ed74edd6c5ba86e1297de5f21 SHA1 3f7f6baf575bfac69517c49c3c3c74b0eddb3a9d SHA256 c034397626c67c39d7ad497d82b57a92b623f04b9c85ca0a318749095c78d66e
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_cs.tar.gz 10665404 RMD160 4692aa7b82b7c2524b5a50242a77b45e06963b5c SHA1 08423c98cc378721ab364a17fb4d5f6982e2e7b3 SHA256 e64ce834fd0b297493f94f2c8720f2dbe3ad732b079e5fa706538a359b38e11b
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_da.tar.gz 10526610 RMD160 38f340594767736e4afac2f7ab07d14d2d772d72 SHA1 b5ae17d93a4a6444fadbe0d3812105123cb60ff5 SHA256 2bd99e6a321c7941947c5767742d8b39c1aeb11ea2e27963f0142a27a63f48c3
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_de.tar.gz 11137493 RMD160 ce0df33f0c1be425f32bab62be48b48bf9bdad2d SHA1 745410077389a1a572d229fe8512e309c3ad2776 SHA256 78ef8f1ade37fc0005ae3768c8cf982182feeae3bc66280089723dca7c9f5774
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_dz.tar.gz 13336845 RMD160 9fed66074c6bbf2474d658b8b443ff36d92525eb SHA1 f37ff8985c9f5cce2bfd494b322b7e120e6e1a68 SHA256 f99ef8483b9c22879634eeddf109fff79dd9573e824ca51294d861c474310eb5
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_el.tar.gz 12362324 RMD160 483d9529734f91822a04cc7c018602e574a1eeb2 SHA1 766c021f82ed7b7a325abc3bc78117a108ef3605 SHA256 a352ea694a05b204b75b97a22143261e01a27d07525c3c628add8572994d8e75
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_en-GB.tar.gz 9358661 RMD160 5691555028c1132d3bea206f5bc3a5452edfdc72 SHA1 9cda60ca11aec92be1d387a29d27893508e4516c SHA256 5b54867eaa4dceb5528458c09cfa90a2c98d0038c4d6c6c878f6051957a1a441
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_en-US.tar.gz 9416259 RMD160 4ea2230e30e9eb7168c2fc46bc6c6047e6b3a99e SHA1 d8297c1fd5500e9d0bfca03c5822d0df7bba8e4f SHA256 0acbee9d3a83d4a24d68ea6ee3c1926bf69c73c96408e0a3cc0d4f37a61eb22c
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_en-ZA.tar.gz 9343675 RMD160 73a7db3c26515a84131db79b64ab1e4abc0baa80 SHA1 c512cfe19142a568db61144ae6fb5c72b91d6895 SHA256 b9f39f2394c2e29a39d5f6504dd5a8c4caf25755ab45b2a14cf564591034fe7c
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_eo.tar.gz 9769726 RMD160 76abce5df86c76e1b619379901e5832069df13bc SHA1 828f6ada70003a39888f62991b7c2b126143cb5b SHA256 a16fd70467eb2bb702f293764cf5ec14fd687f21c19847e461200564bbb91877
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_es.tar.gz 11025741 RMD160 91a250dcc88c495ecd88d28acd20ba180048a6b7 SHA1 3c645b3e06bf59bb58ba37f4195ed06e3f67dae7 SHA256 7b966a8a9bc06151c74d31be9fde024803ba5c6efdded949013a0624593fb001
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_et.tar.gz 10431961 RMD160 82bb49718e787b6d5cff1fdd6d12bd32e7c6968a SHA1 e78496fde76be8e98f2c9a5481b291d8c29da543 SHA256 de639edc8623d8c54aeb44ae3ba1eea9a3f6730b9516f4d8f721c9331c42f936
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_eu.tar.gz 10540758 RMD160 51185f123d7cae434cf0ee571a2c11be78148406 SHA1 51d656ca9884417e5550f3c45cc3485b55cb04be SHA256 0565148f5a53b4bc94f0de5c43bb4c98b8f32e80df3088be4d934f3dbd34b359
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_fi.tar.gz 11193527 RMD160 d0a1a0fe5e596c7577e56c8d0c71369e213aa3f7 SHA1 ff78c4a90dd0b8d61e865e9b0f2a062e105687ab SHA256 610b47744cec5a9f2b573c38273daab426a9d1ddc653038b768de44ed9c5bccc
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_fr.tar.gz 11182503 RMD160 bdc451043e01fd7c51aad2c960af67bc2b758ac1 SHA1 0abd6bfc0c04884e882df773132f5ae32f74ca27 SHA256 7f8d4034b22f322199d14d78e239d2abe4bba68089e42b428b4fa1f2dd5f74c3
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_gl.tar.gz 10475477 RMD160 146fb863ee3cea0fe9e36a9868f1f8429591b7d8 SHA1 b2137c49bf3a30a019e5480b7573038d140887d2 SHA256 899125a37e8a4af1c84e59aa70b833a75e9350036133ca38dd947ae977303b9a
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_gu.tar.gz 9510249 RMD160 d374b27781c6a317deca462ac683bb8f4613925e SHA1 7573b26d148ec7a26ec2093f833f12fbd09841ed SHA256 c3f409517b977944dcdca4dd3afb6f16e8c227a8721a1326248d2bda1e288996
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_he.tar.gz 9150764 RMD160 fc7e58b323b0a85625422149be4eadb98daeb4fa SHA1 83eab849b539524170f3288f75a6d97c22dcb2e4 SHA256 9cf28bcedb6b875d602bde9ee813b6b1e19103a6b238602ad74536925775e441
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_hi.tar.gz 10170700 RMD160 a4eda08db72daac49002f7404bbe970b9a7149ee SHA1 7758bab5d9c163541fd74a6c63ed43f5639e8b21 SHA256 7a8dd746b62f1cac190f1c7a63a72693c8bca98491bca6e702251015daa194f8
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_hr.tar.gz 9727091 RMD160 a113c0471f028bc7842d272f2a93e3561f9c4886 SHA1 49a2bcaf3f415d72fe7d0ffeb47562cb0f73b7db SHA256 8778fd262b247638ea36cf669affdadf68596869f584fc8664c5c0bd310cc9a2
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_hu.tar.gz 11080238 RMD160 e9187e622f88ea850d22a51ec5ec5f3ec59fdc08 SHA1 a8367b8eebe72536787c18666885dc7e50e3c7c8 SHA256 3669d72785032724159cb6aaa74776cec61221ba85c0e7f4c3777028fa63726b
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_id.tar.gz 9636804 RMD160 c91eefa6711f7bd68f87c1481e9510d20589230d SHA1 b63b041c51502bd80c0f28cf9b73ae0a1ac9eb56 SHA256 78456ac5fb55dc1373bc675414713abc72d0973b97801fa93a14807d8a3ca775
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_is.tar.gz 9820978 RMD160 c34bb28fe8f6fdd210e56769ae5ce003a44bfcbc SHA1 531d261319f68a811ddb9ce0e1e372fbf7a83e18 SHA256 41638c15d2d347c2ffab31a8abeb7d8fdb77d18a1a7d97caeddac399b11f43cd
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_it.tar.gz 10918971 RMD160 ce96e5f481c91fb6595bd0cae3ed7301d2789a29 SHA1 2d9a54ac71830a8d150a3271cf7f3742ace6e49c SHA256 d6a3dfe9288b06a72e7292a5870b394f6b8b44619282bb5a7811bceafd0c3ccc
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ja.tar.gz 16899585 RMD160 8532589b232a6e255859a99ea42484b7beec0804 SHA1 6b68d579a32cd3a47ccfda5ed927cb1c630d753e SHA256 2eebaacf758317b5c48c7e9027fc69343081eab2ef135f46da86fe16c8223c7a
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ka.tar.gz 10165964 RMD160 85a11ba46cf6418490609fefc2d0eff16d64ab86 SHA1 069a6c239579ec9b1eb29823dcd86a4d0e25ab4d SHA256 92ebda04073db59e17fee918260e43e7d74527d412a5f953465f89d3857480f2
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_km.tar.gz 12215458 RMD160 23619f62481997b90c35b10779e5f3de894c8c11 SHA1 e289eaef9fe4bcae3596d31db7c86a559fbef0fc SHA256 ac4076c366871f400c938b8d77343066b307e0d3a76c27e26abf59185f5141aa
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ko.tar.gz 10726616 RMD160 cc337f9256b7e3f70f2778a47bdaf4b52bc355f6 SHA1 f151d290a7db6231b8e53ee4b78f81e7d7864589 SHA256 daf7dac6365c57840b5c6b6b8631b72490b634a5be533fbed371b38fc6de0d98
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_mk.tar.gz 10441502 RMD160 666c8f3ca3b97058f4c512632fcfbd4db7975f69 SHA1 2cf21c76b1d6b3259dfb00a5c3f78e0bfaba3577 SHA256 96b343cd441825e4cde89a70afbb438bc6130b2440e0dae507b1d8954d5fb014
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_nb.tar.gz 10629851 RMD160 73915be9263d38e52c6bf728486d92cad9dc3416 SHA1 9e63d52659447dadb1d62ff50d586cd4fdb836f1 SHA256 6a46f2cac09b347a4f3c0e6deae18738e07f5730f1ccd1f4c66c321539fae9ed
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ne.tar.gz 11803929 RMD160 f7c4fbc30161b8809f5b1ac4efaac0e319f4f17c SHA1 89c13d9c5278c0c1e33444a0f9c55d866a692c58 SHA256 010771663f6a3fd20f93df680ba31c2b08c59678eb8be64ec002b3276be57ad1
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_nl.tar.gz 10707379 RMD160 cf9d949441cf3ce90bd045ec50f779307cc9c74d SHA1 65abc0161643772efad0d7d69adc2eeba399e035 SHA256 1f79a0c46c4d00c1bb6cabe4041d042eb202a3d6be45a73f2736be9abb8f633c
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_nn.tar.gz 10216181 RMD160 a614f5d388dca8d7d11a807b53731fca038b89ff SHA1 ed511593e19bd9ba66af7b750fd6cfc06a62bb5f SHA256 a151c12584a7a9ed16cbce553241b1757211071cb0e2b98d7a7bd7058fccca40
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_om.tar.gz 10957729 RMD160 abb596e750717686d3d75b11a692c9e49cb2bf8a SHA1 1e09013c42af38ded8faf780f7e882e1e1235d8e SHA256 dbb3ab6465728b096708742f619410aeae6ca8cfbb6f25a564cadaf8b1043b07
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_pl.tar.gz 11050785 RMD160 947f99f68dd432e3eed37b2438f11e7b22c9230c SHA1 aa2db956fac05fcdaf077f065444901d5559f11b SHA256 2da5756e2c82e13617d782a9b5b2aa05d4667f2d320e354c71ec04185e6f8f83
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_pt-BR.tar.gz 10767555 RMD160 c709bcfeb97b3ba58806cbe43fc84cfbf0993a8a SHA1 71cbcc21f15a5363be5e0b577d936e0bc9c8b737 SHA256 feb73ea80427262fe45114dd20b19a72ba4fac2e15c778ea2968acd574684540
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_pt.tar.gz 10794587 RMD160 92bf9d98a0c0150dfe411d779ac9fac3caff59ed SHA1 bb29f1543bf6e27b4c3620d754548e1cca511446 SHA256 8b688d2c4666c69cdcd51816c430819594d6c9316648561832576d95a673949b
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ru.tar.gz 11722824 RMD160 4803269fe7a8b6f46b72a2c51a57a7de79e39446 SHA1 25d02d991d718b53d2e09398acbb2fb39a644450 SHA256 9773bf4d5f2f99a43ca4b34b8e258cba992a3193ebb5cb80a16eb108c03061a2
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_si.tar.gz 10054029 RMD160 c00e8827822dfb2c2a76989051b5924baf42d85a SHA1 3d0c8b6f47bcd956633bd2f812733cce00ecb605 SHA256 ed2d62a71765567861e0c0357a2263dd895eed13186403c16fb5807a6317cfb7
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_sk.tar.gz 10504882 RMD160 1370ff691f41c9f3beb9c172b3bea297f01961d9 SHA1 70eba5c88fe8815c76befea50f670687343241a5 SHA256 8375c64fd52c4263b8aa24fdfee980beb37b9c721502f8dc0981dc313a3f3ec1
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_sl.tar.gz 10689383 RMD160 130c4876e6415d628b9f0eaf4e021deac30b3173 SHA1 ad5b8c05fc5f6e954b8ef16812372b4e91f7ab83 SHA256 b6ab2c5f307b55084b455b291f8249869b6d342bf1a4993ea72aaee12a4b59e3
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_sq.tar.gz 9833229 RMD160 8fe4f4e54ff37b2411a9794cde723f4605a4ef2b SHA1 14a09e6078abb0df4c2810f12232cbfcff96492a SHA256 fd00869528f4b6b42a76a04155c45f7a4115dd622ac9aefca1b3b35354ddbb7e
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_sv.tar.gz 10637926 RMD160 fcec513548e3e8f1d0c29942744ee48f23de7207 SHA1 9877021899ecfa711d2a473e20d009d6952ed624 SHA256 72ea0ce786efe01992fbf7048bf4998e9bd1646004153029b9544b0e02e3832f
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_tg.tar.gz 10207812 RMD160 5a73ed86cb2a131b188f872a1025b870299f5853 SHA1 c98368d913b9606419915fe02b8fb3b5b9cca6ad SHA256 dcea2f4292e7da01c8a5a0e467b64441b1cf5fe043b853d2289760dfa6a668fd
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_tr.tar.gz 10260443 RMD160 d350e5c41312af0d54014e13cd71fa986e163940 SHA1 307aadfc0d55df9deb2533ddd93915ab7b98809d SHA256 a4c7e8b09988741925cb369fefe1a48b5f3272b5989c6f8198f17a8785015383
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_ug.tar.gz 9806214 RMD160 08a675791cc8cab81344747069607322a73f2eaa SHA1 ae2408aa9d3aac44e820f94403296e427320a7fe SHA256 00b22b310eb67fb6d79ea8e75f4c1f95e7bcc4f65ac14fb240b56509d73151ae
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_uk.tar.gz 9637995 RMD160 4a784f28118b104e03d89b671d527810e30e0fdb SHA1 90a7d23d5f3a8803837824f2ac4381e875c04b77 SHA256 8e7a04bcde14f300c223e35e2d697ca87c12479de28b9ad93e89c80b0046415e
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_vi.tar.gz 11307172 RMD160 24e4e17f3942dcbd4a024630041041a844a5744a SHA1 b4b7619f961247e683c24f2dcc01d152a51c0a05 SHA256 2b746a836c0c35be41540965b4a98d291b72a0705cf3533b3532a0e7560b2aac
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_zh-CN.tar.gz 11897672 RMD160 e9fdf469a6781a77a176757d7f80f039798c9f13 SHA1 fed26e8ae81001be6eb0a914619c9fce3dee673f SHA256 ba225415187599b244d32a72e9ee29800737e8613c08131874293274f1d04f15
-DIST LibO_3.4.5rc2_Linux_x86_helppack-rpm_zh-TW.tar.gz 12131732 RMD160 e7452746ef0574d84492a9a159ca7828eb131b57 SHA1 af5594efd58912eab3aa79418b16c83093659de5 SHA256 2cde429fce94fbbe125ba94da1adae38ec6279293d47d7c53116987124a19cc9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_af.tar.gz 2315495 RMD160 99790507a0123b75e927f40e2c6b765f938e1273 SHA1 db5ea93c661d4739b0a5304b9d95d7b88ad98d5e SHA256 f23262c396cb76cc060fa6636e98b40fca7020f986272002250d2526248dc1f4
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ar.tar.gz 1722405 RMD160 8fda24e78cff2550bf4a378148d0cb84b853131b SHA1 0a6adb83419f8bfbfe79997d66c4b7cec86bca33 SHA256 926205e06cc6173cecf9e195f6453f79c66fce1435baf092e042a99f80ed8d30
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_as.tar.gz 8248611 RMD160 13bbd870fdbd551f14d05752e9a75c4f322bd2f8 SHA1 644171d0013d5748d008b688c741efa54f8517e1 SHA256 4576c7be103e751e26dd6301e9ec5935c5d563b40a8b6e3347ddd707af1d9fca
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ast.tar.gz 8198176 RMD160 de36115bc7209bd1b62fdf6867c160ec03d93adb SHA1 1afb438c6e6fe8a70d99a796a223a5c3e0146a08 SHA256 347495467fd2ef6eea1d67143582d974a1b54e14ba64341473e332d8ed9e1093
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_be.tar.gz 8234917 RMD160 0f195e4359b9b57e508c10dd2c14ec329691bdad SHA1 096f940e36d54397137bb1851f7ef08a5b08bb99 SHA256 f73505c5f72d8ac81561a55f623d469610cbefbc7101de349c8e63b496bf21c7
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_bg.tar.gz 8291184 RMD160 18a8b74119578bc3dc94b008dee25f62cc420838 SHA1 01ffd14106075d4eda55b016b57fe33bde0b1917 SHA256 f917e8386952f2f4d53db1a0561dc5bdf6f20fe88cca3d17f063c7b837bfb2a0
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_bn.tar.gz 8251294 RMD160 06d9fa2b8ce15e4d93f964e14624ddce298f05a4 SHA1 d40a6f271f748ee4c6a492596c341d7cac1d7f6d SHA256 d34a8ba11707d4a26022308fd140e2b28e7ba1881a9ba4723cb5bd905f5550bd
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_bo.tar.gz 8265239 RMD160 d92017043c374b7a70e3050d3c1fa1bd889a5f85 SHA1 368d1d0376efa2e942f4ed098b9d1584c0555607 SHA256 fbd9159446d2b4a8704b9e164fe6e5362437c3b281da2e9a6365a652b241b019
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_br.tar.gz 8191713 RMD160 2ea390321e7146df5ca91983def7f4e8eb35b49f SHA1 ec52542dfb9452893f19662c92891d7299674996 SHA256 2a8a648385454a3b5076ead9d405cc446bcafc363f9d256656ab46af0e072a23
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_brx.tar.gz 8230871 RMD160 f5635c2a28a6dcf4f5105b92dcb627ea960637ee SHA1 622f7b2aed3a533a267653daabd60fb2a2a26ca3 SHA256 7818c6c60b38745516bb502f51c5d77023f59078a72f9ff079431a38b97abe05
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_bs.tar.gz 8193628 RMD160 4c200b9a09a65b2fb1540c0f48c158998bfeef81 SHA1 5b84dbacb513eb440e9d53c4ab2341f49979deb5 SHA256 741be2987b3fdf707bd901432033ff6bd36f8eee92870eb4284de57b9fa7e9a4
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ca-XV.tar.gz 8193228 RMD160 1a427feb9df3907f974ee52977f6ab4cccb14fd3 SHA1 a45e89d2b28be6e7b5b8dc5397fa5cae2028bb43 SHA256 d9c0a6e9d8cb9ecbd97b07551058a75191e88b05b1285d1139159be1723201ef
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ca.tar.gz 2348543 RMD160 d5909bfc3fabac441b570d343366e2bfe25ba2cc SHA1 78acc8bd9faf378b2cf06fcd230140228b9969b4 SHA256 503c9501d0ba79ae84bdbda4f2836b38555f100b79840d01cc538696e1c616fa
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_cs.tar.gz 2006431 RMD160 dbb1b2ee60b3e3a4c2fcfbf8bfb9ba0891bcfdf0 SHA1 3d3ea70890e4095f766c3151e142777b949f6635 SHA256 72bcfd8aa3d87c75aa638f877faa05c8880c372d6bfc2b8644c35b12259810dd
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_cy.tar.gz 8174565 RMD160 ac5cb2c11b90007386c36780e9d80ea48f37f8bf SHA1 bbf24f49397febcbd1578d1e61251f2783769fcb SHA256 969c617872dbdf2d72a134444c4ae8607b2b01fad06d25c8f178f98ff637119a
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_da.tar.gz 3368315 RMD160 ed64394a322db79aa88e8446b3f5354b16a3bce8 SHA1 59d20f2c3d78695f0abb42e8ccd36cbb3557f2bf SHA256 b86c37bc32935dc276fd11877d90877ee4f9033b99dfca3efcdc86a69211a5e5
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_de.tar.gz 5568749 RMD160 e13862ad23b64e709df137ce90cdc29c3e7e31df SHA1 6a5128c3f6dec51b834bbbf89f6ba664c337420d SHA256 2a67511b4fb1ac7cf2cf5948128bf0a2effb390fd78f051986b1ffee5b66ec6d
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_dgo.tar.gz 8239602 RMD160 05a5d2208a2276804cd9555725d2374ccce1a5e8 SHA1 f5d5d1e56642fa81764ab6fd908f7bfd92fe995d SHA256 9c365191ed6ba8df6b18a075799c07e68f55fca6225ce077dbc24a2a713edf7b
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_dz.tar.gz 8274173 RMD160 d0bc88f0ce406527e96cd669f200f984f6aa5d5a SHA1 dc6f72b666348a83d7ebce3ffa2cfcf529dab997 SHA256 8b435eef37e922b7bec7e04ca21a08c22c5ad804b8fceab1a9f756989247e2ca
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_el.tar.gz 8274966 RMD160 efcf4877ade80369467b7f17235d9f8270436745 SHA1 087f16a8663301d864dd522b4aeffa30733f35d7 SHA256 1d36dd202271c912de5c2b628fbca9bfaaf937d0b052892813eb505c5e470c30
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_en-GB.tar.gz 8246086 RMD160 ce7ecff942f6bf1d98f1070e8100b5b6834d155f SHA1 4fe4ad0b9d25e269f03ae7facf494923496f0392 SHA256 5c27fb001150b726fec83505addddaf3dd3bc59ab8327c85dabd698a724103d9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_en-ZA.tar.gz 8160644 RMD160 f2a5ccf60e9c5389aad12ae64e43663af02c345d SHA1 a6be0a386e00aa9ebd9f981298b034d0a4ff2dc9 SHA256 78e45d5da0e2881c327633dadec75b385b46fef27df2257541930738c222340f
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_eo.tar.gz 8175424 RMD160 f9d5e1c36d51607df2359e4a982e4e2bdf92f4e8 SHA1 0aa77f285849d48cae57a742b5c73e235565a746 SHA256 57dbde8444a56faa89f263bde44da6da69936d6c990487d5b57028a6b6aa4427
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_es.tar.gz 1984175 RMD160 f99cbf13cc56e3c2bdc5b3192b74ca135c816905 SHA1 113eb409a56a5e7322a31129f2b0da6b14dc0068 SHA256 a0a0122c482220507047408ce7ae93d49969a6c5e905047e6c6409d80fd3c461
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_et.tar.gz 2590072 RMD160 029cdb9ef416f280757bbc5dcc375a54ce878d75 SHA1 2b0213149674f1d430987cde164293f58c4fa177 SHA256 f59d97349bac66fdb2a0d4c79cc656561219c16d5881bcf03c0f9178282094f4
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_eu.tar.gz 8374041 RMD160 3adfc649a81cd906d9c9faa33b1ce09dbd118364 SHA1 9a58f7e33a07e89fe7dfd254008c1d4dc4fafd6c SHA256 73e684e4c147ed6ac7dd08348b2cc1ffe02288b1b31da427d7b3e4a3fd99dc7f
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_fa.tar.gz 8216879 RMD160 c71065c78131cdd52d40283d33a1023b179846cc SHA1 720ab5f1fee7b018b47877173133d7e90192be55 SHA256 c8fb98db3f5a051bb5ad594c6f93f06ce4cd81ce1c3154ce4a7981515fb7d1c1
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_fi.tar.gz 8187069 RMD160 a9cacb9994afad576a814d7084a7b4719bf6f365 SHA1 9795e90b45aa6750319d422b93863af8ff4dec90 SHA256 474ac0b5161faed873b2a143141ac23b87946c81ce92ba0382c2709852f4122d
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_fr.tar.gz 3881188 RMD160 83f78f8edb0690378eda5970797bf750229c27df SHA1 3b125c2aab9d4542f76bf9e4216a8b6c5942ec28 SHA256 e7410f9de4bcc98a507fd130b7cf466cda924de1f42bd8eda87ab88f6215f6d8
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ga.tar.gz 8198693 RMD160 656911e37532941a3dab67797be14e0a33841590 SHA1 b5a43276f223398aaec3b22dc1047986544adda7 SHA256 15b86a44333549427a205886407cc42955fd7aaad524a8bd76f2a7fdab747119
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_gd.tar.gz 8203938 RMD160 dae9fb178e8ac3e214e9d1c6bf356716fef80b49 SHA1 e9a1b8f3a8b8c58cb28336f79748abf6d08bacc6 SHA256 aed6f9f4bca6487654051e1c62ea123ac3efb30b41b22538c9fea5cf6f7cfcb1
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_gl.tar.gz 1918668 RMD160 f9016996af4bb69ca4a5b683018f59c983424a2c SHA1 250b7b9aeeb08dcb0ff2f8bf42c66593918dbf0d SHA256 797afbf884a152c63c9ae1857b6ebc6db7de7a5d0e782102bbbf5a4a60c6a764
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_gu.tar.gz 8255014 RMD160 5fdff20c393dc6e6aecaced23aa2fbc1c67f9e9e SHA1 e74313b565645809f9c28122bea95d332c820650 SHA256 d271d982fad81b4ce9ef7b985f2f75c89ffa785102c31caf824b279f1f6109aa
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_he.tar.gz 2531547 RMD160 a4ed787cb89983037d8829401702be9c64cdbdf1 SHA1 6f4e7ead4c3d1d15360ca638f4d79edec8c9bd94 SHA256 e3fa81b33eacde6eea15c34e9aaf136f0197e62bfca3c1c7aa885a8b9d1d5320
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_hi.tar.gz 8246407 RMD160 2c0fea857613b7257020452b8dbc3c31539fc982 SHA1 1702dfc4e503d6007b28349ab27b6ece348e9544 SHA256 ea5af0427217baed523811e38e6f4a43b48e8ff1ec1dcebe01e7945b8459bdb0
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_hr.tar.gz 2452797 RMD160 38b2eaea77d4bb8e528afc2e39101094cb6e6719 SHA1 a8ecec9809c06e4056e4cf63978185832b0a5c83 SHA256 e308b7748b198467e5e315000e6ebffac0908f1491d11543f1cb7b0f62efdd14
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_hu.tar.gz 3827587 RMD160 eed6089dd15bb10c6fea2dd95c928555bf8e1278 SHA1 7afe52b380f708a78e0732bd4075d5889ff0c893 SHA256 ca7f98da120a7f572862e7bdb987117cbfbe0e978446e948bc50857e03b307f2
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_id.tar.gz 8170209 RMD160 8c9edeb4ebd6ac56e42c57e3f3cdd378034e42a6 SHA1 7bdae04f34c3272278d9ab571f798bb15d4a8480 SHA256 0d6940e58ed34dfe613a36fa2e2869ae987802898031ff14ba6750f0a5aefe03
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_is.tar.gz 8193201 RMD160 de196fb7bdb3a583e1f2bf7b4e89f9d1990531e5 SHA1 60eef6aae6977c7fcc63dc8d1489c16b6f9376ee SHA256 3bc9f19729f70ba334d27250cfdf0477c2ca92f2eaa88ffd17fef7d256bae872
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_it.tar.gz 2932379 RMD160 5595abfdbdd59224497f9a34b9f67fb9832cccbc SHA1 02a904f705e96dd89a57113bb03331fafcfad12d SHA256 a4884ffd82fafa49ec0873a1433d10bd3a5c259db7e4d0ac47d69efe752ef536
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ja.tar.gz 1815253 RMD160 a1c35f3cb7e5cf3ce3c3f05856b2e46c8019c3f2 SHA1 c09824e9968e7dbfea237339b3f0087ad391e08e SHA256 87b156122523d2b9e9f56b3a079315f8331776c7bb872f3c21419bc4c47faa86
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ka.tar.gz 8237416 RMD160 0bed6f1f78309b96d8f6b0175749a9ac110d3342 SHA1 89c43a3588b83ae5aa63e469bb58967058841848 SHA256 401851068b065437207b49bbc85e5685da3c0a9da2d6d98b6aa67561b25f46bc
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_kk.tar.gz 8234415 RMD160 52d9ef5764495be4ad2b17a8c35c9217f7feca2d SHA1 5fd8468409b205e7bc22700db06c4f0fba95012a SHA256 977d1a33ddc83dafbec85c2dabc373219e65b89abfd75732305225186a2a851e
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_km.tar.gz 8424838 RMD160 ab4c650089cf5e73f910f55ea0c14bd789655bb3 SHA1 ec368a77b185cbe7288bbdfc562a2e834fd83f86 SHA256 5512307c23e3d18dacdd0c1c156a84625b2493156c971d7d296bf518864d025e
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_kn.tar.gz 8263753 RMD160 f1d5a1770bbc1d7fac2053f808a5976a6674e7d7 SHA1 205c7b1d761c4e02a124ee48488ae6c0bc4da320 SHA256 dea23ed7707268dc4c15923c5e02bf63cbec0621b9a395e121cb913afeee4a49
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ko.tar.gz 1682645 RMD160 1e41bcadbeaa94ac8d0a0e47c5f872d2dce765e7 SHA1 d3994aa244598d9204bcda0c6cd376d4b80ee135 SHA256 a8cd4731915fa3f11d437b771656d485d82661f891b0fba4fbf6d55679bc10d2
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_kok.tar.gz 8230447 RMD160 1d7028599157903492fb8e389db508e5b8992e8d SHA1 ecfd5cb38d93a17991f8caf1e0aae890e2d657e4 SHA256 d5dc6c15f2f29ccb69ad1c950b9f9c052b64692a6efd69ce84f4b00aa4318ab5
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ks.tar.gz 8233814 RMD160 41169ee414bc22221428d22cbbacb173c81e120c SHA1 4a7905be5ee1c25c18e6e43856aa5793f9640f53 SHA256 49cbaee718545baf014f1e9e1b825894a01a7dce5f3beb81f0407439952b1288
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ku.tar.gz 1768221 RMD160 5983e2533f9bb153f36bda8caf1d821673bbd31f SHA1 45240abc89ee6679215eef2bcc4309e1176403b5 SHA256 8375a9b66e1f87eba9be378ad0027c56c14df2d1fd5119db6e7cc6f54269907d
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_lo.tar.gz 8223604 RMD160 7e06fb41568dd3b0c9cda356a57fc3cca662b6b5 SHA1 ffc45b5719b3b46efb4ba1f3520661874aea415f SHA256 99ea32e73ce6db3bbdeda146b3947bd416c0ff85bab95720d7a5603b332ed58e
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_lt.tar.gz 2075410 RMD160 9c5ff82f412c1123d8027a9ad5938ebc552e4869 SHA1 dd27426a0dc9aa1f0a16201b712d3bd060c0a4db SHA256 e6d476cd1c397da805d0b2c0d59f185806eb38fc623aa6ac78ad29d3c26f568e
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_lv.tar.gz 8192803 RMD160 4c52283186612e147f8b3cfebc2a9929091bed0a SHA1 25f19b418f2b607caa40bbed0f75cd9c19a48cc9 SHA256 588b19a8625ec1e124d1270b3a11562117fa3e23c5864aa58826606123af12b0
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_mai.tar.gz 8239624 RMD160 1884056d396c544e0f77033c21db849951348e3e SHA1 f2b520ffdb2e10529774c2528f8fd855ab384920 SHA256 2cc9a3d5c646c6e61600142a8e1d8b85b453fa3054346ad140d4dc5b168fbad7
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_mk.tar.gz 8238202 RMD160 185e70e43a0ce8c3269f36920b515bd8adcad974 SHA1 0b3d77669d84416cc3f875d12c07c65c12984dd0 SHA256 3148e5073962595a30718696f3e9e51fab9c28c09987d06b3b7f868bd3dbfaf1
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ml.tar.gz 8265696 RMD160 e8b22b505ee95ecc88ca69fa662792a7b2b637c9 SHA1 0fea276972774587d1114ca8e743c4250b02ef8c SHA256 78078d90a143d14134b0cce624b96a0f4445286857fa0d9c8d39352661beb9f1
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_mn.tar.gz 8242292 RMD160 602a88cdef201fd5a59024b978b92b261a1a9680 SHA1 45dbfadd0f21d1a85e57e81e61081b86fbce9e97 SHA256 865d5eb7b62e7c057084d2f8228b120202e8bcfa7257004c55dcb32227597dc3
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_mni.tar.gz 8234673 RMD160 95201e65656b4d99ed22a8eff42e46438d4e82ac SHA1 9f6aa2776dcb65f2ff8fa403065fa14380b25cdc SHA256 4cfcfc296074bf8137e2d72601f99c36f71d889d97e0a8c0862e0831cc5cba74
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_mr.tar.gz 8258242 RMD160 d4f73485504e83d15db9d26ada319304c3a93e81 SHA1 329ad7d4510526c25881988eccef8500332c4afe SHA256 1d9d8f8ff70af838c3f3276cbea6b046fbc2df6ab208ff2722665f7e9b5638c9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_my.tar.gz 8277503 RMD160 ae928d016f5dc52d80991b6bf81502885dee4a76 SHA1 fb7573294095dfe85c45003f17f2d2c7f5f8030f SHA256 97583ee6c08acd6207d81b8a78a7f1e16d1119171b220c0aea55a73f78a5aff1
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_nb.tar.gz 4896933 RMD160 25df8ff7ab2c75358de1c3339a1c889984d8d34d SHA1 b00bcaf93edb9a2bae51440917b8958a41ae8490 SHA256 5f6d4e7454c062c9b1ce779baf8ab2f15e2db6d4ec0af244ea510689be4cc0ea
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ne.tar.gz 2137434 RMD160 9f9e1b01a6c2d2746154925aa29d7751aa09bca7 SHA1 6c47f6bf34500abbd983bdb299e0a1ebda30f7e0 SHA256 583aebc3b795f79ae24e1a3d3870fb13029dfcf8beabe79a6ad7b0dacab78c29
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_nl.tar.gz 2427653 RMD160 fc0b9859d94da52c8e7835d856c3e25a9580b976 SHA1 702170efc71bc743a00504101a7bf73d0753e790 SHA256 2e34d1e0588b30ad7e7ce9335a1f91a486681ba376c62cbc34c433704bc5b819
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_nn.tar.gz 4899969 RMD160 8abb55182c8e0e7bee9e3f8f0a332835a499d0f5 SHA1 69391d9a681cfcff71debd3f657dd8a290d92ce2 SHA256 265d875aa1f08e1b0240b9a678d0ed946561ede86326080ab318158460ec5110
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_nr.tar.gz 8208226 RMD160 990dabea1877e3f1188d32210c6acb6f0a8258ff SHA1 2f2fe8af4a917e5d5e63c122f75095e2fb539dc5 SHA256 b78c5e17d9bee332be6cfecf4e657376d55a9058504766a004720984e99c8c12
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_nso.tar.gz 8199356 RMD160 ef81b2f9f434259cedc5518767ab39d93c745772 SHA1 f4ea8b172869492d66ad0bce01e366ac9ae7d014 SHA256 c055253d1c3890610d67a8a66dbc9a0fef1d2e9565e393ef9167c61f5827bd94
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_oc.tar.gz 1895277 RMD160 db4a0cd1a1abacb1e026b7c6dbdbac7a26e62290 SHA1 bf6d38512618b0117de58c576773b849da6b436d SHA256 68eb02dfa896b98d760ab49c96485235a6442154f78f69efb9bd8657dffd135a
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_om.tar.gz 8181284 RMD160 16bce82021623e76a2d1b21c07959b66fefeb7e5 SHA1 d2686fdf95b6edd88058fd7ecdba53433e1528b7 SHA256 76fdf4ef7767a8296c18ef04bffd1912f16bcc95f2e9f4144048f32622e907b3
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_or.tar.gz 8251461 RMD160 ef038289cc1422941e6ee3ae8db32fb3ce70e96f SHA1 0562d2a1e667e6d676ee46cf94b9a1d29a2bcbfd SHA256 8d4ce88d4dfb1aef2161cc27756738c50500dc8484dbb8fd556dbfb0dc1216cf
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_pa-IN.tar.gz 8231744 RMD160 7634061bfbcce210266c306b3e64bad54e2f1215 SHA1 e071464f515b02a3944c06703646920a2f27e372 SHA256 59242e020e835e1f70ddddf4fcaee39598b6ea78a0e6a845eceb933b0a505323
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_pl.tar.gz 4412612 RMD160 8a801239719d7cc7ea0f36d79b4768a008538fda SHA1 52f14906bdace4a33bd511b2a197b85e7a2f5a9f SHA256 918e4bd902bb8aed5cbae8e7699b3baa3706507697962a2f3f7573a5f428b979
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_pt-BR.tar.gz 3003656 RMD160 995d7cd16dc1d048f63987fd94bff6e41b4a6823 SHA1 c3b40357e4a562cc735c787b75df732964bd3f14 SHA256 51d6dc2452b71a658277f446455c558b0b7369d79b4c058c1bd3f9569ba86444
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_pt.tar.gz 3059959 RMD160 6e12ef1d3985aee9d5d5d6cfafb690b727f2c920 SHA1 300e83df0c77e42d05e64cf907f194263896e6cc SHA256 589e5a328b9a8507391b92d890287470ef5fcd9ce7382cbee6f02246b97755d2
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ro.tar.gz 3486566 RMD160 a8579c66b7ceb46434ecf3b0efe1ef33045fb437 SHA1 c2648421be99213f4321116efe9d524a0b336642 SHA256 c15395040ffb4df5e518f13ff42cdcd579bcf42e56023b49d984433630ae3fa3
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ru.tar.gz 2797105 RMD160 6a232d3b887b9dfba734b100c4761d009fda2a0b SHA1 d6998f65423e8afb2934aeb40396a42ea8c8a099 SHA256 fce60a17cd523cab15d4bd3f0d877b7e3ab0e6f564e9c8083e2da053ee27dbf9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_rw.tar.gz 8189680 RMD160 1d6a784a63eccbae94cf0eae3379e88d65137437 SHA1 9c3489cdd9fa6a3d3f249c802ea9b0a27b98c17c SHA256 5fc4d8da70bbc095faeb67e6b50a64c091d572cd02130c93b528443c044489f4
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sa-IN.tar.gz 8239849 RMD160 cbad1c10ac95d2c3b1c10ff1a238cf828d7ce0a1 SHA1 f556ca92cd86af5402d4c7b90d0f468923110bc7 SHA256 042ea3455e3bb15f87a1b98dfc0eec4ded0cecb83f1e8fc2093160352cdfe496
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sat.tar.gz 8232330 RMD160 34e7762ff71b283afadab8281430e08acc84eeb4 SHA1 1714f4f3b87ee2076a3585fe70d5bbdd623392c8 SHA256 958d5f0f0416638f02d9dc98221b1bd08c41a8a5b02e51b42d9880d0b599f965
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sd.tar.gz 8225161 RMD160 c871501b9a572b83b4fa339ec9339ab46bdfe67b SHA1 388ada94500d9bf7a6a1bd55ff5af4f5c457dc4c SHA256 90966474cdc1f174d2e2588a08e32482e0ceb6aa0aa232305f31a8f5282f8c8b
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sh.tar.gz 2883574 RMD160 e1142d3f0f77382962a7df6e3a3dd4494639075d SHA1 beeb08620d76a02665ceab75453fe561d80f7ec3 SHA256 5fd798fa4e5771f086cb1939ba1d97a8f0140ab0512a238daf54991f5a10b7b8
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_si.tar.gz 8247907 RMD160 1143a5a69d08e3f46b590ff5b8d4c9c188be763d SHA1 ab719dc16544f849c9454733e64742215031f73e SHA256 60c84f35f3b6823544ad7ce4ea5fa7686c72ae05821fbb19838edbbb1b33b0c5
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sk.tar.gz 3074156 RMD160 1ed83c3cc9542d40a460f7bc82f2fd2040426292 SHA1 8c428a6be11bcc382e014571a09ee01612465c64 SHA256 7c0b8a8f0ae99cc4647cad82d05452099acab03d5d2ed9a338c136a057b16e47
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sl.tar.gz 3228339 RMD160 e4242b2c0823727e92ba5ccd766cafffb61cffda SHA1 7d2d4875ec0cf406689307ca0cd2c05ef2920cc3 SHA256 2c91dc911a1070e989c8b39a47119f37a3c04de79d6b426f3f7c4f09b3f4ef99
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sq.tar.gz 8198912 RMD160 1e0a53bd98d49b712d45085c10f8499173aefc72 SHA1 b78a98aad381e0e867f96217a8371b6943603c24 SHA256 258922132741f52832e0dc15cb7059d8c48eeb681f3a47c41268732878c9870a
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sr.tar.gz 2930048 RMD160 c43a5d46f62c40db7d6b9a9280ad7e6038ce24de SHA1 5b18862140da5d9222aa433573c4a0317ea0d18f SHA256 af8355d22fbc0ffbfd460e9eec6165c6414ad775d0035a30e977c51f051581bb
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ss.tar.gz 8204463 RMD160 f5cf2e31bff8a4e2ad1f560a42c3171e3a3832f9 SHA1 dbdee6752e106f4d70264484a1fea20d2adf2b6b SHA256 956f4c3591f281f1c8780baf52c42e82ad09e6fddaacb47385012896c88dc9b8
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_st.tar.gz 8202480 RMD160 ad20f72d2e1c252be75e4f7f473655352ec0b721 SHA1 5c3dcb5adf42c73c3242d7b50bbd128afbf85dd3 SHA256 53ada45e6cce3357aee687f379add3a8dcaca6bf3c6a2d181d7e2eaf0324c942
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sv.tar.gz 2013971 RMD160 d4ba3a768f511795458ca2558caa9aa23a75bb84 SHA1 a04daf0b5d465d8ecbf3c128793f1068d8f425ba SHA256 3306ae87b9f70a74361fa7cd35c483156f2b5170022343e3bcac74b4a02db34a
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_sw-TZ.tar.gz 8178555 RMD160 bade38f3cbb6e1d6cbea95dbea452c86850f5f90 SHA1 311204a3ca21dd8980f36913b3add853dcbda9c5 SHA256 ee9f4b4fd2d1b3f7d347d0b306f6675459abe3f8cf04f50dfd2acb8fd72b6cf3
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ta.tar.gz 8252423 RMD160 cac313916f96bf8bdfe79695bfacde048a1e99f1 SHA1 52513b58622bb52894d539094282d0756c5dd7db SHA256 2be80ce4729790e4608b8d99f66cdcd3c868848cc6988a1f3a072aa6336034f9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_te.tar.gz 8272547 RMD160 655bedc2a098776873764baf853b23e6ef91f59b SHA1 aa27e9dfed2cc58e49db838bafb6fd04e954ff94 SHA256 840ef490a4d823fbdbe0dea99746c7d36f8773209634f3835f9e360ffd8b069b
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_tg.tar.gz 8224337 RMD160 feb7b67411021670cfcee871c9273c68159ff7b0 SHA1 50e18d7734f54ffe710fad6302030b2c97457c19 SHA256 eefa89c915aa22c308659e3bfeec1af2e0002922a3c1bbea709c35dae4b14671
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_th.tar.gz 1899046 RMD160 de125b70557c4e51ebce6cd085d77494780c09ec SHA1 6fec58f0cb85c3ea161b1b29da3e9d03c14dda81 SHA256 6a3aa409f35cb489d4abd5a0ee1537ddd7926eb1a52ca915a1609f92963522d9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_tn.tar.gz 8187717 RMD160 d45e345562237f664e10168325b5ad9c586c3810 SHA1 2763557d0c6dc4a30ff2887b30d64b8adae2c38a SHA256 fe1b8a4b808a92be03941ba9cbba2ef31ff1eb6f6765b345c154c114ee0d8670
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_tr.tar.gz 8156686 RMD160 d4c461208595dbe52ad2fc56b52d7004c08b429a SHA1 1b51c86f4302bcb36e6ffc38ac07ea5a1b37f0ab SHA256 5f55b4ed3b4865dce0e4b0f096dd80dbfd6b577b89c8384155479aaa3bdc55cb
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ts.tar.gz 8204825 RMD160 199347b4e293ad067d994c64718921edab2a46d3 SHA1 97047c34267d5a5e6408611653480e09e1cf2373 SHA256 6bdd9ae0e814ab0611baf5b9079296ba8b6a2bdef1055976ce6395c29cc3775f
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ug.tar.gz 8225475 RMD160 dedab97e098d3c5011fa8c01c207c0fc772bfc43 SHA1 3788d20dbdf7f5edd86c9bdab50296aa99761498 SHA256 cd8e23530a90396d9c79d2d6c3ce49a8a0806bfc06ab2bde3880790c76edd11f
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_uk.tar.gz 2572985 RMD160 fc98ba53f45dd59c6baae366d334def31b0c1f82 SHA1 abef2a7955e2ea016f26d1f40943c5807982ed79 SHA256 aac2c9725a185971a4a638e92010dc662beb9e86364407c81cc71cbd0a2cce7e
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_uz.tar.gz 8190178 RMD160 e132e0bf2cfe232ef6785faa3868f740d7aba224 SHA1 e85b131d85fdecefe098e77b6432f7c5d25c947a SHA256 70a4e714c0cf91db839d0cf4737bd44bcf9120820237e25313f5b14e3379d767
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_ve.tar.gz 8209190 RMD160 25e42b612f013f3158ef832ba21e3cb0d7019a92 SHA1 a7b5c9f0b47dd29bf45df025cf82cdc91550a79c SHA256 71a70a321a0e1119e8ea8f850d362f9f2b54537a121383398f2a4f5fb6a2bd77
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_vi.tar.gz 1862371 RMD160 74c3f42e193582b9105da23e5a4cc952987cf516 SHA1 46a8fea92d6f5211b01731f494c5bf4581a23a7e SHA256 ecd18f64eca3d84d50b4eb6456d23be3a762cdae86b4006ec003965b338991cc
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_xh.tar.gz 8220178 RMD160 5d625cb1a949565b9e89b8a8b48384ad54ac6cdf SHA1 7a2903c14c75e5b706c7b92468b10d3cc4bec860 SHA256 66cab56309d65793db42a367b33d4c5ee7e21410fdc89d48f39a77d90b23ab78
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_zh-CN.tar.gz 1771267 RMD160 d6faa59aa6dfb6230fb27d019a2173e7c4a4648e SHA1 03690e6826088463b7721971bc4697956e84b2d4 SHA256 13909cf29c83c3934e3ae271172b4865dcc7bc8157c0ba273362f18ec5ba05e9
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_zh-TW.tar.gz 1765369 RMD160 fffc32fdeac320b6cdf9a8c966bb5a852afc7581 SHA1 32bcbc839cc7100491d297ff400ec7ae15c500dd SHA256 eebec36389c3cf88793c92fa1e940b23671891e6e9783f7e1a42e16780e1de69
-DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_zu.tar.gz 1720207 RMD160 3353fb3c51ea8591b61316d6e61a7a3efa6826c9 SHA1 f80c8b5a988efc97aa8a79a3277a459227b72382 SHA256 e42d02995ba31b7b369ef316f08d53e211a28e12ed62e53644d183f7f7bc2444
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_bg.tar.gz 11595384 RMD160 2cdadd61b09786aa9d722d196c8e16f47af435c4 SHA1 7ec6ac9aec8d9516e1de143463d9f832b85852e1 SHA256 632a487c9cb8bac5cd390a6821eb4976216c07cecf4d59dab73176ef8ec890d2
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_bn.tar.gz 11823361 RMD160 07bb242c34d886be2c787f0d4a4c7aeb6c9c63f5 SHA1 2d8a0ccd00ed1452e8a738d24bb64efdbc4d55e0 SHA256 871af10ac6ec98d4a2a6ba4ae343898a63172ecfa9482fbbb79ce0e8ab42ec81
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_bo.tar.gz 12478735 RMD160 a0c72e6345e726c8e6aed2bb97f312c832e594bc SHA1 90e3a3a28c0e6d3a1dc2b897c122011129f8439d SHA256 ce0952e5f788fb8bf96c536209d3fb76a7e47edc581685f10883a91e24ed3dd7
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_bs.tar.gz 10072977 RMD160 d99adcdf1ebd796e401ba505d3c9e3b512d3ac44 SHA1 11e3cc81bb2d3a5079eb655bea842c18698de35e SHA256 6892f8003d05d9e7d0848d7e715f20b7cb5f41d0006fc789341c90d0e5b29daf
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ca-XV.tar.gz 10934807 RMD160 aa792a571944c985297cfcf7596255a0f6e03e6a SHA1 f06758219b1389f58173b018230afe9c53b617b9 SHA256 d251c00664278a830f30e3d83d71bdec04ac43b2b402791acd565e090cd24f15
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ca.tar.gz 10927240 RMD160 3fa25d708a5fc46642dbd27ee6ac0945243d24ff SHA1 0913ef403698fc9e784a117afa9c85adb92bf246 SHA256 3779681eadd01273d4aba1984f010352d702b4d05156f2f7856b967de2146859
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_cs.tar.gz 10664910 RMD160 000ad9e4b6315f9f9ae638fc161714c48beaa9ae SHA1 801a2e29319a5a640e7398d3a148403d84e2b0a8 SHA256 302a72594f4373a55975f92163d31010b7b78fb93b9b1f4e6468173b412807c6
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_da.tar.gz 10526729 RMD160 96bc167606b6da820d1caa6f4373eaac97fba4f3 SHA1 a11fed6d1ced1055d27b42b2f9291dd7025077c2 SHA256 3e36e18aeeed6317e7ac0ae288b4c369e1a3d33f619504ff9c8cec11ee44a74a
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_de.tar.gz 11137204 RMD160 8bb3f2cf6db839ad11f3aaa526f283bed5b1eefa SHA1 0062068b49b386b33f017350462ff6679dc3f4ca SHA256 20f334f252e660b855ef7a75b0863d3eb4d8ae1c14f64bf57d9f1e811cf4eaf6
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_dz.tar.gz 13335917 RMD160 bf4ded9b3d2ecf38696730d8e5648dda04b6310c SHA1 5cf670b336f67e7f475cfcd15cbb44fb3862d186 SHA256 3ec7fc4be357fccde5354ca9d33b9028de4ff8feadadec8d7f3283be7d2fa5fa
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_el.tar.gz 12361970 RMD160 9f4e37485a979ab42805636aed9153a8f3db9c35 SHA1 0334c193a47f58e608f20160cfbb69a69210ef18 SHA256 d9386088eba8ff2d4f40dc03d1565a74b55dd39c2c651f959ac655ae88f7ee88
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_en-GB.tar.gz 9358327 RMD160 1075eb2d9b4dd21443f3e9c458c6a8c56c1b04cc SHA1 269bd46d64e1d0e350a56333d39ce639196d36fa SHA256 6c36c9fa45732e08cfd0aa3bb616319e1b5f83c5e57f33e5e4df6183ab1c1d65
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_en-US.tar.gz 9415752 RMD160 9b34193ab90df7f735d27c4a2ef7862ce2c3bb3b SHA1 8cecb11bbe424a37e7cb0ddac14de89bafe73677 SHA256 16b03e4e938a4ebd6c4e712d22ec8a5de772d2cc0245ad97095419618d7a5022
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_en-ZA.tar.gz 9343301 RMD160 2f669002aa17a6da414ece8298f53655255a3b06 SHA1 84036542221180bd7beb83f145763e41d172021f SHA256 74c0bf43de893e02ccf344dd2d37c2c3fceb06d4e60a2f7ac4a3e531baea75a2
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_eo.tar.gz 9769154 RMD160 1da3f61b20afdfa71f9bfe750a58967318f25065 SHA1 d3f97ddfaa266e020d889852b1b235f13eed098a SHA256 e475921f436ca80735d170c2899b691b22b5d74e485814c88686f049d1a07608
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_es.tar.gz 11025698 RMD160 beb33363827e7e6e7ef0b171290e32177019749e SHA1 cb5ef1109080202ce194bd09680b47f61dc2f4b9 SHA256 a59bb47a9fdb7bf4b37ed2b7e22e4ec37be908c4a941e7fe3d6b93bcfac3c239
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_et.tar.gz 10431941 RMD160 6d32bdc4b37f8d952b5c20e726d7c00a73ca7238 SHA1 2c83dcacecc4e21bbceefee412f29280bc371b65 SHA256 25ef4ebb8bc61f3bd601a3669c71edb5c556ad5d9d673b7ff053bb4ae26f085c
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_eu.tar.gz 10539626 RMD160 72d015df1f1e5067ffd4130ba678f61c015f68aa SHA1 ce09ab6634abc08ac37a887a0bf94a24a7f075fa SHA256 73bf6e3e9e21fd3eb20918bd631c0ada773200af636b95e02a144fc3a9794b62
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_fi.tar.gz 11193528 RMD160 a9359961acce2f555eb447f5006a1dced5d593d6 SHA1 a0cbdfc86f8a7afb7ddb184d4f65884330e5d1d1 SHA256 4d770bb9610eb3a9ac2af889bc4af65ba96ab5183376ac9be07dc7db57ffaddb
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_fr.tar.gz 11181672 RMD160 c3439b7daa135a0d93fa3cb0d5ee48f711364d38 SHA1 aabf54d7d4c1105cb327a88e0edaf14d63052b8b SHA256 8b2683528a0ad415dcbd45d1798e7aa4072cb2501028926d522c351f95f20c11
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_gl.tar.gz 10475158 RMD160 14f6ac110b849c7ac48863251ca6516f0ac29c7f SHA1 4a84bca175687042d509970d8817f174a2b954ce SHA256 94a9a807ddd562998ffcd244a90f7d701eec83c4ee716314969e3f3ce3999829
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_gu.tar.gz 9509841 RMD160 a64a5cab885673086799174e895abababd29c67f SHA1 47f416e7ed073296bddc950c68af52821129f88d SHA256 382f33def36fce70f7e2a27111532061f0b29808160c51a934112fd4c7b90cb3
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_he.tar.gz 9150636 RMD160 fcbc5a57f26300336b396fa62718a50679749cf8 SHA1 a79fd349542045d09cc6911bf4968e24c262ca1e SHA256 ef6070804948ad69bc7405c302459e05217c245a6cace1d9c61a40a2aa4b6052
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_hi.tar.gz 10169533 RMD160 3f68711a1f55c61e2ce7f0647d9c46e0fb9e0873 SHA1 e6221dccb91d14cf1dbb3fe66d07008343d5b73b SHA256 60bc66251af285496a3784445bf070a6c8394f30c0079fab6688ea0a1e3502db
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_hr.tar.gz 9726455 RMD160 d27fee80a3475b7b9a6033c49b9e53d73b6b511f SHA1 24545ab663e6faa28ddcf33ef3854d0999c185ba SHA256 8e0f93cfd21fce468c4c3448aca4fc4e3628beb55173ff72507312a3e2b9ca6b
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_hu.tar.gz 11079396 RMD160 0b3bb4c9b5453918b8d8acc2a7cc98b07eb2c436 SHA1 d17d5a9125cd0cd8c4340faf6b41ba10a47a2d7f SHA256 5afdf7d566083349c5febc0e62586beed4c560b9fc1c6ad9737d6b62d08fd6fd
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_id.tar.gz 9635991 RMD160 4b3e0a0b835182d2cf02e81e54f1c766d5389111 SHA1 c2a660753507fbef611c57d321c2bb7899afce88 SHA256 f0c8b7224b585ee2a3c548d3be80d20aea20ec413a9314efe2dbc46f366ae267
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_is.tar.gz 9819914 RMD160 cafb149c9eddfdf489caae5bac0201587924afc2 SHA1 4aca88b7ce11baa479128cfc7d5aa5993e5b3e65 SHA256 532ebac3d6fc419e0491e0506f4ed79ec131c37801df63c2602c28ee01ff1dc8
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_it.tar.gz 10918217 RMD160 5f3effb76add50e9538fce6b7dbc5b0e5ad74769 SHA1 e6e42e1acb66e4da361c8054ed31d3ff193a1387 SHA256 0d07284aa43983dce2d69ebdc06060b7cc8141e1534545fd2308377639d9f4e1
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ja.tar.gz 16893429 RMD160 30c67a8e94d72bd850ac0288a06fd6b4f7a1fb2e SHA1 e113d86cf35b87292c2846ed6cd7174670d8ba58 SHA256 b6ed6edbabe963048e160465ced7aaaf7e173f1cdd4ba1deacdee6b64a6c0e3c
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ka.tar.gz 10165364 RMD160 47e9d7eee2c2605587bd349f447b4e60bd5fd2ac SHA1 f1d4703cbd2f40d7e9dea6978d808f45d2fbc170 SHA256 054e466b1eba74aae94cf17031a32e65a60826850afa7d5edf07f04dcdeb7b6f
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_km.tar.gz 12214960 RMD160 ad0ec5827fd77ce4d7da5ab26ab137093c50fab9 SHA1 e55c2c411a5df438c9f3319accd6222e2a8bb3de SHA256 8f5a16348dc9c2c688029f3f1542dfe5f5d6f82f08d602bebb46c6c2a8af9235
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ko.tar.gz 10725750 RMD160 4c22d2574dbada8ddf98f37a07165f4229fb8eca SHA1 09739720c9d964aebec22daf23377f19d15aaf86 SHA256 89d6305ef26c9e6b05dbeed07119ea4d5d782fce83a92ef607118117f64fa171
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_mk.tar.gz 10440713 RMD160 9d70de60557b2f2ba70101aa9441245969c1bfea SHA1 ac444a956dfa9cf512f713ab75532dc9bd75ad90 SHA256 0a5ce5049c5a65c7e28715fcfb7a8ead19e6d68acdfa262863593ad0ec14a435
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_nb.tar.gz 10628918 RMD160 13ecc63b2bded0dbbc44222ee40d8539b3380cf1 SHA1 c45b21ddc9be7c95d6c7d33d1d3c1653ae8619ba SHA256 52bd6bdd8d2793469127ac7b9b2d46a5480e3becd23788e8e5fb2e1ed159a6a3
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ne.tar.gz 11803093 RMD160 57c9a821fe36564d13957e9de79430e880e0df76 SHA1 93dcd6fc8aabe303db50aba05ba5302f6fe9899d SHA256 9db5ec5547d46b2a47c5fd69fceadb861005ff061a6e9e6aa5defc7596f1ae2b
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_nl.tar.gz 10710544 RMD160 e0fb44feae9264f18ed4acb280854c9e70b93118 SHA1 a36dce18dcff812b90c714e27fa639f3cdd1436f SHA256 e0ba227119ab33870c8b51b710eac71a27bb7fe936db6ce7716bdae6eab0da47
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_nn.tar.gz 10215501 RMD160 59e690b2ae3342102fd742704a5cb491b55fea41 SHA1 93ffbb9a4a3bf65ddddba1c049083eb17fd9123c SHA256 7b029ce89262dcc997dc88fc6519d252449fab24f377e4a8fb63ba86c103109c
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_om.tar.gz 10956731 RMD160 46df4f37775f121494d99257e36c54dc79605f22 SHA1 f832760fe5a42eeb9c93b20b43dd10ea13a29d60 SHA256 a064777539a1968a1dea08d97a1ad99120a26c7d4d7c89b82ae8f127f1300564
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_pl.tar.gz 11050126 RMD160 4cd167d58e48ba670f05b49f5aff14cbc7c92d0c SHA1 a48885e32f01a8550becbd8786c82820f0d2465e SHA256 4eed470f94c326a2c52b9827b6fa00cb0a22d7277a6410905269f0daf785ef22
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_pt-BR.tar.gz 10766988 RMD160 b1e1b7eb80091dd7794c894b8cddf23ee1b14a6d SHA1 269460656a80830e75df4d958efc0637ebe5af54 SHA256 c0e83b167e45aa00413f3d7c7146d0e2a2ced2e42dd8cddada5fd4a95c09a2fc
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_pt.tar.gz 10795550 RMD160 af3ee39392b385c34ae14aef91933480e4845f34 SHA1 ecd307a669013a15a2d8a45d2cf1859254b85639 SHA256 c2e93caa6904daf0bf81ed0f03ac075234915d30e2ff95184ca8095fc1004acd
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ru.tar.gz 11722191 RMD160 aa04da9d85ad55b2d3ce4b671cc7c297368d3471 SHA1 50cbee52e6673e5f853f1b09db860870f5014347 SHA256 efebb7bd54e80210d1a60a092a9b3a1378b4226f604db6a0bf12c9fd27ba6dcf
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_si.tar.gz 10052906 RMD160 8f3ac94e9d0ad02651c33153804bdd9f92ea6a66 SHA1 4c68efa3de1b31fb38353b4d8def56022d8972f4 SHA256 fe289b1c9f449b4a75ca8a9992de3c7d1a6c97cd4799cbedeb3ceae211cecf04
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_sk.tar.gz 10503552 RMD160 c3cedf1e2ba905456464bd1da224bd34191b7762 SHA1 252f06e26fca8818e7aa7f2cd676fe80719db258 SHA256 1fe65d735218eb398e36e22348d6f616bd310e7d59fb39e2647fd41ceaec8bc5
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_sl.tar.gz 10688968 RMD160 de796b5a532aa40b89798cceddf2c00830c1da5e SHA1 bf26e72c611935241650fd8b7d224e4cd3785ec1 SHA256 c1e081b8fd4fc22a85a0e6ba3ce29860959e564418414b4880f89a309e01e774
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_sq.tar.gz 9832199 RMD160 245647e0a4af1adbabc9338a78a32df302b863e1 SHA1 5d31c8bbc035b89c21ebf0984883211f1062237e SHA256 b72840dae1b5bfb2c8b32dcc1ca96b68525f95d2734f3f81fd69b7329b26f195
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_sv.tar.gz 10637200 RMD160 6acd7bc52f8ca315f9f28c54ed6313563e3ef492 SHA1 d3e0cfc940545b8298072de8f0c9de5f73caded6 SHA256 f718f3a3d0675e27953c8e7e2c1b434c624e78ab80d11eabfd8949430cd83128
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_tg.tar.gz 10207033 RMD160 ed55f8aca785ea90ce01377660bdcd667819df55 SHA1 deb322db2f29722131896590e0c4314847ca9e85 SHA256 0f616dbcc2177b7fc96db9d1d18ff6fb85afcba8733036db9816dba813fa9730
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_tr.tar.gz 10259209 RMD160 abd98d1423d1db3bd56132530cf0e539f8481744 SHA1 3bb1b392e4f3d44eb81f4b54fc8cfe6026e0b7a5 SHA256 56501037d1cdafdd2e0315e4b419d647982bdb4eef7e02754ad0beffbfde3ea3
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_ug.tar.gz 9805528 RMD160 86114f8b4cc608d6081210a0b4e2b3c96ed93968 SHA1 52e7df06b5d6c625e5f75273fd8cc360a3a3a262 SHA256 6f37a10b6db130836475da51934ae5067b37dafd88b0197e44c46b4bdb45372c
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_uk.tar.gz 9637462 RMD160 673c4251c734758e560c3b8e5b895e8be4916380 SHA1 ebc61dd48a05afce840a75bc8242b827e53bd7a5 SHA256 8f8d17b4a01c5f2451dd0a57d6e384f0a143bd722c77b16a8b09546644c70c5b
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_vi.tar.gz 11306832 RMD160 002934f7b807a968777650e3fe8ed7af0d962735 SHA1 d7c10d6dfff337f5869d5b3cb8f0dc33bde198c2 SHA256 ca5a037301f5a6e7b3cd67c1db4e96ac502bea2c9605b54d2b17ace6fbe35347
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_zh-CN.tar.gz 11897089 RMD160 51bb888cf51ba88be3fac44a8a81ba29f7767ced SHA1 b67e475419a417da67af632ee2aa2bc8692de913 SHA256 1987f744c0e6ffafe236e89351784d2b76cdd23d7cb03481f70d7d931f8c094e
+DIST LibO_3.4.4_Linux_x86_helppack-rpm_zh-TW.tar.gz 12130973 RMD160 ce0a4af04d2c9ce0f985dad0dd7b52735c288de6 SHA1 a2188faa07272ca67f3a81dbf99e7e745b272deb SHA256 cb20946421d75eccea9c57f1ffac0bfc079c08ad01eef7c789ed62f3485e311a
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_af.tar.gz 2313872 RMD160 c8f8564a93bc4e7450a532570dcf9a1f32a6b47f SHA1 74df44a7440242e83bdc671f038c604535e4affd SHA256 c0e3dc99ee3dfcc1002abfebfea8afc886d678d098ebcf8301ef61a87e06dbf6
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ar.tar.gz 1723001 RMD160 f1a8ee8b15676750d8920659484fb8d881e53ccc SHA1 014bdeb7072419abda275d83b2ce8ac41f224fd6 SHA256 83f237f7ac87a2ba23c33fd74b44b01cc319887938b12950158715982cdb9070
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_as.tar.gz 8246989 RMD160 3d7457fb8e2f6d4072019e34f74511da869fd367 SHA1 783db0f584f31ef85cfa7f756cd80614573baaeb SHA256 7545fa7d80944853d9da54df78e59682ac4f0a4b452ba19f3aafb037355ba2b7
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ast.tar.gz 8197621 RMD160 361491a19c078687dc66a1beeef6fdf235b68746 SHA1 9684c8b7013b471872a529b85fcb68d5af21fb2f SHA256 059a8197757ff3356ae3f80002e26f455cbf640b3eaa3179bf87071a89322038
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_be.tar.gz 8236118 RMD160 49fef8b2b2025d0eb9606ccb4ff427372414e9e2 SHA1 0c8cfe0fdd637a7a05361c3ecb0036163f3f8cf4 SHA256 44466198503149ecd1a6edbb66312efef709658b1f875c36ff129b601847e21d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_bg.tar.gz 8291573 RMD160 7ee60ec3b13a93bdc1a17ca52dc2530d5cc88104 SHA1 57cefdae977aa54f37f925c27722791ecbf61783 SHA256 b03f4dd030518e1841a6cbd578a4e1a62b89544828a662d0eda53c2985ee7d51
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_bn.tar.gz 8249809 RMD160 c234b13a59b23440254e9edd736fb0c1d4c37ccf SHA1 901983fc90f92104d94dc4e995e0801136883de7 SHA256 8936984b022bbe57f7ffecadd79d6f80a61986b44c0faf265ed954ea091861b9
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_bo.tar.gz 8264548 RMD160 7403484e0c01212137d70dd25c317f007ed24bb7 SHA1 12cef676ab3a1ae225ad781dec38dba8d0457be2 SHA256 f5c9bf3bfad586f2dfd56e880a82f2c8e7036e96a0614df075a213ecfb95b17d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_br.tar.gz 8191625 RMD160 574f7fbee7e6c2fe06c155ca49fdb42de57d0651 SHA1 e952634c98638be2d343ef2585329e501ba81755 SHA256 743426246f7e47866adfcedbfa5549c64236f811cf90e789bc5ac9e264f00392
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_brx.tar.gz 8229613 RMD160 f7b523a7f32bb5435770416a38addfe2d357ed9d SHA1 e7367bf2be487375f153c89581e993c8685a4373 SHA256 8bbd4d6299db6e80fadb239e273c10b600faf4e0e69f5a5a37b92840e585dbc6
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_bs.tar.gz 8192904 RMD160 f3eb2853de37715143f9a48378d9a1e71572b565 SHA1 e99e7962523fd028790d481570509431f54f21d6 SHA256 c4f70443ae467d63a0f80a9bf8e3e64a2b6f758e692d72129da8adbd44641b2b
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ca-XV.tar.gz 8194421 RMD160 1fd630ce9cf5a0044d4db6e11b8b5981d45493b0 SHA1 024d9d4247ead2ff5619ecb7d6c27f265e120ea9 SHA256 538f033d075ae7513a47c7c479c9a62964c893ba26e226cce1aa3a061418b060
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ca.tar.gz 2348392 RMD160 b9924bc0f9375509119b650546e79460908a9cf9 SHA1 aa95f71b569a8a3e185b5e8478b8dc194c661c4b SHA256 28327e5016debf36c3ca997c5cfc4c29f589cef8e5a4d7ba4e09207b73d4a6bb
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_cs.tar.gz 2006952 RMD160 3837e6472ea8c59a097a6284d7aff13d2b3c3dce SHA1 2a81ab2a07eb000bdc15ee1cfb17adfc0c179766 SHA256 409f17ce3e2c018b91e4cbb209b21755dbd96bb026a7c0365ebb9370bd022384
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_cy.tar.gz 8174786 RMD160 2b95f26ec2358570d35fb7cb34f9e78ecdd4ffcf SHA1 24d011823a43188f09d20c14552c2084ec5de55f SHA256 d828bcd0b4f874555b009d06e62d2d4c668347a371ac60f7e7f2076edbc02da9
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_da.tar.gz 3366393 RMD160 fc97270eb9da8138793b8d9690faca6c9ff946d5 SHA1 cfa440e5e68227fb0d63dad0412d19da2b85850f SHA256 fa360c8535177ca62595d7bc66bcba87c87b3d6e3213bac0d1e528d56c0d65b0
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_de.tar.gz 5568582 RMD160 eb6528cce1eb45523d52a7e96cf1e7e96e264601 SHA1 240d9cb07f0ae7f7173e052abde908972cf5cd11 SHA256 e30649e4dbe7b43589db51d6af9f71f69f85f8f67bd36612a1338ddc4180258c
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_dgo.tar.gz 8238691 RMD160 ca56a2199016b8a9cf6f147c10f49db7d95139ec SHA1 406c5c05ae397931a980c99dfee681c5e9cfcc7c SHA256 8061a5e92a852b60619fb2c9a58e3f7909b60e7b6f352ba59146c0f74562a9b4
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_dz.tar.gz 8273955 RMD160 38fdcff63ba0a66494942c452ceb3621673fd18d SHA1 272f4fab98229e01e71bb096150e965f56154454 SHA256 a426ae67e96345f24346c8cf527664d4d0b2181c3278eb5c8f8252a6a29dbe6d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_el.tar.gz 8273508 RMD160 00b53ca2069cebc21ef3a793653aa0c239d4e403 SHA1 2133b37a9d3efaba844da80871cfe9b47adb2eb2 SHA256 aeb7a04f3fffd78f7194c9c2d710b864a53522006ec3be63e20b443e3ee445c5
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_en-GB.tar.gz 8245297 RMD160 d2ea273d8171e46f99df7cd06e4c6a0e3717c045 SHA1 62730bc2518793ae88598df281007b147eebdbf2 SHA256 6a8b1b29d8e86e0c230cb11e03d2b80a238a8398e264176b63c6a19664faf3bf
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_en-ZA.tar.gz 8160612 RMD160 16c369d1436fc8c410856e2f2549500b78eafc9f SHA1 466793d5b6c21a2fc16aca1323b1ba56355518d7 SHA256 9919abf5930ade0331e24aaa754060a55130f9accd141d490dab10c830ee7edd
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_eo.tar.gz 8175796 RMD160 b8c7e67b14f3f3fba5d2d5a5a581038ced54c1d8 SHA1 031966bc4eb3488f48e3dede61ee3f7188740b5a SHA256 308b69f0b25462e720c778e1b79bb0d226a5e010d3f011b9242e97bdeaca2ac0
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_es.tar.gz 1984164 RMD160 ac57253a741ab744880a9a62a01826a994852bc0 SHA1 5dfb71114b2563cfbaa189a38df06e8e4bdb9f0f SHA256 b0ba0dcbdcc4512407ecdecfb5803aad4f79132071f1a3b7bf8a3f80320fcd01
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_et.tar.gz 2590266 RMD160 0208c250b7580081b64e61f9afcf425e1f35b968 SHA1 f9558d7ff4595c97c4bdd2fc3c1d4c63fc52fcc9 SHA256 8d94511a47061444762799be2050db774c92acd81fff0a999ed8e0d04824b1d4
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_eu.tar.gz 8374710 RMD160 413142fb15d970e170ee1d58d4cfc633fe1130c3 SHA1 65763e2eca49ae975323edb25426ed1fcff27965 SHA256 6ed3335254ea770c07c814ff206030ef9badf518180b518d77503fe7bb1e4dbe
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_fa.tar.gz 8216072 RMD160 6b828fb28427f568d49fc64c3e4c9731b19833cb SHA1 ad5d0bb111cb4244b78a1284678e693d2011963c SHA256 e179c11b1a40fcdc1edf1381aac59c4f8d77378fe7e0d9c6fd7ba27f34d2b750
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_fi.tar.gz 8187261 RMD160 7edabe6306b5eac967c888132eed7aac41c3e02a SHA1 566dcf82ed0dee00f7a79a0acdfa93d40cfda20a SHA256 d67006496ea821b84fecbb8da56546000e4a18bc26a480b7a376518ff5ef6490
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_fr.tar.gz 3881098 RMD160 c4c88bbcc0f49d5dd35a9648a29ce24cced1702a SHA1 afca80343ef05513e880a1746b58e1a01924c75f SHA256 1b4a300e769f04d068e119dcb2b79ce9929bdce62c052a09850c955b78b403f9
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ga.tar.gz 8198325 RMD160 92016223f8018fd228fb61eefb6fe7225854e93f SHA1 139f02f12507e5d9f6f0a8ff581725337008c549 SHA256 e097ef03ec0cb37dd5c5ec8a018a1b18f03b525e116ea315377140117483a9c5
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_gd.tar.gz 8203772 RMD160 054f0fc5cde39e91eb1b0edd5e5d434e76ff4268 SHA1 eb7ab366c2ddd52601384e731e041ef458dbd588 SHA256 efdcf3e8cb0aa4d188bfe06ae12494937d6b1e2aa26ae905f35fc3102e2ee5b7
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_gl.tar.gz 1916977 RMD160 f5c333752a502dd84e38e5ebc9bbb7b5df0c6a52 SHA1 7ffed129b510dc30edd241e825a0c19cbd005195 SHA256 7b22b0c1800a8762ec610b493f7832a553b4f5ece963bed466f28cd1882992e1
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_gu.tar.gz 8254107 RMD160 d7df79851cb53eba0ffe5f753ecb08c26d324d8b SHA1 f23e30c99d2ff2ab348cfcc003dfe2e58d3c3e5b SHA256 a38e7afda4cecaddfd9729ce224685259798febb62376ab79cbe8892434fa32e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_he.tar.gz 2533168 RMD160 765e87e4b135342cb740f78f230def46e3b5a59a SHA1 449b33a39239532cf96853d95b7ddf7905ca212b SHA256 6a793f671dc5a632be4b4270cace7b7939e3be396abbe84ae22b67dcc9c84900
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_hi.tar.gz 8246537 RMD160 aa1ef664101270dc7f69a58ac4cc0f46452f5232 SHA1 3b25a9f55881710e5d6f975696f5efaa64019fb4 SHA256 346b7b01e45e3ced6c9ef31ac981217a457f50fd3272a0b9f2115bd901323032
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_hr.tar.gz 2454056 RMD160 57719a12ff86ceb122e7a5010fae7a8effa7357b SHA1 adb18cbfe55ca5af46118fe0ba76c1a6c0ac2205 SHA256 bf553cc110447aacbbe18fd0db00fbd2866031638225fbecfdba729c788b6e6b
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_hu.tar.gz 3828725 RMD160 330adc1cb9743c95b4b3cc5d527d3d5ecf7cb26c SHA1 4444e3852b931821137ab8bc07199ba50ce485e5 SHA256 68adb40c2f4939b92980fd2b33a2e8d4dd6b8108962fa0f3f8fdb0443ff810c4
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_id.tar.gz 8171070 RMD160 0acd003a145f3469d32d9f5df43b5fa7a377a031 SHA1 86e974c98432d2cf129d5ef34afc9dc161b9f732 SHA256 27a1123db8025dcbba6f826fbf447d991eb064151e93361d5addbd63195c12a4
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_is.tar.gz 8192743 RMD160 3b98fdbfa4567fac52b621d63e7792b1147836ac SHA1 483de4b4efc5d6fd117b964ec65e6318307fc45f SHA256 02fa932440b3135e81157bde27d91051805b2861e65991079bdf8cb5a316e9c2
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_it.tar.gz 2934807 RMD160 0d8174b718cc9b90f709d32f247ff8b78c7ed381 SHA1 252117a4c235b117dd3f1323a2d964d1b579b8a0 SHA256 95ff02437bc34f1d960b131c7d4fab0842a35f980046c6469b44b8231039fccd
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ja.tar.gz 1815600 RMD160 81e0ff3f9b744cf431619af4c3cb59aa7631d868 SHA1 e8412624a97e28d8044850a504aabd39207496fd SHA256 8d66e41fc4b02e5315d83d3e07dcfd2efe6bc4e9d576a734e3c03c492a4b25bf
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ka.tar.gz 8237892 RMD160 5261094d6c3622e18dd8a1f1b2ddd844f1aabbbd SHA1 a0cce5eb487e92d936139df2e182133654f65edc SHA256 5edea3b0dcd12779e8f90424a681222e60be9441ff1b12602c8d3ffc7ea0946d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_kk.tar.gz 8235812 RMD160 12b755063c05c18cb76cf9c83f67bea4adc532e0 SHA1 3faca79099597ed8426cfa1ae1e0d94f8c228efa SHA256 2a6dcd101972679bf1461befb654de28ba874b0a8d4653abecd8702dd5834d1f
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_km.tar.gz 8425014 RMD160 1266452d122389683221692070538e1832e8b041 SHA1 074f658b48a52c641700182be4c0eeb8fe275fea SHA256 22fccec0111d5c3f3d7a7346346d55d5cf2deae4888fbbae79f3be11135f064e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_kn.tar.gz 8263600 RMD160 1f3de5c98e4a0fdb4fe4533151ae3994aa10dccd SHA1 b9642b200ade7c59a123b166a5f095d5f98111e6 SHA256 c063f78cb8211ac6916630a3f6dab500c7b142ebc1b3db61136cdf75df2276cc
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ko.tar.gz 1681518 RMD160 71d5ccaebe8e0d8f9d0246269f1c0fb4ef64d388 SHA1 bddff0cd20efb11735fad24ea2f76d3b1ba16bfe SHA256 39b47d18905429fb123499bdb3022421f0936e91acdbd27c0f4e9b1f3207030f
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_kok.tar.gz 8228850 RMD160 b84f81f72c071662122e9c0bf15c74a216e27fb2 SHA1 787d89e940ad112ed3cb31c0d9fa9ccacda0fe19 SHA256 ddc5d8b5d855bfd92ea5869d10cd6b43ee4db0dca05a3655a3d84ceca085058f
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ks.tar.gz 8234542 RMD160 ae6351fd08d07e7ec56869925232a3b30f933a66 SHA1 7398f0fd03996ae3fd45f2d9097895f0f2289616 SHA256 233bd779d05c800892a2e83c6e4cd9038f9875b634a1950651c481c55f397e4e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ku.tar.gz 1768110 RMD160 b3cb43a6ebfe48bce2e972fd53baed2ac3f62d35 SHA1 822ecbe8537ba75ac5357a2c724ce917feb39d7c SHA256 6711199773ccf549aaf9b402ddeac2cd2c996090306661d501b2d8a0d700f26a
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_lo.tar.gz 8223154 RMD160 33f668f4393432b157802aa46796674eee6d5acf SHA1 5925e605ec6df485ac833fc4ec3ad68925f1bacb SHA256 8d27d6fd23a6e839ae71f094493b971ef793e0b921341949f1adaafdaa1e728d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_lt.tar.gz 2075750 RMD160 f223eb7a9f7700d87939cdd54b6c4affa2be058c SHA1 b4a51202bb394030c0b233d0db8bdf0ad65f46d7 SHA256 b5413e2ef5397085a31e99ccda8749be4acb08c084e21345a88fa04d0889ac79
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_lv.tar.gz 8192731 RMD160 1f5a305a4df7475d8478a2a0884f40ef00ba8cd4 SHA1 2b31e4963f44bacfa7d9b92fe953688f2d29fe27 SHA256 72caaa3260d0a1531139982623de6276350241f1127196c57968face5b7cddf5
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_mai.tar.gz 8239978 RMD160 82ded0d22d9e0e985b642dc0d12e79639745dacc SHA1 f8af941567ef03b492f4d065209302477905ca65 SHA256 b942b074ab6df957dcb481456ef8af1391e4ac4269350d2a1ca760a90710bd52
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_mk.tar.gz 8238483 RMD160 f2eebbdccacc49a9f2ae927b64632f9de45d3018 SHA1 7cf72a0460a290af01f7d19b2f5aaeac7717d11b SHA256 460d4d8bcc7acb40e9702133db954af6cdd8080e5b38bf3578d4267b76907821
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ml.tar.gz 8264675 RMD160 6e1d7e9dc8525c26124b2b46d96c5ecd335430b1 SHA1 2d9e2c14f8c717acc20ceba74cd16fedc2e5ba1f SHA256 be9a073bf37c4230bda8e11b4a9e6cf6ceb1e4ed1140400566eda7a87f029ba1
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_mn.tar.gz 8241276 RMD160 92bcb78095d2ca354e2b8fa0ac2aa061f9e0039d SHA1 9ccd665d1f37d9766b2fa367ab75d73a9a511e36 SHA256 16bca25c11a2f332c97d691275fcf23c74b65c54ca44c1c06699556767ea8333
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_mni.tar.gz 8234642 RMD160 3e6b00247b7b08c08c1d55a81ef3e15bbb56cf4a SHA1 8faf88a66282cbae60b7d058fcc6ada9b476e4b3 SHA256 499bc889fc9d3aecbf93153eaec7c640308c0727e7957632917667dcd3a3948d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_mr.tar.gz 8256191 RMD160 5b8a92e912db46519d9842d4e7deb0aa3176e7a1 SHA1 8589efc63a06200cd39fbf09bf5be1d121c2bccd SHA256 638a154909e4b54c8728be7f752c6780749652f230d50253cb9b80352d9881da
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_my.tar.gz 8277925 RMD160 010033337b1b3d89649fd999341c0779b29ad3b1 SHA1 08ca5f0e85b58700e11d2a9500a5b219269b33ba SHA256 1497223a1d0c0cb8b8dd2d293c76157e10733874e3e281a8f24e803cb4c051df
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_nb.tar.gz 4898305 RMD160 6f4b59ebee914ea58a2ac62b4f3daa0b871ec44a SHA1 dbe98f7ad9d61f9f2cd116e9d0f2d7a6b503fed1 SHA256 aa7ffff137fa8b00e61826a1d74bbb5503f6280917094e688d7a617baa5a5533
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ne.tar.gz 2137002 RMD160 28e5ab9a2c8095306e35f68efbdd7603774284d4 SHA1 72f3d14e76ffd3a47dd2299807383fc309e4ef8c SHA256 ee6641731a96399e9d567255c9baf8b5c1f466b75cde164651fb2b780ad4b8a8
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_nl.tar.gz 2427380 RMD160 9f101114a1fd9cae4416269f5c4a673f0c556130 SHA1 68e92decb4f4c9c6889e82e4aaf36b0ef154e42a SHA256 b653b6b6e7ee6b70a6711e1bcf0af8170751925a0f171aabc58b525d2d956e37
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_nn.tar.gz 4899080 RMD160 3c6bb75aaa1614eab0c70e2ecd9ce819f5baeb0a SHA1 a881e1fc74d277079df3d5dfd3ac015db3d8520e SHA256 1c4f9d96388eed50dd8e24ca58f33dc595a8284bc0071b95b6b6982a0e6b8c3f
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_nr.tar.gz 8208043 RMD160 61d0ce00f22ece8da5c62af0f5c047657d86a822 SHA1 2b2be3ba5373ffd439c8d2f2f5a415d8697f5099 SHA256 a138e3010bce58425c5695788fcfbe27906cf891239797fc58b5f144de2af8cc
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_nso.tar.gz 8199497 RMD160 c41ab38e1510cd575a0eacaf5e06edb9f3c60f31 SHA1 06e5c6cbf2b8be61fffdf02a1469d088bb040377 SHA256 15aabb2bdefae57caa8e96b0008300130210d29b3c083b6236bd2cfa7b199c2e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_oc.tar.gz 1895490 RMD160 23f285597c9ede189138b555f6f0b5cc06090b19 SHA1 d5011339b16172bd0eef17c11065a61a8190efd6 SHA256 b2bd9c5a42e77f28b7a17fdd37bc5a96abc49778a7f2c200c73a7cbb858610a9
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_om.tar.gz 8181253 RMD160 3ede7643074f1ca4f30224c8c6773906c9486ade SHA1 5d790bc66c6a57ae14949bf70123f3b1952b23fa SHA256 bdbd2047bd6437651fdefd8f729a463e9b88ff3a9952c1be7cd98839fa443709
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_or.tar.gz 8249770 RMD160 d326b1b73d28dcb4b9b5a804358cd2259eced1c7 SHA1 fd87ad783956a7d070401010c97cb71ff214eb4c SHA256 1acda1dbea6cd615c3e92c39579fd2f5726ce2165e43594aeb016fcb26f83d13
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_pa-IN.tar.gz 8231582 RMD160 3df6b1af0a7871bf246324db593980db73936160 SHA1 622bb58cb04e0815ca833dadbc541c5eeabd26fb SHA256 14844f5c464ae002df102c8b3ca33612e959ef9fbaee1be3467cf0e5f55ae118
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_pl.tar.gz 4412611 RMD160 5e1b201d1fbb3ec41fe3a76aff077b41c7895923 SHA1 bcfcbe6c5c51706940b7db6d5c815c3a59db5c2f SHA256 a1e676854face1344a334a111bc38fe485f92edaf3e3cf1396733bd1093c2133
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_pt-BR.tar.gz 3003798 RMD160 930741c2def08e2039bf70408bdd04ebe8458469 SHA1 046df42caf7b318eddbc59fb6309db1e9c79899a SHA256 6d4ed6ca0b4000f0fe8bfc4e70b79f04f4f22a577d1e09bf06b8bdab4f2a894d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_pt.tar.gz 3061058 RMD160 a430230c8d8ae5fdd21efdd2c1dcf3d827ada96a SHA1 896f9a69761efc51afbd74d56de407455abb0c4d SHA256 96afb00f03d5d870a28b5054b5ee168419e0bee9670d91c004432cb8317ddf2b
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ro.tar.gz 3486092 RMD160 1f1da66a70c04a67b5935ca867f65b60f8c7712f SHA1 e062df135cd0c03441283eb35278405515ea7a84 SHA256 d82adf0f22b25986d0e31eaecdf92c6280e9cc221acfe8a0eb84742b1a43f310
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ru.tar.gz 2796784 RMD160 a6ea698a01b60aaf7cd1d2eaefb155445bd8c31c SHA1 fc9f98df70a556515e9529e5d2d94495b53966ab SHA256 ae2c7798784d33a9d20b32f5a7943794b1211de116ab0e5d6589b47da8ad4857
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_rw.tar.gz 8189232 RMD160 f9ce777e3222829fd1a78c1bf63f56d923ba9a03 SHA1 3499d46c924e6441c5f73ddfec226266d03d8ab1 SHA256 83d6ba9ca6bcce401f8d4e96c9e55ee9269db2672b264a4ece082df76d0f96d6
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sa-IN.tar.gz 8239790 RMD160 f318716bb757e4b29ef283ec0c07ef5704021c9c SHA1 5997214f7ea43928d74cf4ef3ff878525490113d SHA256 39582c576679fe26af431e804b293ef81e88adb5f04940e8800cf73c36e11c0d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sat.tar.gz 8232634 RMD160 e8dd6ebb9942a5f449fa03f4bda23b202871e390 SHA1 5e30a50e400ab290c82d3737bbe6be7e4a387fd5 SHA256 e5136e8febbc1988d8fc73027e04030eb07030d1cef52433ee07fcea01d404ac
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sd.tar.gz 8223669 RMD160 94d0d85260163504c200825340f667256bad6a68 SHA1 e9be0ea46509b20d0fade50a82ec89a6f7686146 SHA256 27113fbbac803d28bfe7fa3379a2b0f4c0274710729135fce4146be24e9d3212
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sh.tar.gz 2883318 RMD160 7b6475d1bce9bfdfeddacaf15f3f09e87a119061 SHA1 7a5c98664cca3c4b41771c9ceed062856c6389f8 SHA256 4de2af64cfc33d515dc3a90ab15460b9d82ba3a353d31d422744e7783e8c3f46
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_si.tar.gz 8247242 RMD160 546a0b74cad976356ba14722c8b0d2a2c3e860f5 SHA1 a817a6742e8a472c2d9847564c075e27fb5c9876 SHA256 82dd38d63f4b098cc5c6a3b80ee10687f8ad25c3b50b4f6848fd9667da41afb3
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sk.tar.gz 3073058 RMD160 206bbaf1976e7eb24d05dfd37ab1d8a0e6060338 SHA1 d2aa9aec5a15ad615f3df4fff13c55703ff8c1c4 SHA256 3c4327e988cddbe3a21c9b03469fdc6aad1b7e13d8650c2e3dec3b101403189c
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sl.tar.gz 3228315 RMD160 6546c38434a5a542fccc2e02b9c68d61bd6bca26 SHA1 36a25ea24b666496ef3aaa635a9a3c4d37128145 SHA256 69f2a35fd7623b3a2df4e7365b71c7ee368760a21b7bceecd1182d6744340514
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sq.tar.gz 8198112 RMD160 650505761bf08179a65604123cd0a85b4998277f SHA1 2f5b3220aff82eb883983583cb9b17fdfb073b96 SHA256 196368215cd2f84873b7146018513ea10018e89d94d58ffcddeff4bf5e901ded
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sr.tar.gz 2930263 RMD160 e8d07f9879031ee5da161ad4fc342b2346934e30 SHA1 e21c62d7ca2d73c371c3b399ac84b5b728d11024 SHA256 a3b479e860d50810e4fe200a0d4dcc950ac32e13839719252f8cdca515d83ec1
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ss.tar.gz 8203955 RMD160 3c3e60235a4147059ddcd193fc92adbc78a0b276 SHA1 c72668cd60de309f0a715a57523c14704be67745 SHA256 e805b7f2143da41412e3f4832dbbef9fcf7d4e360a0cc6c321c5df139cf95678
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_st.tar.gz 8203288 RMD160 59a37fd32667dd6b822217548e9c26c61aa7bffd SHA1 880be57a26768057bbf22360508aff0038924c84 SHA256 1cf7d5ff5b33e4114c5c65e9b49d406c35b8fd1d51cc0b065e107da233f1bfcc
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sv.tar.gz 2005428 RMD160 d6f39b4dba0bf530437ebfee41850f6f0b38bd8b SHA1 d7083cf166c7f0336dcb6bf5b798fb7822a522a3 SHA256 315ca9b80fd707ad6e2021450e87c32d42a4c886d67c5fe9fb1a0ea7a7d365a3
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_sw-TZ.tar.gz 8180034 RMD160 3950e28777acf1331761af564963f2ed5c26c909 SHA1 ec98736231c748b28279864d779868035423af53 SHA256 323ff2d4f6901b6a846ad38e1ea24a3c2e9a67d386cd85a574d183694239786d
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ta.tar.gz 8250844 RMD160 4bac96023d504c06c8de57bc4771f30ab3da8ee8 SHA1 ae609a411784ede0197358d92a9a42a661199f5d SHA256 e84618e7ed6b2765086e1eb1633f2496464e945a40fd7a5547ec40a57fadcfa2
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_te.tar.gz 8271722 RMD160 517720ac4d1a29f11acd1fe3292ba19d0f39b774 SHA1 7459cfb6d9c8573952e3582f1893f135bf8e5786 SHA256 fac02405ffb508ed22a244b96667172b579a781bb4e408959da468127c107c80
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_tg.tar.gz 8225334 RMD160 b4b79f1c353ea8edb57b79c00c603c6845bb7b69 SHA1 8613fd8c1b773d1ed7015242a476f6a6832b6975 SHA256 466ed6d4cdf968024edd153a5466514df452b5812a7854d751ee8c7cc6da45f9
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_th.tar.gz 1898985 RMD160 c0f2dca088386a54c1146f6456bf7e3629a54c52 SHA1 5dbf49c409def91d8a48cbf10be052ec2ea9af7a SHA256 7cce09735b02c02686d6b9681c6a92cdc008b48b7568bf3274e0195c16353a0c
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_tn.tar.gz 8187757 RMD160 56699b61e956c179969223c2f3c07e04f1b09018 SHA1 d0b543fc77bee2ccf734d6f048cbec5501841c57 SHA256 562e424e6fc0d71c0bd13defc2eebc576f805080ab9eee2e5fe0b4fa5f0512f7
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_tr.tar.gz 8157485 RMD160 0316368368502d01242f9ef230da4bcd04c24059 SHA1 c9ae7e4a93b296426efaa8d556c87ee90e72c81f SHA256 882ba06ff504a5445b6eb16e3ce3a4578f79fd2024741fc4fc5f18ae251d7514
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ts.tar.gz 8205597 RMD160 76b548999fa180542afa6f885e0f61b5a0908192 SHA1 8611cd5b728dea20d19ada995f14e0ba8151b45d SHA256 4e9cf797f50f7d79b07b4284097b949ed093c1f65ea091b1ea4fb1d0a248ae30
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ug.tar.gz 8227414 RMD160 e157657ee3dfc0334382386b3d80670562858116 SHA1 3e42868dc291db83c254de3ec2fd4c5e8e5b8354 SHA256 c1021e521b84a3f5bab1b8dc307743c25fcf6fe3d97567768643486f5b15b06e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_uk.tar.gz 2573874 RMD160 e3b3ebbca286f69fd506ab8edc4a7e1d51d2e597 SHA1 c74eb7d6c5bf37ab0fad4154795012b23e2229e2 SHA256 e0b1b43e2f0bf6d847c28e7ed914b189d3d26f5ed43065786fe08c1970a05328
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_uz.tar.gz 8189824 RMD160 75b166c134b182c0c50f545b617de3872faca408 SHA1 b00400a1bf05b72041783a65e42cadbd84af912f SHA256 b178ecec0ac3a89a915326ba5bdf350ea64eebf9ab6fe48c9e63d69b19c83576
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_ve.tar.gz 8208236 RMD160 35e13cc1f36eb08ffba3cf7fff7e215690a19cf1 SHA1 f53d0fbb5b94eaf07183a45a42fcc76719d0dda3 SHA256 3b6916def4f6ec94fe3041022c9ee99cc81f9433af3f7da2a075dba6c8abfa7c
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_vi.tar.gz 1862406 RMD160 ae6423767d08a47ac832ace4075f2638ee81e674 SHA1 23b3e1b256174bf08d34a0012b27a2fb3cb3e142 SHA256 9f69d1a3858eb99b22cdc73c306dea18376e934c6df775157e0866b63e66f124
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_xh.tar.gz 8219611 RMD160 45da2fbec44ef3da6cf0cabec3e68e03b04e284b SHA1 56cba0f28264a9163ca623824e7ad1fb527bfe95 SHA256 be103843e2afc84939306afedc0195c98fe0c01f45e646430c5eaa18c55e689e
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_zh-CN.tar.gz 1771941 RMD160 4d85f797082699c5400b1e10ec456bf199054685 SHA1 4ffeb438ffc9e3c396d6a2b8c8d5262733722717 SHA256 88af9f0a05aa084f862e22b5c822570a555c7dd2ba4f583dc7e425786543fa73
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764315 RMD160 37769d9a4ea8a8989ecbb695c017acd3f03377c3 SHA1 eedf6fd5d6357de27bdcaf7f219a61fe08f69f67 SHA256 65754fc700bda00948888975b40b80bca153e5f2e9cb95648032ee43896a0ce4
+DIST LibO_3.4.4_Linux_x86_langpack-rpm_zu.tar.gz 1720450 RMD160 34c4ca3e6d1fae78376f3852e6115dc58bb3619d SHA1 a5c54cb2abce21de7f36e351bd0a69a804385f51 SHA256 7fbbf76f8a7c9d3ae9afc85e481ca3459d357b51d1cd05749e0d85729c5ace62
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_bg.tar.gz 11559965 RMD160 4397cdc09083dccca3411cf7d77a9779334e534a SHA1 4a1057a9f68ac03a17516b2a88b7d3e739f8702b SHA256 ebcbf5cccc8523960965cb38905093aee5945f0d0a870c3586fe6085ae764781
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_bn.tar.gz 11780249 RMD160 765c01345cfd48270b2e0708f5a62d73ca41f47c SHA1 6fce8460f50e14cd72dab9583cf06a18b5a535b0 SHA256 cdb5d967d6913ce4bca55dc0e14827ef04ca871f2cd68010b8cca641eb79e7be
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_bo.tar.gz 12416984 RMD160 082dd814b6eab5e8c9bf97eb0753d3bccc108e55 SHA1 4ae6a72fbe060c870ec80eeedafed041070a43c6 SHA256 92d007807acc13455f73feb4659eec322aef71665e1ed9ceb8f86e4448c29061
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_bs.tar.gz 10037072 RMD160 21a4e64477f1894cacf0d35f10d578a6bf0f236b SHA1 d74fb3bdd2659b906f3b4bc430e04bc2d63fb237 SHA256 eb43ee39e108c93ada21e17552748703aaba951f8a762d56012d3675e4f3148b
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ca-XV.tar.gz 10904611 RMD160 328774fa0c1a33e84c5bd14bb54e03604e7ede39 SHA1 e864bd4ab0b9101ac6ae025cad6d9b5b70b1faa3 SHA256 e51c71175d85257445a8d3e15f1106372a7f89450ba64464339d0ac28c25b69a
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ca.tar.gz 10897941 RMD160 538c64581c3d2292f70b294d0639657c2dc2f7bd SHA1 cd807eb0260334f26650376e60291fa8e3e2ede3 SHA256 7ee270a32c4d2904d419dc6493e7037475ae958f9cfb94c552721f5aaf8b59d4
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_cs.tar.gz 10629564 RMD160 84e9b59fcaf5ff4f82ee75e71188f1b2209ad08e SHA1 40c28d7c1698b0928e8b8e500ed288bfc1848b4f SHA256 4387bb75c20b43f8355aa544e76eb4c3ba811db52feb160a7cbd3df5b058930e
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_da.tar.gz 10504379 RMD160 d1f9d237c19cc7257e966662bc686da34c9e2212 SHA1 9ba25f86874f6b4689f43d25d68f71ff79f8632e SHA256 52695d80cc013b157e994cd639a8e0f00ac32fce72f5e180382095a7fb78434d
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_de.tar.gz 11104287 RMD160 067720a401878bf5afd30fb821c2663205ea44d6 SHA1 f3fd52ce45f2101300a873b6ee8ff7dfa088f478 SHA256 905c616d6d3051f4fccf4d94282d75b496a1ce3e6baf9cd0046e631b9e208243
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_dz.tar.gz 13271140 RMD160 007489776252b2f0744e06817508f952a0fd62e4 SHA1 5c143046d7c7944058f7f0ac057be2f54437e519 SHA256 a263e02ce13d814fca0dbb5525ded97c0c455baefa323ec8a128ee40b584f2b3
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_el.tar.gz 12314660 RMD160 197ef1f8028597b1b46138d1af02164852d1a82a SHA1 122e099acb9faa89ccd9072deb09a790e8593034 SHA256 5d4da5e1f19163ffeffb5d8429dd23b4c955bbead5d29a8f14bdb0cf8d5f8f5d
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_en-GB.tar.gz 9327806 RMD160 4e2ee87ab762b096dd3c10faebcc0f3ef980bb65 SHA1 1575a83019c09fe49cf33f3ec56f7044314c16c1 SHA256 4ce7b7b797d33afa0c80995ad454776451b0cbfff32e8ad6ecd0daf93ac50088
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_en-US.tar.gz 9380017 RMD160 925707f748e493a0aeb6727c3b97def2ae60b04c SHA1 c1e9e77ade1b62fcd7a53993ec9b716c02798cd8 SHA256 1e6e6d783097e552ddaada4cd4481f4f3e2b9d4e49a46cec596bd551504d186d
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_en-ZA.tar.gz 9308880 RMD160 df907c7620521925000ce2b2121d35696213f443 SHA1 f4892ca571a20ed7ab607a19d541ad0e19ba92fd SHA256 a23f73dfc80538e30c99cecde9e773bf201b61e81ae86b16a3846567e8018956
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_eo.tar.gz 9737596 RMD160 6ea4b29f2d21c8e447df23403d94a179b3ce8eea SHA1 347a56f369a0835c96dd99ddd7db29dfc8cd700e SHA256 117e886439189851e1af0515256809916728be37ac70125a048cd8c79204d113
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_es.tar.gz 10993291 RMD160 e365d42e99d103160b1d9c13db64d9bc14b1c7c1 SHA1 a8d3840ad151841311824c03c48090e1027ef71c SHA256 ca5d82c207db941bfe6f23408c7bcfdd93903174dc493f18362ea3accd6d68db
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_et.tar.gz 10404876 RMD160 0a8617b42d7cb67ad7d4f2b95a72bd812ea417e9 SHA1 d3a54327de93607a578e76545c2d2907557f0530 SHA256 cd0f0583e4e954842655bdf8abeca59db77df9aaa7fce824880c460925fa5f20
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_eu.tar.gz 10509524 RMD160 54f645a07ec2ab60efcc3d93d107a1973ff07133 SHA1 b1ff92851585dc9573a04cfcf4147cbd46854f1b SHA256 6eec3ded1cf5b503c751fe449a12d40a272e8878a42ae586b4ca1fd13df2a81a
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_fi.tar.gz 11151781 RMD160 743193963bbbed23b65c1bd77fa03322a07a287c SHA1 fea2888dfe4d91953b5058655d77fce096b0a4d1 SHA256 53b896340a6b5ad87ca5345e30291e1dc86979ad0fa2af6c12771894e2c3c789
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_fr.tar.gz 11153218 RMD160 5babef3c3b48c001789d1197ba3d85027f6f5c5d SHA1 1530792c6f4f271198e9fbafd81d4d979a9162f2 SHA256 d8bf2f058fce389b016e06448017f7be7beb4295d826ac3f04108e39930e002b
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_gl.tar.gz 10436065 RMD160 e20c570e7924c272fc8cfabf4ab19e0211db2071 SHA1 0b548978253ded87657aac348ec755ab6e482c4b SHA256 4b47cbc1a596516625641244e943024b93fe2da1e1b745783c99d734d89d1e06
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_gu.tar.gz 9473913 RMD160 e34b18cb1530c1fbcce2a048df19975612897df2 SHA1 e2c73c5b8e30e60a9b36ef1d322399357a809ae1 SHA256 5d358c692d87e054a10d53e860a220521cd90ff9c110f9ae60c7855c6e639018
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_he.tar.gz 9124379 RMD160 06ec9ecdf0164c67ad609d0bdf25b0a344990697 SHA1 ed6a44fcd3a84c8b7a6133fcb202bce14db908a5 SHA256 222a2beb60a22e53ec240dcd4b2a89c75bb94ea898a6ea0dd774333d02ddf11b
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_hi.tar.gz 10130552 RMD160 d5b6b190e84ed35811a3e60bf68654b4d9f8ae98 SHA1 259eaca9d1dc9622e36788f2244f0de970a04687 SHA256 c1ea80852e74f07078793a55701095bb82374ec7edbcd0ba63f08bfa7ae09d91
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_hr.tar.gz 9695052 RMD160 e3c1fc4069aafc6fe6dd0c3be3a34aa7704adec5 SHA1 b8393b845d11c2287d8f55299eeeb13f819b9210 SHA256 9b3ece691ee973ca7b756cdf8a13e5b8ce132a427c8ab204b66c8b3b2eed3271
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_hu.tar.gz 11058142 RMD160 d230ce97912ca533372c4e2ab0e00a853326f2a9 SHA1 4817df8cac385f5b0849d08012b8b1edb175116d SHA256 4845c1f9722a09f70e7f6ad77f3a7df96de2d55784ae103282d883134fd62ed0
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_id.tar.gz 9600512 RMD160 4f8948ad15e24a11c569445eeba54ff1c2bbfcaf SHA1 3c6324487ea51618a63997e2ac27c60713870f91 SHA256 fde26decc49ac480604321c199bc49a0612062ea70d05e1cd2e239beb77188c0
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_is.tar.gz 9782784 RMD160 8aaeae99f2659f8c5a71d978baf5cf983948a89d SHA1 83af90c5c6f084c3b24df441725aef7e70a2ec3e SHA256 d4f490fa3c9060336faa4393f29c821e2c064d2eca17c56a673f959fcec67832
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_it.tar.gz 10892396 RMD160 35b31784d3ae2c9a04e6c2d391f8aa0c4355b254 SHA1 abf654002b37336a1177bdf3cc38f9c9a5e787bd SHA256 d0e268a2a1a5457b05253375d0ad528294da2ea2d5dce1852a15e5bdbedb3a24
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ja.tar.gz 16808454 RMD160 12a827eacc227acefe488a7cf187e50c6f8ba9b6 SHA1 ded0b22f35921fedf309f41f4f8bb7ae110aaf63 SHA256 466aa014251b69a88b2dd3961ab1dc79452365433220084c1a2c4e5b28543d1d
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ka.tar.gz 10121545 RMD160 5f6cc55bff4161e3ecf84a7b139c4dbd514f8740 SHA1 bbbb7de2a8a0454e9cc4966ecc4ce6290583918c SHA256 520b796e2e2d9dee49977113d914026d3c0f148248ec0d3825c8f0abbbd57e6c
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_km.tar.gz 12173815 RMD160 2f2ba0770f2def1e299e58fadb38b77718555460 SHA1 4d992653cc9b410748792c771183c6d32ad38d87 SHA256 92ab1a257b27b7e97a8a2c6f8537f1054ce1549e61149a6f8f88cc349bc168e7
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ko.tar.gz 10694835 RMD160 280ea8ae507ede9390f096c24ef1fe6458861095 SHA1 2a073f02bcb9d1b25cf90617ee37d6416c5321f6 SHA256 9de759764ee629176448e764a094ddaeb61d5dad244024c5732aa5e5ce575d76
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_mk.tar.gz 10398003 RMD160 7294503dddecc79c1f5ecfae2d4ea45325cc4a39 SHA1 35ddd8a66fac54a3cfe4fac98ca514aeeb0b2410 SHA256 5fcb68ad5b7a7cebc800a3016a9568d1bb5433dea9c600aa315772907ae30c49
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_nb.tar.gz 10595467 RMD160 2d57169d65a00d3eda56f9ff83f17c98b2bf6144 SHA1 f4cd85f4aef3200cb908f6f47d5770c54818a15b SHA256 06908c5da6b0b10667b901b7e45db3aa0ed63a51a12ef38f84e46fd596dbd197
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ne.tar.gz 11755012 RMD160 ad29f98e127df42724ccafd4f95ea8af35fe6033 SHA1 4b10a05dd0ff9f5cbefa0d616eb7563b5a1b27eb SHA256 b4efd530d98fb3a2d296db3993a0c1282d12aabda7c189bade1ad539321b2ac5
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_nl.tar.gz 10683459 RMD160 2e070a5b41fc0d39f562eaa733dce03543a4356d SHA1 5bffef32c4aa33cf08920bf8e8cc22a58c487559 SHA256 8f13d820983fd2285aa0bc351dcfe3dec382fb29d5c2bf378458bf06c4cdc969
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_nn.tar.gz 10173043 RMD160 a1ba6cea90f971d288040688588d1e4d7c31d533 SHA1 f39768ef7121c55f8ccb0aef27987298f5294279 SHA256 e08122b60e06ecb736c673b1ce52fd577d7a90affacd1192bb680302dfc02bdc
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_om.tar.gz 10928253 RMD160 8458f9b8397d086d466c5b13732c5c3d47fa8048 SHA1 7e5f835d9dc884737a367fcaad6e1354804804e9 SHA256 e21594cdd167ba0e4239c4c56de6ccce59aeb22358233b050b0541c2256892e5
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_pl.tar.gz 11024345 RMD160 1ff378b16650a24a1795315191d8e1a605a507d9 SHA1 ca44bbd0eda9db578a5f54b802e3ffd0531c1e03 SHA256 4f01ed9b249911a8fdfd9eb19d0ac07c61dea3f1b60c82545c9f1a7cb23b5e4b
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_pt-BR.tar.gz 10732855 RMD160 b4f799c6e5a31a3f5eb45200e668cc20f5941d7c SHA1 d6535dfd0f29c6fd3565294d562735852e892336 SHA256 3297d7c820deccb01be4204637d851d269fc99e985a51f592570daacfcd2b78a
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_pt.tar.gz 10754518 RMD160 cfaca8738a75fd84c70af1b980143830cf584a4e SHA1 0d690e7f824b016c436a0558f93d9c4160dac6b4 SHA256 6c5985b8be56dee8005a7837c75151c48fda0819b318023400019a60f17abfac
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ru.tar.gz 11685705 RMD160 5ae7d86f2eaadab261afc3a99ca163b74c6465a2 SHA1 1cb17823a8f15217a68373011cb9966627094b63 SHA256 83653508df0ffcd3983d7383836ec3b8d8bd6c9e84de5185030be9e00d5779c5
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_si.tar.gz 10011377 RMD160 9e4417300a10fee3fafc8a5dc2ae1941729e0983 SHA1 a7b61304f84124ce2426c7d525113878aa1364df SHA256 5542c3fe726fa45ab25d77508d1293f7dcde664b199c470f9240d7c649390f8a
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_sk.tar.gz 10464653 RMD160 bc661e80acf402853dba3692a9e33a68b8504dab SHA1 ef9e900c5e2d32625dadd64a8ee39c7c71fe2faf SHA256 a28e5e869233f94ab31acfdc8342e23658f602e1f9b25dfd949f46d30d53086a
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_sl.tar.gz 10651286 RMD160 7658380420cf584171b910d8d66f8d8fa2434496 SHA1 1b638c0eef5fc09ec692bcd70d798c669bf5b7f5 SHA256 3a9bd20ce91db93cbe6f1b5781972b3ff40f0a73290847efc134dfb79da96bfa
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_sq.tar.gz 9796822 RMD160 3866b3676119329ddc709e01bb94f2b8e04156c8 SHA1 21601cc579ad025b42c14f0873d37413900aa0e4 SHA256 453a8460f90d3f53d864429e25081ac4e4441261f3d81e8db32a752a675127fa
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_sv.tar.gz 10603965 RMD160 e0ee09244dbce384dc3592c0eba96472175cae93 SHA1 a236aff23ab29e6955e6a4e7f642ae88d09dbdcd SHA256 5b980981a722793490d0c9a3af451d137a347fef795a447cd5d6267594ebfd83
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_tg.tar.gz 10167034 RMD160 2e508733fe1a4018dc4e75385b91391f12e53ad9 SHA1 020761f7a80effb74611e053a302487b1fa4fb7d SHA256 e0903750fbf32aa72b3593e38dbd00955e802e3fea70c0432e1151e388428987
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_tr.tar.gz 10235982 RMD160 82eaee1824dfc1401237e270e4bedcc5ee3db0fc SHA1 35ea8dfa4f935b8ff01fdfb6243d87ca36d0df25 SHA256 4e2040dc802e4b41f29066a741f9c1c30fe592869fcf4062184469fb0e299e92
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_ug.tar.gz 9767346 RMD160 83ea3eb110b6094c7c41cb0c5434e08e9f1f6fac SHA1 e360e4492e55a54f75f474484f431cd5e9318445 SHA256 f63b6db416d18ffd7fededf0a4b03febab2cf0c71f6cbc8884a1a97315af727d
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_uk.tar.gz 9607178 RMD160 1f70d5035c204bfbf34932f264ba1803e7513816 SHA1 e1428dbece87e14dc5e7fb0d1f333825472f4db3 SHA256 f76d161ef2fa31bf9be99f028025542ad796c97e8fe46b8420a3f8f6999607bb
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_vi.tar.gz 11263225 RMD160 96a7497b63bac502e410aa12514f273e959e9480 SHA1 3e21b1380eec088864d1b3794bb5f8febed8cffe SHA256 d7b2ba558121fb3aa07bd501efed06400b17d43a18336423890d06d9892fbff5
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_zh-CN.tar.gz 11852788 RMD160 392a19329a659b60db6ddf8287a2cd251a7e8a40 SHA1 718516265f272779001c99fba10e0ddfb36776ab SHA256 57926d027f377164ac12798546310dab425e4df14891f57d3556a1df5af613d8
+DIST LibO_3.5.0beta0_Linux_x86_helppack-rpm_zh-TW.tar.gz 12086785 RMD160 db04bbd4712c09e007591aa838076e30c1c951bb SHA1 704c536cd6187f490b5a6578976f7d3d7605519b SHA256 8be3f6d826b202d47dc19cc9f7fbb407bb417228eb9f60dd8ad778cf875ded3a
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_af.tar.gz 2269953 RMD160 42ead36ab9522f3c8e8d2127a23237ac33d0d4cc SHA1 468fee0f8d8847b6ac4ea84ca91762aaede614a1 SHA256 7023a93dc20ea0e32899b70e1c3c4ce6a004d145ccdb8553995df7c14527925b
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ar.tar.gz 3408737 RMD160 f73c06185f2f532f9dca2a6d5c813e7b3b03d3b5 SHA1 fb0cf6971eb290dde36607811a797b5bfdd62c0a SHA256 3cb97eeda671630a4a168266fcae1a839135dae0bab8f9ce8eb3e9007c662c6f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_as.tar.gz 8198567 RMD160 3df26d2aecbdbbc2ccc8fe44203959290c641153 SHA1 186794d07b1e67008648c677e8b6f91e98d2dc21 SHA256 f1f922a5a76dd4b0e61645765891a394141d8e97c4d17b91c7fb8ee1777570ce
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ast.tar.gz 8150174 RMD160 ee1bf2c9de0e9f6187318f13546080d4708b58e9 SHA1 c5a736e0c0d5bc610d240b1294749f533fab54e2 SHA256 d5b6840ef60df006f0fd40842c4450fda5f89a1c835bbab46cadde346fbc29e5
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_be.tar.gz 2049176 RMD160 7ee2fc3b11db4934ec80293bb2cbda83b7b5870b SHA1 9dcc4790d2a320408bcebf78a3aaca06d4d99714 SHA256 acf65a462e4cbbb2be45e8bcc6a4561964a56578d752ccfbd4c7a1b5e9f216e9
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_bg.tar.gz 3062538 RMD160 cca6c73354b31092b4972fec898f4576bfba18a0 SHA1 d1ef9e23edb3146104ad4df4dbeee8c07d7d72a7 SHA256 d09603f7b7c8518edab385cc40e36f1a6a0f64b68cad50f2944a37d198b79de8
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_bn.tar.gz 2080360 RMD160 9806df76ebe20ef26ae1dc9d10028e678d630751 SHA1 5bd84076209864d63fab9108ba778355830194a9 SHA256 c93bd2fa384d098af54a22093cf2b182ccf55d0b2bcf8cae44d6538e58f204a9
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_bo.tar.gz 8214282 RMD160 c6e14190ae7b111b60fabbe92b099c9ebe6878aa SHA1 749de2e034cc990080d54557db838c0094ef26b0 SHA256 a842256156a9e5d1dc66e94d7d83732404e44e43d9527143fb80b2700488e981
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_br.tar.gz 2863472 RMD160 fbbfa440ff0eafa6e46745256410e29fdb98a0d4 SHA1 bebfe236db941318e3b1e766c124aa1859db4500 SHA256 39aaf90dee63f302a03cc970cca4fb2a8217d6bce749a5d4bd30133ea7e74fbd
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_brx.tar.gz 8180154 RMD160 34965f166bb827463c440bb863543e0b4e72eed6 SHA1 a972859f422b1dd0b51a477dc6ece2880f220f5d SHA256 535f4418f0358a0eafd6c60984adaf4940b4f36c3e87a73860fc5e1f26622983
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_bs.tar.gz 8147273 RMD160 6b6e7490eccc875969e1be70076e69fee9ff87f2 SHA1 edce2429769a62e9fabe95c933102a2979ea577f SHA256 4c679ea7a44daea765317dc969f2036cf7da9354e6bc9ad4bee21cfd828c2a2d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ca-XV.tar.gz 8146311 RMD160 b35bad41f87264af1360e2ece915848359746f6a SHA1 210c31b556b879909231ea2622113a2644c859b0 SHA256 2ea82bc3f2cd4f3682d6e5854e66978c65b197802217db14964f381ec2810d38
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ca.tar.gz 2298975 RMD160 bf7458ebf8f5e29cca84925cb482f76eda01c5ed SHA1 d6e10a9d8d34e1ec44178b699d2e7e8cf78cd6d0 SHA256 ea7fbb49246fa210195672382d8066b3bb0bf11dd8e6754cf38233f7cb6dab66
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_cs.tar.gz 2969277 RMD160 7dbf78ba5559762bddd1d66c716c4ee4469b0c9c SHA1 ffce5edfa84cc560110b6ae703bf08f74a17faee SHA256 d49a50988feaaa58ede383ede620ee842732ac58352fd3a989103147722fc34b
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_cy.tar.gz 8128735 RMD160 869dae8624777eebe7007c76b4fe88758f3f2c7b SHA1 7966ed62ec680e14ac0097d1786ef328205e1b30 SHA256 1730a079cd9f74d5ed1ec4f3a3c194d179f7a4dfc474911238f446c12e96737f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_da.tar.gz 3317633 RMD160 f8b6739076b5242a0ce38f772d357d7472f179b9 SHA1 da3604e48d80ccd013f177be30c3ac04aefd1f25 SHA256 68fae197835d10beb3767d3d2d9899c81c1ba591b44a170cf9b1f56774a3f1a7
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_de.tar.gz 10126040 RMD160 b946393fbf0f68e565b34358326574bb453b23bf SHA1 1b88953fca2b7579bece68112e3a7fad261823e1 SHA256 215f65cb728108d53c41f678c618d33eeb4d3b5474c756864be38d2fe072014f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_dgo.tar.gz 8190355 RMD160 bd9979fbd4040565670c8e4f61fc358d3fcd20b7 SHA1 0910dfef16bb272fb2c78e5b526eae6e1c57caec SHA256 88421606980b15a4dc61d9a146f081383160857ef22b744c5c398f02573551ce
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_dz.tar.gz 8223110 RMD160 5ec6bda18e597e851547552739ebbd0949182827 SHA1 88e5f74e4f00bff88b5c60622f7f9125f62ddc44 SHA256 1e0fafadb303136357ddea5edb9195e3e50bc2a53ae3e7c93fd536ed6c20f369
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_el.tar.gz 3244009 RMD160 51cf9f5fbd94386d6354b9cb8ad20f4173cbeda0 SHA1 c77a23150948cac9962c558caf691347e9b6677e SHA256 734d63e037a7529b820bf44ce450bca9a68f68e7d01855a46c2c35c6d1334027
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_en-GB.tar.gz 8200092 RMD160 fd64cca4d0e4be7c976ab409bc575d15334c9a4a SHA1 bba51bdd9ebd2341c46841481ca51aade89a46cc SHA256 ca9ffd5a6029573924d6e0084e8df8be348c89b209f6142299bd0913e121fe02
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_en-ZA.tar.gz 8115727 RMD160 8a4d0d8ce5eb93087180bedbe3aeafacacd6a09e SHA1 792a95ae0f3c8bc8fd97335eac2b9ad1660f40cf SHA256 a861d5452d6fbbee6cc172b2ca69adbf0e40ca10251c416f1af892aa0256c5e0
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_eo.tar.gz 8127125 RMD160 5e70f3ee95aa4092104b8bbd42002ac4b6e6c311 SHA1 0886a4f2ba93f9bbe663401f6d38c988d93d4d59 SHA256 315e04f5e2166e9eb4b93290da126b2451392b4f3b7654c5964c38c770e44f7d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_es.tar.gz 1933087 RMD160 8e2a26228511d1545c7f7764982b241d23846ef4 SHA1 9efbc86ff746d95537f4e9348d7cd560426432f8 SHA256 3e3070e9e6f46abf10314f6adadf0dd34568aace4baa9f937be7c2ad91720c23
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_et.tar.gz 2544045 RMD160 b051ebf6208dba426a5a5b83781f5047cecc4e3e SHA1 2fc1de96a195b65c0c5cd2140e967465fb39ce95 SHA256 295f07648a2d00457a3ab61b77dd4d3d076452d66f2d5e7c33ca36c334cf2fb6
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_eu.tar.gz 8329153 RMD160 8f0ec82cde1174280117d9506cea0fd2236b0a72 SHA1 298f355328c35f364e82e7c9ae97815b3ff8d109 SHA256 a9924ea39a6894f4d7bb0cd800c63c16fb26e36c49a7b22cadd30691872740eb
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_fa.tar.gz 8166978 RMD160 6a1485bea7602bb941e864803a55e98ebd75e3a2 SHA1 0ca450067efd165ab0d5bffe19cb5ee073a35619 SHA256 a6186b92370ac18c957464c999e943faa988438c839664eac11acfec2f0f0e54
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_fi.tar.gz 8137503 RMD160 6154e27d99330525cd9bdfdaf7cd9ddeb0c320e9 SHA1 8af690a56e047d0749871141ae768d717c76640e SHA256 0f0897735d1538d10dced47a07bd8e2ef8b984fac472ecc102f4aee22e5a0a5f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_fr.tar.gz 3833277 RMD160 b98b763ebb8d522cb9058f92878545654a16dc4c SHA1 375578348f981677f7ed9fde92afba4cd9de905d SHA256 1c5d308bf3d1cf7fd334a4f41f21a531cfac9a0b044b984289a46a3cf2612ea4
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ga.tar.gz 8152674 RMD160 743d847064f6cce83d3b70458a18e8bf74a035d0 SHA1 9a64b9db3d47a698ef7ba3ea6c7e0862dc883227 SHA256 60ec6428f15c5de9fe4e125da863b3acb1c5cf6d70f6226d813d7b968c566061
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_gd.tar.gz 1969959 RMD160 f80de478f08037d680234afdd0bfdaf2f72d028a SHA1 52fd1f52f0c0b4dde4b3bd1d0281d058564223bf SHA256 86924dd2467c6b66b6e30cd80ee66192250bdda45edb30ef38cca89f27a03758
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_gl.tar.gz 1870427 RMD160 9057b46d235222ab326c1e1336cde7fb8534dd5a SHA1 08dca9f1f48158bdf90e3e22033f5472732538d8 SHA256 6cf3f6f2454f9a73b9f99a7c2d68f9e82ba1246f5023720a081abc2733359d2d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_gu.tar.gz 2347482 RMD160 9b227550d39b4aa717181065b4a17b2ea5788795 SHA1 e64d0788b6b4e58701588c1fd51c041870812e99 SHA256 1d1b8892335018e396306284fd06c5e9f466d6e67417b70ebd2fba4bb3f9dd21
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_he.tar.gz 2263638 RMD160 09a6397fedfd60f6323699591bc7bb85aa4a5984 SHA1 c108732a7b29b5f8826c6b3203aa8b1cae7cc194 SHA256 6cb3262230c192f8f54c2f86e6ef31e2cee56b21e864f0459d8bec44649e5e36
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_hi.tar.gz 1776893 RMD160 36a0ae6100262243ccfe52a7924e6c2edc572e45 SHA1 c110089b1d58cf7878d9a7798f281cb53b1b6a1d SHA256 228398bc4b6f2eeec699bfc1ed57dedf3bd6137bff6266638e2985f27c176f59
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_hr.tar.gz 2407843 RMD160 2a949119777719e28bfd8490a29353a6eed5238a SHA1 351c487a9bb175a7cc09efc203962a0a4b120f4d SHA256 0d7b612e8393788c35ad3c737ff50206b1646c8cdd4132934f3210e9996daff0
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_hu.tar.gz 3772621 RMD160 20716488642ed6c660209c5af52e18a7bfe27596 SHA1 331fb817118fb13c3ed74b43d718bf5be4a4f378 SHA256 0cc35dbcce627f27dfb70db454a8d41277a879f0b83ab38d813aa5b236cf98ec
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_id.tar.gz 8126232 RMD160 8fa81ea65f1633cfbc5f16dfa1bd019001e26f7c SHA1 01192409fee7d35e74691bc70f3fc99f5ce6ae8b SHA256 250fb01b70542d1715641d7fe0acb33e054efee6c9217493d1942ef3737126da
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_is.tar.gz 8146232 RMD160 e43bf15204e192424f84571bc50552c50f3d5a09 SHA1 5970790587e675017f3a4dc35839bef201d28d44 SHA256 24c62df7683362c8bd5615b0c61ce852091a860b12cf2b46a89c0e11d6e0b691
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_it.tar.gz 2882728 RMD160 50a36ea42326f2f1ca59362c01aae58def75282d SHA1 7ad2443fdae96ff3bcb2f0d9cd09e70b695605ba SHA256 ffceea5d12c9268266d2fe3d1fa1f0da486be50b52d29ef6229e407092e043f9
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ja.tar.gz 1759889 RMD160 de69290320becd02e0938e4bcec4b7a26a8946d3 SHA1 38b0757047b31dd0450c985756c191d7a03b8f21 SHA256 df865a0a574c833d947eb856941644e9035505ed8eae424ca34699cc8e3edac6
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ka.tar.gz 8189199 RMD160 f4055d55262b5a4b0095ef331134a98fc5c89116 SHA1 d38adda454711bedd84cbaf929e73df1e67a4563 SHA256 ea64995711f1254a6543a8a50eb4ff98066ac00210dd64cf3ee4cee861a18a95
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_kk.tar.gz 8186583 RMD160 d567eb9d060354e6c0289c3b686439b967128d1e SHA1 b328bb8ffb526fa82ec6e27d1f46349098276290 SHA256 669a07111b37c9f7e203dd6ee76bd6ca00854493f327f6060f106de3da5fa94a
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_km.tar.gz 8372235 RMD160 d604860c38b88415c9a38c01306185fd0b22e71d SHA1 076d65f6e4c2fa8cd70a1becd261849f03d716fa SHA256 a8e838fca630610df2a4dc14068daab893d1e06165bddbf95f42b283333d38bf
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_kn.tar.gz 8212471 RMD160 402aa284cbb88b0ed99c495ec78e4146cc835599 SHA1 aed26b76434d82de7d030b0a5aa0a7929c4f2abf SHA256 e0be482a835daffd2f4fbd5bcd0b7450f43efc2bad18af000f3f7b163d51fb81
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ko.tar.gz 1626861 RMD160 6c80febf933e5e280f0c126f1f7c62a6a9fc4b4b SHA1 4a172ef5bf9afb65e3c4645e90118bbdd7d18aaf SHA256 1138c9a531b8a1b2bcb3dc3f9a6765aba37875bc15bcaec71463db61a401a9bf
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_kok.tar.gz 8180904 RMD160 28f8884c12e41426a5dc8128bfabaa1ee7f62d9c SHA1 7dec339c0853eadc3a4817cca0261daf69286ea9 SHA256 1ce16ee1628f35c3b22a2ff6165e3df4b904cb3b89ae4344c8895b17890aac86
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ks.tar.gz 8185224 RMD160 adf97e637602459d097e8b663cc950ab6e8348fd SHA1 e575e865910bcd21d5c3a069f07e102f94d48706 SHA256 08a2804a3f2a64d20da57150fbd4825ba609f8a6ddffa06ee6e1f4179f454113
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ku.tar.gz 1719560 RMD160 cdf7e663d9abb1a7c97ad29dc1c358ed16284bfe SHA1 1effba7b78f9cda2cecfefa61b67bc6a3eefdf10 SHA256 d756d5a359090d34055bbae1e2cac887017cc5807a55bbfa4188ee1df5c42cfb
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_lo.tar.gz 8173913 RMD160 72555b05986692d3f78c3568bcbf28b3d8419dfa SHA1 09ca7876f1501e5f734b38aa27c4115cf1118642 SHA256 e244de095adf9ae31a7431b14d438f8530f67f86119e7ce5ffd474ec47ede1ba
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_lt.tar.gz 2029293 RMD160 fa6b49ba75ac65b5210be3f4e8a038e21eeb79c0 SHA1 83e8de3790bec0463506182abfd60e9837b19a4a SHA256 bc66104ed3161adae38e9c74afc4ca1378e9bf134e581d71c4df2135159f31d8
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_lv.tar.gz 2404476 RMD160 7d92baeff0b918777e4babc9b4831a4e6f43c54f SHA1 9c343932bd10c3d1edc4564ad59853a3655b94fc SHA256 55b9076ff2ff8f3363b7b05134f42ad35c64adc43129f9029180839cad36ef92
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_mai.tar.gz 8190370 RMD160 ea6b4873f6a09a46cdac1ae31245472860d683fc SHA1 c1299008e19de74f9cdc040701686ea82e7be009 SHA256 e6d884c9272064166a6fba81b75625469c3550f77a0f300443f3567af0449531
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_mk.tar.gz 8188485 RMD160 bf4e205aff4d42dfdde06cc677a87fbe1e185d57 SHA1 e5ac3dc4484bb3e6ed05d6101031f179d44a6dd4 SHA256 32e26177465781121660810f8822e61b64fec6ec85ee612fee648abfc6155485
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ml.tar.gz 8213571 RMD160 8c0801b4622d674432c1c2d540a9f821d5744c48 SHA1 f080283749d8db123c43d9d39453079ba79b85ca SHA256 0b0058d4771630fcc772aac9c8e5f94b9321b6d91708d403bdf856ce044f4958
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_mn.tar.gz 8193377 RMD160 b614fef3a2eb5842c2597d3b2388c2e0c847ce1f SHA1 5f14d1cc4f9cfad39582aeb091de4f140f7528fe SHA256 3ccbe5e1168f4bfb1640142f83533421306989f3bba4b94aeba46dc99ff13069
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_mni.tar.gz 8184885 RMD160 4b8f4f9d0105deef35e6f62f2640bf1e3be46feb SHA1 d85208d2fec1e5b84ebe9604c07c8b323dc32b6c SHA256 d03cfefd7c454a0bec089680726c3dca97e01283afc4cc522762927e2494a101
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_mr.tar.gz 8207137 RMD160 4512f9c8d3152c69820bba258eb5408a6d1e31a9 SHA1 cdd9e6a9c90e4864832faba606ffb8e182a66ba0 SHA256 f377cf3a0c6157fc76ba502151a7caaa63fab347c36ef7a601d399561de17157
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_my.tar.gz 8225358 RMD160 ef930c089284d0d878d49aa309c5a410c0005018 SHA1 58121382f0def379b76984c0b065f2cfd7637071 SHA256 9e1f2ff0c296df46c4877a98a9753db10ec20163d7412de4ba5e93b56d7b23e7
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_nb.tar.gz 4852435 RMD160 94639ac08d9238f35e6595d428a18628d89bffa4 SHA1 ec43933aaa1eef7c984167758e510093faa8e06b SHA256 67152baaeae720acb433c743d82e5dc9b2abe59dd69202d82d5fbf4d099b379b
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ne.tar.gz 2086648 RMD160 7aa3b5812f5a1f7129890dc833d602a2eb56a833 SHA1 3d00d4516887c613a6d5698f9e862720104da6d3 SHA256 7669a7aab4b482f37bfd35b6ecba1c53ba2f09e69b9b9d7e79c519d194a39bb1
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_nl.tar.gz 2376154 RMD160 24237b6991baa2f9515356c2736a6851f3ccbbb7 SHA1 0ba4da0f2000bc3ba1d42508a82a95da9246c479 SHA256 0ea278b5aea9fa772a8e0adae0d5b97725f579b6741c594381903a9a99ff367b
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_nn.tar.gz 4854642 RMD160 5298199ac234fff205d50dc81908cfd2a994531c SHA1 f2d9dfcc6f02ff0b50de09f6dfbbba3622dc16a1 SHA256 876308c96fb171790433d823d4a44c745e9f75bce7e9e7edf3619a0a1c794955
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_nr.tar.gz 8161580 RMD160 a4b6231b7769cb65dea86256421bcaf01d90bc0d SHA1 344d71e6ceaacc04650d20236a2e01108e592bd5 SHA256 2b4d6af7ade22cc9a69166ae5f09323ae34a993b8f24cd766a970aec789edc68
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_nso.tar.gz 8153194 RMD160 76c24b3a6278f5f7f3cf6c49e2f0926444554eed SHA1 1498bf4b6db4c4a7368ad2a4576b3470ec331429 SHA256 cd92edbfb7d49af55d60b638b816d638f1c837f44b6a17c22ed1641cb7c71f91
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_oc.tar.gz 1849066 RMD160 0f86e9af5602bd5bac0c23624ca519448e3fdc36 SHA1 2a3a9ff9594f504f201c84708a998a5d70f1c73e SHA256 b33381f2b8936f08322e14105a2f6cfbeff9a287de0b292d5c52a33fa32f8dda
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_om.tar.gz 8136242 RMD160 47960dfeeb7bb3a63abda9b05858e7dfefdbf29a SHA1 e0f51372cedfebf30707a4e01be6a9a42140a2d0 SHA256 c410b1c3c3bffd69367dc9f3588487cdda908dd3672707df8677595dcdfac635
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_or.tar.gz 8200381 RMD160 f9e5ec6d8604584c5560b0f8e193da78bc023d73 SHA1 bfa2def0d27c270a41c4a67864d59af40cb9c1fe SHA256 6905dba137b7f3648409668c9277df9bd4d59c24f0b53c5e2959bd81b929c092
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_pa-IN.tar.gz 8181043 RMD160 0784f9f398136c25825a0f8d1b6cf6120e32a724 SHA1 8bbdcaafd1a757cd3354d6061d1c0864425edff4 SHA256 e63a17f2c475d80d0f10e5faabdb93ccf08a8e828daeddfb798eacd424471a9e
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_pl.tar.gz 4360739 RMD160 f608f828d44efa1f69f0e79d870d28d47f08daaa SHA1 25955f8b703ac513de4eb776c4db1a0ca7457866 SHA256 ccac495237618f81471d628b24822311642e9cd99342a4571538427b474c324e
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_pt-BR.tar.gz 2951101 RMD160 1099169596f8068cadf803c495762481de798f42 SHA1 1692281a654264fe45c550d71ed8394ae91cc432 SHA256 ce6d6dde5e939002f90a97d467c80148dfa312ddc1786aff203171efe177f3d9
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_pt.tar.gz 2217477 RMD160 9996bb69116dcb8423ab2d14ec5469d40ce8a811 SHA1 42e71dc2fd8d35e1d5840957fd90e50d9f69589b SHA256 6896cc3d6e3f1fed7da3b639d7be5040545da8a72818372a257cde27442d5060
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ro.tar.gz 3470865 RMD160 14647920043ee454427b2bd013f8a6e0a1122ae5 SHA1 9343efb65fcc643b5e66853d64a7376f961b2af6 SHA256 ac89975423d10335446979c3c39352354738d5a465cbfcc35da620604ac647c6
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ru.tar.gz 2739826 RMD160 98961e8b82adc0ad8299470c7ba04c2eab497695 SHA1 11fdcbf9010824b28da4caa6ed031001b269b683 SHA256 396909ad018cf37c7120c834c9683b92b154922787b2150489eca3a1a4a3a90e
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_rw.tar.gz 8142886 RMD160 d06edf82fcdce4de154fbe2ce0c9d5264f1c9cc7 SHA1 4c7c797e480f91fdb74dbfa93679e77f922872c9 SHA256 a34cfc139f503f59828e204f295ce9fe8acbcebd5bd0e822da4df67951e90871
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sa-IN.tar.gz 8188334 RMD160 9503463a34314fcf377e79d55698646302da7e04 SHA1 a48d463c1f8a8061b54f0931e2918c0d31c92a2e SHA256 45d444ddc2571575e92b91273a7c791851aff582357a52e05a8964e6214f48b8
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sat.tar.gz 8181637 RMD160 6fe18553e876229e35cc84543207afd482ebe2d4 SHA1 62a48928761709620895886b7f9fd753b31e4f31 SHA256 7e2a4ffa236265c79bcd1af4d3ea199d4e9e60a46edc8c09b71c1a9a21c1e2cd
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sd.tar.gz 8175839 RMD160 54fe98ba25a20c3d84cda4e658ddb499c10d1fd9 SHA1 d69dcc3a33da8b0c8f60ecbd70b90cf97bce2ba9 SHA256 a5ac163091530c680c9619fe77f4e45c33ef88eb8d32068daa2abd47a14e97ec
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sh.tar.gz 2837396 RMD160 94bfb936898714c102220ae6a1fdc6d2a7e8ea7d SHA1 1e82502f51abb0699e86c1f5c4e2f28a2bc820da SHA256 15ef04383f7c4fd2ec18c7aa78f8966a8fc372f598703632a41e2135c51aee4c
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_si.tar.gz 8197290 RMD160 7f1aaebf0ad18e92fba4aa50b390f500ee1c8446 SHA1 b2a0f2984ba0328b4361e419018a64c3097b4f93 SHA256 ce54683281262f6bf8082b5bca45f2368d6d4a2cd2e6efcf2548855005fcf286
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sk.tar.gz 3025223 RMD160 a36831020cc1249da643858b97386f7fd133350a SHA1 4622dc02b3557000c6d3bccf872c0b81616f4519 SHA256 135aac3fd8cf3617ab5c953f80b368891271eec7c9313a30bf3f1c3ce962381d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sl.tar.gz 3180968 RMD160 71413cb76897124b2c55b4b1975a03759265d137 SHA1 116f02763ea28a21b19dd88b9d6c51ee868e49d5 SHA256 9876c925a5dd78c84eeb2af9385eefa2efd66ce848e50f5f17e7e0cf4011c09d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sq.tar.gz 8151725 RMD160 62b1d00ad2db3ec09be9c150449d3443ea8cbb9f SHA1 3a38819ae5e8def232e6849ff7a2560b8be99f95 SHA256 01efc8a6fa887b6f09bfae60d168accc11a20aa6486e87cc030b342181120574
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sr.tar.gz 2881349 RMD160 92d1d68fa59c077b9ee1ddac30257263ef592cb7 SHA1 ad58d82d4fba3f3a05dd7c47cca3ef2ec695c38b SHA256 e29c41ddb97395901cbf63749447ae05c1e994714682c520ff9080654dd56950
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ss.tar.gz 8157393 RMD160 59dc418ad3ce82d91474a06dc911938b3ce619c7 SHA1 d0b362a9318839b12e502241112efb89a2415eaf SHA256 570582fd572bc42672a3c2ecf57769e78383eccdc12686ac98ffaa6d19dcfb4a
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_st.tar.gz 8155730 RMD160 e91fad4c11eed0b2498f7f6ee95d527545aaa2f2 SHA1 89f0e96feb5c48a8039c1dfec4864a819007e67c SHA256 dc7620d1a1bda6ffe667835f3f85370c2a640f57dcd864943b6da80e82e72155
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sv.tar.gz 2264700 RMD160 a3de61b9aa50bda850dec8a527081cdb65a0fe60 SHA1 fdc2bf49822fed38a0673510449f8e7c9f6890fc SHA256 74719bb67f0e46e0b09787b791df714f5eb24ae38f22cebde9592c8910b78502
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_sw-TZ.tar.gz 8132546 RMD160 09f3b8ca77fb448e48f67792f4a871a200ae8e62 SHA1 129b2d4200e001c56ec31b5085a873bbf72b5150 SHA256 5db664553d36fdc967e4cf6cab14582f49bb0267cdfc7a40040a7f3cc25de69f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ta.tar.gz 8200096 RMD160 1b583972b80ba52df2119eb990593e47d8423ab9 SHA1 d7452e752bb9c39fd2266b54ae2fcb9279e7cf29 SHA256 58c23d2f1d9eb49f2dce7cf43888248049bd7ec5ec58c906ea3758770cc86fe2
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_te.tar.gz 2269572 RMD160 a852969ddebf9a1aa503001445a10d143a1d575c SHA1 1a44764aa5d596902367b6f06c0fc4c7a4169e01 SHA256 62f31d8e4bc9fa1d4446ca73311e1ce645a17565a4a2c8d0126259fa53cc4c3d
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_tg.tar.gz 8175950 RMD160 c4b5418006ff3fe4a19489c20412380a1936d970 SHA1 93b5e261f1d54220c7c42b4f2da546dffa13d7a1 SHA256 82eaa77898c64326618177a55fd23bc36b49e44a017a2535327f5828ea056139
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_th.tar.gz 1844608 RMD160 20b2958b771764f87d883fe93c3b758837c0ccaa SHA1 dd606eef5d13d414028b50b548647b04386d425d SHA256 53920d3adbee09eee3f31abb9dd343718b1df632f5757b1034606a32b9e95f53
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_tn.tar.gz 8142244 RMD160 3723b13af156d8da49c988ec000e70b4ccbb62a8 SHA1 7cffffbcd588a766b14d1e2aa85d649fb40ab9e0 SHA256 4b97b176efe795601f4d67b7793df1391d0533469dcf95d12f1b350c63617790
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_tr.tar.gz 8104139 RMD160 1837e3644bf665e5f6449e084b895fb1a9fc80e0 SHA1 495c3800e23e4169c632d784c154caefdaa8ac76 SHA256 ccac0da505e1ce351afa12fd19f60b67b17c4ca7af2b0c10dd622542a5c0a12a
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ts.tar.gz 8158171 RMD160 8482ebd8dff9d687f58852ba1f905ec7d4ecc87e SHA1 42b67be1ca630f28f24747fcadfa810a364a1dc2 SHA256 788f852a66835051abd334e340bb95c5fc9b14ed606b10abba77f1036a9c357f
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ug.tar.gz 8177460 RMD160 063939c7d9bc9c789d073d21ef7b557e024f2242 SHA1 84332164ef4653304b229621317e9cb5db61e9a2 SHA256 c1ade64de0864b90fa435e261ce49f6f3dfd53564b24f0b3b575b55c6f08cff3
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_uk.tar.gz 2524481 RMD160 0332a4e87a9eb82e634d20fccd9ce555827220a9 SHA1 4c01d36b60cb8ba1e95255a7d72611ed76af66f7 SHA256 2975a65cdf9ba0adff399e626128579959a5ea61c082687e051e415c791d5c14
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_uz.tar.gz 8143060 RMD160 4fa84296e05e04f64bef699a5c40e9ed3677a46a SHA1 b45fff64cb66ed6ae4b9e789e85beb2232ffd7f2 SHA256 72ed7ae835d7dbe3c1b1de3f6ee48668126128437778f5de31f6c99bcb61c348
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_ve.tar.gz 8161898 RMD160 619dfcb02bae8e9ffa3c414eca5204fc82764beb SHA1 5d52060e7d6e22c2f93ff717d194421a1e091c33 SHA256 ece74267d122007acee38ef6e1bc4125218b5fa89c7578f2ad94d3ff3353d679
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_vi.tar.gz 1811125 RMD160 303c3505c748ace19bab035cb9771a8fde1837a3 SHA1 929d5f0e7442636559390fcb573f7e2bb6b5e9eb SHA256 42b8bdee17488f4a078f126cc760768c877a49d75eada42d22c1858b41baa015
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_xh.tar.gz 8171961 RMD160 73c167530ed01cb7ecb6c75b0ca1f099952915c3 SHA1 cc8c005c803f3391a4c0572727a6d43f56f9d962 SHA256 a6fedbd283cb2159ad9300981252b53ce002a88e6d6b9d6d2f53514d5900fae0
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_zh-CN.tar.gz 1720546 RMD160 0e7408d3bddc91ed02b096d546af17791b4fcc4f SHA1 f4b0aa5178744bda517531a68e7774bd5c58132b SHA256 664a6e412a70f249e9a301618e5909f4925090347d4963478bbba25a83d7761c
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_zh-TW.tar.gz 1713703 RMD160 f0542f56bc213ba30cd155f1fb550d2a4729c80a SHA1 ddb0df6566dccc85eabe2c953666edafa5239c02 SHA256 ab10e47b68213acf53892d51b574f7a0a537234fe85db59d9c4c4fa61b804226
+DIST LibO_3.5.0beta0_Linux_x86_langpack-rpm_zu.tar.gz 1673775 RMD160 1fd50b18d2392b9cb666e21088a416b62812f39e SHA1 bdc177a1fac36ef9adbff84ca96035fe419d105f SHA256 9fbe042025f158472c58e54a4605a98fabdc6a0b12c6fb8a5438429ead31a627
DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
diff --git a/app-office/libreoffice-l10n/files/lo_gen_langs.sh b/app-office/libreoffice-l10n/files/lo_gen_langs.sh
index 6410ddc3f275..fb7ea408f49c 100644
--- a/app-office/libreoffice-l10n/files/lo_gen_langs.sh
+++ b/app-office/libreoffice-l10n/files/lo_gen_langs.sh
@@ -7,8 +7,8 @@
# Find l10n packs for libreoffice and format it for use in ebuilds.
#
-VERSION=${1:-3.4.5-rc2}
-BASE_SRC_URI="http://download.documentfoundation.org/libreoffice/testing/${VERSION}/rpm/x86"
+VERSION=${1:-3.4.4}
+BASE_SRC_URI="http://download.documentfoundation.org/libreoffice/stable/${VERSION}/rpm/x86"
# needs lxml
print_available_tarballs() {
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild
index 73bc3b3e149c..29bd9f13edfe 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild,v 1.7 2011/12/18 20:46:46 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild,v 1.6 2011/12/11 21:59:58 maekke Exp $
EAPI=4
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.libreoffice.org"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="offlinehelp"
LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..23ac35bdf535
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild,v 1.4 2011/11/14 07:44:35 scarabeus Exp $
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_PV="3.4.4" || MY_PV="${PV}"
+
+RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
+
+OO_EXTENSIONS=(
+ "472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+ "53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
+ "4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
+ "a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
+ "09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
+ "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
+)
+inherit rpm eutils versionator office-ext
+
+DESCRIPTION="Translations for the Libreoffice suite."
+HOMEPAGE="http://www.libreoffice.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS=""
+IUSE="offlinehelp templates"
+
+LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
+fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si
+sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
+ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
+st sw_TZ ta te th tn ts uz ve xh zu"
+
+for lang in ${LANGUAGES}; do
+ helppack=""
+ langpack=""
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
+ [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+ helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+ fi
+ [[ ${lang} == en ]] \
+ || langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+ SRC_URI+=" linguas_${lang}? (
+ ${langpack}
+ ${helppack}
+ )"
+ IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+# dictionaries
+SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
+nb nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DICTS} ; do
+ SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+RDEPEND="${SPELL_DICTS_DEPEND}"
+unset X SPELL_DICTS SPELL_DICTS_DEPEND
+
+# no need for iuse here as this needs to be written out and is subset
+# of lignuas anyway
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+TDEPEND=""
+for i in ${OO_EXTENSIONS[@]}; do
+ lingua=${i/_*.oxt/}
+ lingua=${lingua/*Pack-/}
+ if [[ ${lingua} == en-US ]]; then
+ TDEPEND+=" ${EXT_URI}/${i}"
+ else
+ TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
+ fi
+done
+SRC_URI+=" templates? ( ${TDEPEND} )"
+unset i lingua TDEPEND EXT_URI
+
+# blockers for old libreoffice with bundled linguas
+RDEPEND+="
+ !=app-office/libreoffice-3.4.9999-r1
+ !=app-office/libreoffice-9999-r1
+ || (
+ >=app-office/libreoffice-3.4.4.2-r1
+ >=app-office/libreoffice-bin-3.4.4.2-r1
+ )
+"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ default
+
+ local lang dir rpmdir i
+ local ooextused=()
+
+ for lang in ${LANGUAGES}; do
+ # break away if not enabled; paludis support
+ use_if_iuse linguas_${lang} || continue
+
+ dir=${lang/_/-}
+
+ # for english we provide just helppack, as translation is always there
+ if [[ ${lang} != en ]]; then
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ # First remove dictionaries, we want to use system ones.
+ rm -rf "${S}/${rpmdir}/"*dict*.rpm
+ rpm_unpack "./${rpmdir}/"*.rpm
+ fi
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
+ [[ ${lang} == en ]] && dir="en-US"
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ rpm_unpack ./"${rpmdir}/"*.rpm
+ fi
+ if use templates; then
+ for i in ${OO_EXTENSIONS[@]}; do
+ lingua=${i/_*.oxt/}
+ lingua=${lingua/*Pack-/}
+ if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
+ if [[ ! -f "${S}/${i}" ]]; then
+ cp -v "${DISTDIR}/${i}" "${S}"
+ ooextused+=( "${i}" )
+ fi
+ fi
+ done
+ fi
+ done
+ OO_EXTENSIONS=()
+ for i in ${ooextused[@]}; do
+ OO_EXTENSIONS+=( ${i} )
+ done
+}
+
+src_prepare() { :; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+ local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
+ # Condition required for people that do not install anything eg no linguas
+ # or just english with no offlinehelp.
+ if [[ -d "${dir}" ]] ; then
+ if [[ ${PV} == 9999 ]]; then
+ # starting with 3.5 this is in common dir
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/
+ else
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
+ fi
+ doins -r "${dir}"/*
+ fi
+
+ echo "${OO_EXTENSIONS[@]}"
+ office-ext_src_install
+}
+
+pkg_postinst() {
+ office-ext_pkg_postinst
+}
+pkg_prerm() {
+ office-ext_pkg_prerm
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4.ebuild
new file mode 100644
index 000000000000..80c76018404d
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4.ebuild,v 1.1 2011/11/10 20:35:58 scarabeus Exp $
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_PV="3.4.4" || MY_PV="${PV}"
+
+RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
+inherit rpm eutils versionator
+
+DESCRIPTION="Translations for the Libreoffice suite."
+HOMEPAGE="http://www.libreoffice.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
+fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si
+sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
+ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
+st sw_TZ ta te th tn ts uz ve xh zu"
+
+for lang in ${LANGUAGES}; do
+ helppack=""
+ langpack=""
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
+ [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+ helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+ fi
+ [[ ${lang} == en ]] \
+ || langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+ SRC_URI+=" linguas_${lang}? (
+ ${langpack}
+ ${helppack}
+ )"
+ IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+# dictionaries
+SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
+nb nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DICTS} ; do
+ SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+RDEPEND="${SPELL_DICTS_DEPEND}"
+unset X SPELL_DICTS SPELL_DICTS_DEPEND
+
+# blockers for old libreoffice with linguas bundled
+RDEPEND+="
+ !<=app-office/libreoffice-3.4.3.2
+ !=app-office/libreoffice-3.4.9999
+ !=app-office/libreoffice-9999
+ !<=app-office/libreoffice-bin-3.4.3-r1
+"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ default
+
+ local lang dir rpmdir
+
+ for lang in ${LANGUAGES}; do
+ # break away if not enabled; paludis support
+ use_if_iuse linguas_${lang} || continue
+
+ dir=${lang/_/-}
+
+ # for english we provide just helppack, as translation is always there
+ if [[ ${lang} != en ]]; then
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ # First remove dictionaries, we want to use system ones.
+ rm -rf "${S}/${rpmdir}/"*dict*.rpm
+ rpm_unpack "./${rpmdir}/"*.rpm
+ fi
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
+ [[ ${lang} == en ]] && dir="en-US"
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ rpm_unpack ./"${rpmdir}/"*.rpm
+ fi
+ done
+}
+
+src_prepare() { :; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+ local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
+ # Condition required for people that do not install anything eg no linguas
+ # or just english with no offlinehelp.
+ if [[ -d "${dir}" ]] ; then
+ if [[ ${PV} == 9999 ]]; then
+ # Bump me when it gets slotted ; also do revision bump
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/basis3.5/
+ else
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
+ fi
+ doins -r "${dir}"/*
+ fi
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild
deleted file mode 100644
index 82ce107cafe0..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild
+++ /dev/null
@@ -1,164 +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/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild,v 1.3 2012/01/16 11:53:47 ago Exp $
-
-EAPI=4
-
-MY_PV="3.4.5rc2"
-
-BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/3.4.5-rc2/rpm/"
-
-OO_EXTENSIONS=(
- "472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
- "53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
- "4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
- "a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
- "09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
- "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
-)
-inherit rpm eutils versionator office-ext
-
-DESCRIPTION="Translations for the Libreoffice suite."
-HOMEPAGE="http://www.libreoffice.org"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp templates"
-
-LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
-fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si
-sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
-LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
-ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
-st sw_TZ ta te th tn ts uz ve xh zu"
-
-for lang in ${LANGUAGES}; do
- helppack=""
- langpack=""
- if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
- [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
- helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
- fi
- [[ ${lang} == en ]] \
- || langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
- SRC_URI+=" linguas_${lang}? (
- ${langpack}
- ${helppack}
- )"
- IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2
-
-# dictionaries
-SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
-nb nl nn pl pt ru sk sl sv tn zu"
-for X in ${SPELL_DICTS} ; do
- SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
-done
-RDEPEND="${SPELL_DICTS_DEPEND}"
-unset X SPELL_DICTS SPELL_DICTS_DEPEND
-
-# no need for iuse here as this needs to be written out and is subset
-# of lignuas anyway
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-TDEPEND=""
-for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lingua} == en-US ]]; then
- TDEPEND+=" ${EXT_URI}/${i}"
- else
- TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
- fi
-done
-SRC_URI+=" templates? ( ${TDEPEND} )"
-unset i lingua TDEPEND EXT_URI
-
-# blockers for old libreoffice with bundled linguas
-RDEPEND+="
- !=app-office/libreoffice-3.4.9999-r1
- !=app-office/libreoffice-9999-r1
- || (
- >=app-office/libreoffice-3.4.4.2-r1
- >=app-office/libreoffice-bin-3.4.4.2-r1
- )
-"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_unpack() {
- default
-
- local lang dir rpmdir i
- local ooextused=()
-
- for lang in ${LANGUAGES}; do
- # break away if not enabled; paludis support
- use_if_iuse linguas_${lang} || continue
-
- dir=${lang/_/-}
-
- # for english we provide just helppack, as translation is always there
- if [[ ${lang} != en ]]; then
- rpmdir="LibO_${MY_PV}_Linux_x86_langpack-rpm_${dir}/RPMS/"
- [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
- # First remove dictionaries, we want to use system ones.
- rm -rf "${S}/${rpmdir}/"*dict*.rpm
- rpm_unpack "./${rpmdir}/"*.rpm
- fi
- if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
- [[ ${lang} == en ]] && dir="en-US"
- rpmdir="LibO_${MY_PV}_Linux_x86_helppack-rpm_${dir}/RPMS/"
- [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
- rpm_unpack ./"${rpmdir}/"*.rpm
- fi
- if use templates; then
- for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
- if [[ ! -f "${S}/${i}" ]]; then
- cp -v "${DISTDIR}/${i}" "${S}"
- ooextused+=( "${i}" )
- fi
- fi
- done
- fi
- done
- OO_EXTENSIONS=()
- for i in ${ooextused[@]}; do
- OO_EXTENSIONS+=( ${i} )
- done
-}
-
-src_prepare() { :; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
- local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
- # Condition required for people that do not install anything eg no linguas
- # or just english with no offlinehelp.
- if [[ -d "${dir}" ]] ; then
- if [[ ${PV} == 9999 ]]; then
- # starting with 3.5 this is in common dir
- insinto /usr/$(get_libdir)/${PN/-l10n/}/
- else
- insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
- fi
- doins -r "${dir}"/*
- fi
-
- echo "${OO_EXTENSIONS[@]}"
- office-ext_src_install
-}
-
-pkg_postinst() {
- office-ext_pkg_postinst
-}
-pkg_prerm() {
- office-ext_pkg_prerm
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..98d57d792346
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r1.ebuild,v 1.1 2011/12/09 18:39:34 scarabeus Exp $
+
+EAPI=4
+
+MY_PV="3.5.0beta0"
+
+RC_VERSION="" # CHECK ME WITH EVERY BUMP!
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/3.5.0-beta0/rpm"
+
+OO_EXTENSIONS=(
+ "472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+ "53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
+ "4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
+ "a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
+ "09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
+ "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
+)
+inherit rpm eutils versionator office-ext
+
+DESCRIPTION="Translations for the Libreoffice suite."
+HOMEPAGE="http://www.libreoffice.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp templates"
+
+LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
+fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si
+sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
+ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
+st sw_TZ ta te th tn ts uz ve xh zu"
+
+for lang in ${LANGUAGES}; do
+ helppack=""
+ langpack=""
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
+ [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+ helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+ fi
+ [[ ${lang} == en ]] \
+ || langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+ SRC_URI+=" linguas_${lang}? (
+ ${langpack}
+ ${helppack}
+ )"
+ IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+# dictionaries
+SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
+nb nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DICTS} ; do
+ SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+RDEPEND="${SPELL_DICTS_DEPEND}"
+unset X SPELL_DICTS SPELL_DICTS_DEPEND
+
+# no need for iuse here as this needs to be written out and is subset
+# of lignuas anyway
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+TDEPEND=""
+for i in ${OO_EXTENSIONS[@]}; do
+ lingua=${i/_*.oxt/}
+ lingua=${lingua/*Pack-/}
+ if [[ ${lingua} == en-US ]]; then
+ TDEPEND+=" ${EXT_URI}/${i}"
+ else
+ TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
+ fi
+done
+SRC_URI+=" templates? ( ${TDEPEND} )"
+unset i lingua TDEPEND EXT_URI
+
+# blockers for old libreoffice with bundled linguas
+RDEPEND+="
+ !=app-office/libreoffice-3.4.9999-r1
+ !=app-office/libreoffice-9999-r1
+ || (
+ >=app-office/libreoffice-3.4.4.2-r1
+ >=app-office/libreoffice-bin-3.4.4.2-r1
+ )
+"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ default
+
+ local lang dir rpmdir i
+ local ooextused=()
+
+ for lang in ${LANGUAGES}; do
+ # break away if not enabled; paludis support
+ use_if_iuse linguas_${lang} || continue
+
+ dir=${lang/_/-}
+
+ # for english we provide just helppack, as translation is always there
+ if [[ ${lang} != en ]]; then
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ # First remove dictionaries, we want to use system ones.
+ rm -rf "${S}/${rpmdir}/"*dict*.rpm
+ rpm_unpack "./${rpmdir}/"*.rpm
+ fi
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
+ [[ ${lang} == en ]] && dir="en-US"
+ rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+ rpm_unpack ./"${rpmdir}/"*.rpm
+ fi
+ if use templates; then
+ for i in ${OO_EXTENSIONS[@]}; do
+ lingua=${i/_*.oxt/}
+ lingua=${lingua/*Pack-/}
+ if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
+ if [[ ! -f "${S}/${i}" ]]; then
+ cp -v "${DISTDIR}/${i}" "${S}"
+ ooextused+=( "${i}" )
+ fi
+ fi
+ done
+ fi
+ done
+ OO_EXTENSIONS=()
+ for i in ${ooextused[@]}; do
+ OO_EXTENSIONS+=( ${i} )
+ done
+}
+
+src_prepare() { :; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+ local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/
+ # Condition required for people that do not install anything eg no linguas
+ # or just english with no offlinehelp.
+ if [[ -d "${dir}" ]] ; then
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/
+ doins -r "${dir}"/*
+ fi
+
+ echo "${OO_EXTENSIONS[@]}"
+ office-ext_src_install
+}
+
+pkg_postinst() {
+ office-ext_pkg_postinst
+}
+pkg_prerm() {
+ office-ext_pkg_prerm
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r2.ebuild
deleted file mode 100644
index 48b3ec2d4f5f..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,160 +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/libreoffice-l10n/libreoffice-l10n-3.5.0-r2.ebuild,v 1.1 2012/01/11 12:06:26 scarabeus Exp $
-
-EAPI=4
-
-MY_PV="3.5.0beta2"
-
-RC_VERSION="" # CHECK ME WITH EVERY BUMP!
-BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/3.5.0-beta2/rpm"
-
-OO_EXTENSIONS=(
- "472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
- "53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
- "4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
- "a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
- "09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
- "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
-)
-inherit rpm eutils versionator office-ext
-
-DESCRIPTION="Translations for the Libreoffice suite."
-HOMEPAGE="http://www.libreoffice.org"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp templates"
-
-LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
-fi fr gl gu he hi hr hu id is it ja ka km ko lb mk nb ne nl nn om pl pt_BR pt
-ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
-LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
-ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
-st sw_TZ ta te th tn ts uz ve xh zu"
-
-for lang in ${LANGUAGES}; do
- helppack=""
- langpack=""
- if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
- [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
- helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO-Dev_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
- fi
- [[ ${lang} == en ]] \
- || langpack=" ${BASE_SRC_URI}/x86/LibO-Dev_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
- SRC_URI+=" linguas_${lang}? (
- ${langpack}
- ${helppack}
- )"
- IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2
-
-# dictionaries
-SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
-nb nl nn pl pt ru sk sl sv tn zu"
-for X in ${SPELL_DICTS} ; do
- SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
-done
-RDEPEND="${SPELL_DICTS_DEPEND}"
-unset X SPELL_DICTS SPELL_DICTS_DEPEND
-
-# no need for iuse here as this needs to be written out and is subset
-# of lignuas anyway
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-TDEPEND=""
-for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lingua} == en-US ]]; then
- TDEPEND+=" ${EXT_URI}/${i}"
- else
- TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
- fi
-done
-SRC_URI+=" templates? ( ${TDEPEND} )"
-unset i lingua TDEPEND EXT_URI
-
-# blockers for old libreoffice with bundled linguas
-RDEPEND+="
- !=app-office/libreoffice-3.4.9999-r1
- !=app-office/libreoffice-9999-r1
- || (
- >=app-office/libreoffice-3.4.4.2-r1
- >=app-office/libreoffice-bin-3.4.4.2-r1
- )
-"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_unpack() {
- default
-
- local lang dir rpmdir i
- local ooextused=()
-
- for lang in ${LANGUAGES}; do
- # break away if not enabled; paludis support
- use_if_iuse linguas_${lang} || continue
-
- dir=${lang/_/-}
-
- # for english we provide just helppack, as translation is always there
- if [[ ${lang} != en ]]; then
- rpmdir="LibO-Dev_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
- [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
- # First remove dictionaries, we want to use system ones.
- rm -rf "${S}/${rpmdir}/"*dict*.rpm
- rpm_unpack "./${rpmdir}/"*.rpm
- fi
- if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
- [[ ${lang} == en ]] && dir="en-US"
- rpmdir="LibO-Dev_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
- [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
- rpm_unpack ./"${rpmdir}/"*.rpm
- fi
- if use templates; then
- for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
- if [[ ! -f "${S}/${i}" ]]; then
- cp -v "${DISTDIR}/${i}" "${S}"
- ooextused+=( "${i}" )
- fi
- fi
- done
- fi
- done
- OO_EXTENSIONS=()
- for i in ${ooextused[@]}; do
- OO_EXTENSIONS+=( ${i} )
- done
-}
-
-src_prepare() { :; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
- local dir="${S}"/opt/lodev$(get_version_component_range 1-2 ${MY_PV})/
- # Condition required for people that do not install anything eg no linguas
- # or just english with no offlinehelp.
- if [[ -d "${dir}" ]] ; then
- insinto /usr/$(get_libdir)/${PN/-l10n/}/
- doins -r "${dir}"/*
- fi
-
- echo "${OO_EXTENSIONS[@]}"
- office-ext_src_install
-}
-
-pkg_postinst() {
- office-ext_pkg_postinst
-}
-pkg_prerm() {
- office-ext_pkg_prerm
-}
diff --git a/app-office/libreoffice-l10n/metadata.xml b/app-office/libreoffice-l10n/metadata.xml
index 629e2faea6c7..9cbcc3910f9b 100644
--- a/app-office/libreoffice-l10n/metadata.xml
+++ b/app-office/libreoffice-l10n/metadata.xml
@@ -1,7 +1,6 @@
- maintainer-needed@gentoo.org
openoffice
Install help files locally instead of using the LibreOffice Wiki
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 39b88a8ca191..ce52bf1bad2f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -75,66 +75,67 @@ DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a0
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
+DIST libreoffice-3.4.4.2-patchset-01.tar.xz 3576 RMD160 6a2bea02a549661d03d68febe650e929a273ceb9 SHA1 85bfeefad25ffa99beb7620125b33ec91a94295a SHA256 c3bf80e40a21ff436f4b9e9f45aab8e4ea1e0ddf2dd99202d513e2db1a7e5853
DIST libreoffice-artwork-3.3.4.1.tar.bz2 21989297 RMD160 7700b89bebbf299697fb4420ec3091f107fcca25 SHA1 9dd17d8934c1efa8f14727b8513b51b25f82aebc SHA256 d20f6da3a4c5d81816c401ca673eb151069f38277a9805dd6a36a9074d7f1fda
DIST libreoffice-artwork-3.4.3.2.tar.bz2 13537796 RMD160 26c74962452a3be0258f9417bea66c50b9e9fc80 SHA1 a42d6a44c3b3605cea49c66162507adec5c1f246 SHA256 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743
-DIST libreoffice-artwork-3.4.5.2.tar.bz2 13537659 RMD160 8e5417f4c8f05bca842cddb7384b2b3bdd941cb7 SHA1 fed4688e3ecdf44b760a27f4edd11630ba99adfd SHA256 382c746c92988041010d521fd5969c013ff8b31233900062dff729c0a50d7107
+DIST libreoffice-artwork-3.4.4.2.tar.bz2 13539032 RMD160 e16be6bca3824198cbc66366aafa28878a7bc490 SHA1 ceb591a97a5132cf50756dffac974c76d9f535bd SHA256 b30265ed7b30fa87eee4677521b414984d41c2a9766364a624c623fffba4aae9
DIST libreoffice-base-3.3.4.1.tar.bz2 2083238 RMD160 a0ea708e67d47d010c7e390b373c78d93eda6e9f SHA1 d5b0d91a6a9fe17930b587c5e42309f52d09095f SHA256 029c2cde055ff2b8e3432f292c565dba6fd1e023cdd39fc9478635cedf006d1e
DIST libreoffice-base-3.4.3.2.tar.bz2 2068714 RMD160 c689762bd2a5a6bc46efe701c85b798bd01ef248 SHA1 88f1531b11ac49f8bd9c0e70e08b38a7b0aae411 SHA256 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa
-DIST libreoffice-base-3.4.5.2.tar.bz2 2070005 RMD160 432cb53d1becd8e3ebf371f3224afa57899fe71e SHA1 d07f93434055981a9c320912b24966c322b9d536 SHA256 9f9b7ae788a8249ccbcaca0ba2155cd91f76367cbaf3e1ad063f8e61b3d7b938
-DIST libreoffice-binfilter-3.5.0.1.tar.xz 5974864 RMD160 729c8f62f832c6769ea43972e0b1fa97a5c59798 SHA1 eb479ebd8c58a931078cc9a1e3606f96e4e992b8 SHA256 be8ebec851ba7fc02e3115a51ccae83174b92a8e61be2e983ba7f45ec4fedc90
+DIST libreoffice-base-3.4.4.2.tar.bz2 2069793 RMD160 83ea70980d99e1d706bd2f37ad6cccfd9f5e2453 SHA1 00d6f941b379925814266ffa1d4b015ccf1d8292 SHA256 92dab1cb9efe2c023a3f9648e0a5eb52c00bb75376a5341c10fc52a4184cdc2c
+DIST libreoffice-binfilter-3.4.99.1.tar.xz 5972748 RMD160 bce02ed49768418c1578cd48de20dbdfc43ce381 SHA1 cd5a05b3b5a28fd87b1d21f956939b9da776f433 SHA256 19a00b79f8f31906d369efd90bb066641ea09e0d8c069fbd013a1e722a15593d
DIST libreoffice-bootstrap-3.3.4.1.tar.bz2 2753537 RMD160 6348b4b121159aa74a1b4e9c03f34cc5533a3d72 SHA1 4c7b5b105c29eb5e9dafc8ee59b4f306187f664d SHA256 a83cc7be2211c1dd03f49e1e9c54895852e732e291022c8022470cd057b9b2c6
DIST libreoffice-bootstrap-3.4.3.2.tar.bz2 2711992 RMD160 5ded24c90e34306a0ae0d5d97578638098879351 SHA1 527db77912dd3c5f41916ad0db8405325f37c621 SHA256 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
-DIST libreoffice-bootstrap-3.4.5.2.tar.bz2 2715464 RMD160 d2b2fadac07507878a6bbed9801384dc25f4e874 SHA1 cc5c1ceb6ae9525a8ee89c0b08da958a420e85c0 SHA256 a9a3f223046d57002f0b76b0c04c07398a77bbc85acb445faea6e6d6a637bf17
+DIST libreoffice-bootstrap-3.4.4.2.tar.bz2 2715038 RMD160 78955bd82577d2b1a5342b7f30d0541a9d22b4c8 SHA1 3062bb92ae60db0ea333805b3592b2da45329680 SHA256 7e4477795b535656b1f8853a439e74d91a035ff8958d307cbb42c38f209fb548
DIST libreoffice-branding-gentoo-0.3.tar.xz 130776 RMD160 acb76ddfd77d9c3093f5da229b9d6703831a97b5 SHA1 12afad81a77bccbaadf5a6a11d6a58d70003432e SHA256 34882717b5cc7e1fbc672e6924b92bb6d5def850209b957003f1e517f08d5598
DIST libreoffice-build-3.3.4.1.tar.gz 14608524 RMD160 014b86686a28830b445131b5466cc7094721eabf SHA1 20df109e25b91f89ddf40af3d198838cd372b2c2 SHA256 dd6e15ac00ba34b4c45bdb39a3d09bca34a442c5c22c103d76f595eab0aaea1d
DIST libreoffice-calc-3.3.4.1.tar.bz2 9407748 RMD160 7092b6f2e4736a5d02e9d5bc47275655cc34b093 SHA1 94b021273a1d1947b21286ddc6e7e5d77c78b8d2 SHA256 7cb99233e7c268d1f8854c1403bdd3c07cc043ff55fdaa6705342803a47f7c33
DIST libreoffice-calc-3.4.3.2.tar.bz2 9521313 RMD160 3233a1d112fdb581121ac5f41f3493906eae7863 SHA1 03028d84c98c35a068f0edd3f65556cc5be80f53 SHA256 05f543b5a47511f789cd30fc74ba31cdd0074a4fe7a9bc91e9dd5ab969583335
-DIST libreoffice-calc-3.4.5.2.tar.bz2 9519567 RMD160 25114e5c9d2206879c4a89360a1fa74d84f71444 SHA1 400e1b7c34e91b9a87391464b1968007d3acc378 SHA256 31f94e9cfca6edc17e62d822349ed5bda8fed93af83c5c651835e92031f000d0
+DIST libreoffice-calc-3.4.4.2.tar.bz2 9513923 RMD160 697ed0b1020eb2c63603bf19d568219dd3b67a25 SHA1 b8f5f703073f823ffc12073d79e9bd0db098cb82 SHA256 d65562e02bacaef368bef4e4e107933b4fa743e9ada17c9147a22255853d7a0b
DIST libreoffice-components-3.3.4.1.tar.bz2 5124325 RMD160 bbd98b77d4b9db5d948526d65f54e3479a9b33a3 SHA1 9ca1d2ad9211cf7df0834f764af28c8e88060f0f SHA256 bb9651370ee239a6fe0f4b52d5b6d3b84aafad64dcf1ccfcb655efb782599fb6
DIST libreoffice-components-3.4.3.2.tar.bz2 5094591 RMD160 ab3a2cd16340931a124e3d0e783c938a5357f5f9 SHA1 492a0b25128a34c4d75df5ef7b3b5e997c24cf31 SHA256 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
-DIST libreoffice-components-3.4.5.2.tar.bz2 5089571 RMD160 c3b01fdb7cf81ae01dc41dc44333e68822423682 SHA1 888f3c77f7c3fd62fcfc0d8eca182de55dfd56f5 SHA256 a2c0f819ca06c6fd82645920cdfb5c614dadcbd934a11864e706806e00f506eb
-DIST libreoffice-core-3.5.0.1.tar.xz 102813096 RMD160 93c71815c0995bb8667c329f64634d84f08429d0 SHA1 175a8a8974a7fbe78332e635ae7dde4d17e60f51 SHA256 5f71d273e087e2fec18094fe2dedf43386a64a3bfa5c28f37646a6d76cba481d
+DIST libreoffice-components-3.4.4.2.tar.bz2 5095697 RMD160 00b8b3ef13d1c81d60368a7d428a53cb635b4e44 SHA1 36db0c37bb32a52ecc727abbc348b719fe40cdf7 SHA256 d06141b0e078b609406b82db64599618bb7b93efa7841034f4a6cf441a0b442b
+DIST libreoffice-core-3.4.99.1.tar.xz 126857440 RMD160 4981a19752f905c7a8555dd7ca8b30a29180c7b1 SHA1 95c3f16f86652b8f17887c8565f58ac488356f90 SHA256 ca24ea540a4142425289c75dcc830c48dc636d43a314834db2cd4ed7e5ef9fe9
DIST libreoffice-extensions-3.3.4.1.tar.bz2 4202033 RMD160 1db3d06fcfd6354345e394ddf78f2cae6e0e5573 SHA1 8fbac20fa87e348ad07dc245f48f09ee539d7d80 SHA256 65c4540bd958a5f4dbf5875659d83e40a3d5542aa0cfde7f0f03e5000d16f241
DIST libreoffice-extensions-3.4.3.2.tar.bz2 4216448 RMD160 07932f5fa49cf32a0efda440cdb074c6ade97f35 SHA1 ca3257362b8b861e7358afe11bc0831739c83f41 SHA256 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d
-DIST libreoffice-extensions-3.4.5.2.tar.bz2 4219897 RMD160 c641e4530360ac6eb02c570469a7c675f620ba0c SHA1 cf6fe1fa7fcd0f4f7f79fe6b318c90ef510b6103 SHA256 ff6c6bbc78e21277a10fdf3e3feddb425368621f7aa2fd288738d19d609ab0a3
+DIST libreoffice-extensions-3.4.4.2.tar.bz2 4219139 RMD160 43833d5d01d85b7ea0f3039e327fde8a4b7f76d4 SHA1 8eb5895ba78ed13bed144fcef5933f36d38d3fcd SHA256 ff07833ecb59a15cd3aa1e0c74e59fb985e5aae9d7285679e25ed96bbc3fefed
DIST libreoffice-extras-3.3.4.1.tar.bz2 38706682 RMD160 a9d280e5d6a56b7816b4abb1202a8cc08ec27ac0 SHA1 795058c4bd92f8267e34f6df72eeae6514cabe65 SHA256 f8d5a6fcfa5a19973ca3ec62553d259e4522d2e4b82ea48766495150ec39cb3b
DIST libreoffice-extras-3.4.3.2.tar.bz2 38643532 RMD160 e366822a0a56d130c0b99258ef52934a16fdc67a SHA1 3d532cb1d261306e0a83a213099779042f57a8c4 SHA256 3f4fe22ddf23e9e368e9145fd00cf9bc6de6e19539dfc1f818fde93426fda159
-DIST libreoffice-extras-3.4.5.2.tar.bz2 38643665 RMD160 e45107602eac56b5dc3ee1842c668abc1a8bcfcb SHA1 9d53b582533eb3f883f51ca3e39a4183bfce1dc5 SHA256 5b225c6efa62c3f4b929def8345e9dc3b8a72a48e885a89593f743a32c18b57f
+DIST libreoffice-extras-3.4.4.2.tar.bz2 38643643 RMD160 150dec9a77d4392c0c3511cd1755f1a81fc98bd7 SHA1 f494cf9a33b29ca1e9f08d99da6af281cb6f9405 SHA256 cf279f63aaf9fed525a1fc73923800cb6b202f4484d91d97f8b4fb5a7aebc5c8
DIST libreoffice-filters-3.3.4.1.tar.bz2 11952128 RMD160 2859a3aac56820fc17531bf1baadea7eacffe67c SHA1 dacae4855dc5329517a3f0988fb51037df39f3c0 SHA256 f9aef5149d34e3812b62b8d6e45afb1fbc77d14be686489377d4b8608e975329
DIST libreoffice-filters-3.4.3.2.tar.bz2 11779881 RMD160 f5bf02edb2dc127b95de13d08af27d9d6643117c SHA1 4257c992742e3f2e346082f61dac86883576691b SHA256 2a12e9afa38f8d82419418c4c7443e47cc3cc39f78d5c2dc22bc61123b35dbe1
-DIST libreoffice-filters-3.4.5.2.tar.bz2 11780568 RMD160 ed09717dbe24763e1dd1bd2754dc4b681df8a223 SHA1 c075577eff89b68aa32d70d847ef9cf2052997ae SHA256 86d075b12f55c44fcd42e8ee8579da886feb887a2660953503a3a4b115ee5800
+DIST libreoffice-filters-3.4.4.2.tar.bz2 11777005 RMD160 cb7e3002bba5e94152ac117323140c71894f4807 SHA1 0143010efa59a71362910e400da4ce0a6693ed17 SHA256 d004f87f8b7b14f8552b2aeb9fba2442e506e8e9c760f2b2683f349cd926e29d
DIST libreoffice-help-3.3.4.1.tar.bz2 1929042 RMD160 f07e9dc9a2d9e96e2f2ec4ba00292930417ce071 SHA1 b14c2106f3e714cc9953a2245bcb2c00ef253952 SHA256 e0e56cae62af05819b9a16c4a65d336ce6b73b37454716b4c6efeea44c467617
DIST libreoffice-help-3.4.3.2.tar.bz2 1846706 RMD160 dd5fe51add1393c0c4f14e3a77aa88abffcf33ef SHA1 c80b24bb4e0cbbd62df05445ff56ecff66bee892 SHA256 013a21f3a22e39782af784213efda43ebe4f38882932267b009ec745f32cff23
-DIST libreoffice-help-3.4.5.2.tar.bz2 1845841 RMD160 c6cdbfc1076db6e3bd8ee108292bd08f41d7408f SHA1 c1328f46ce0a2618c09ee89cd288f6139e5c658f SHA256 186b9cc154d19f600ea314f37ffebd00922e69c07818aea5f0bab671fec7faa9
+DIST libreoffice-help-3.4.4.2.tar.bz2 1845778 RMD160 668ff986cd27fc8ec4a691fd890a9db1820e0dfc SHA1 384b2ffd104a5c3945dbbfce018726af3017d3ad SHA256 f9f65d8bd5733dc039f76548502aa995a95dddab7ef27b3b5e1e2291d0d65c4c
DIST libreoffice-impress-3.3.4.1.tar.bz2 2606301 RMD160 9f08fd75b2e924aedca95b92aebd3ed02249d962 SHA1 504837993123375cde0beef79b22e1cc4bf06de2 SHA256 5f0e69050a33bccb97e7adcd87d3929c5e99bf23d736d42e970e5ad5aa2e550b
DIST libreoffice-impress-3.4.3.2.tar.bz2 2651830 RMD160 b0c30c2981eede69ae7236887fda5ab6de74dca1 SHA1 4ec720570088250d49ddce1fde3b5d9248c8a67c SHA256 09114924804a876d41f971cfd6a2bf440df8ff79c97ebfe6698e74e7d39d87c0
-DIST libreoffice-impress-3.4.5.2.tar.bz2 2651854 RMD160 7c9ee52c0669cc068e0ebed0fb640ecdca280d5e SHA1 b0457d737d153ef02ac01b477526580316b22779 SHA256 0391df3e70b947804a0cdbb638ab61f09a934ac58f7c90a972b31dca495f6a47
+DIST libreoffice-impress-3.4.4.2.tar.bz2 2652247 RMD160 e4a44bfe23972521e701b8bf96c2a3c9ada2f02e SHA1 b464e7e8c5511990249174a707bae598da496037 SHA256 9bcfdd5eb75f050c8c04c6fd4bdb52de8bbaca7225733f4195bae08178ce148d
DIST libreoffice-l10n-3.3.4.1.tar.bz2 80831453 RMD160 785334782dc365a347f6239cb057d44d284f6f3a SHA1 eeb6ed70aa916dc18e8ffa17151c2e284bd31850 SHA256 1ada47d71b2097da53e5ec899c3df507de9a2dab99b9000c5f1187439ad7a962
DIST libreoffice-libs-core-3.3.4.1.tar.bz2 16655434 RMD160 72d20414af08e4e0733ef93dea353af05ea6534b SHA1 398ff53d290e43966a200c846d2b885108ccd52b SHA256 3fce50df4a0ea73929074941951202c6ad6159164cafbe33ea2640a7a943a2f0
DIST libreoffice-libs-core-3.4.3.2.tar.bz2 15592792 RMD160 16745ba1a1e61c84e26a770aa280ad2d4f0778df SHA1 ae65769b646b29b1cbaa69218ca016dea5f66bec SHA256 714001111ffacd69485676bec34d35a42e7440fe0b166cb5268e74d5ee32c858
-DIST libreoffice-libs-core-3.4.5.2.tar.bz2 15596849 RMD160 7f5c3cf297bd78928553f82917e79591934049ce SHA1 847909218c90e91529c95b9592e5a6d0d4f93090 SHA256 8bec5d81989bb9fe5d9e88252666d91c106b6ac334cb3c638f31140751699c2e
+DIST libreoffice-libs-core-3.4.4.2.tar.bz2 15594335 RMD160 bd2c0e421877f1644d8ce9e59c46446b872b4a19 SHA1 2ffe45be627269fcd02c402db3aaa3c1124cab9f SHA256 0b2f353ba01336870acf49e9f21fca129fc3daf5a97e0c91d05f8eaa7bcee032
DIST libreoffice-libs-extern-3.3.4.1.tar.bz2 629156 RMD160 962ad0981318e884bfc98ff930125644c2f0284b SHA1 379c5e2079d8614c56180aa4426ef8431871ac65 SHA256 5d6d831006c50ab4d88c5714fa5013acc7e4a24783ed0d2026373c75b161a3eb
DIST libreoffice-libs-extern-3.4.3.2.tar.bz2 637830 RMD160 ae5410966d86831f4d4ac1dcf42842bc7f98e9dc SHA1 23144f3cc33717e44d2f4caf06c5ca351f724bdf SHA256 681316cafbff67093ac93fa3803117219e80e3d3191c312f53129cf1a0e159c8
-DIST libreoffice-libs-extern-3.4.5.2.tar.bz2 638269 RMD160 e3d173ce2047fa418d7a4fbf27ee64cd2490abeb SHA1 f64b87e653d598b208244df937575ce556a68da4 SHA256 7ae02ea50b8b8325778e01633c2d148a074f05ad5f4713d13a0a01e9a41b9505
+DIST libreoffice-libs-extern-3.4.4.2.tar.bz2 638337 RMD160 e55d9a240ef5ea1ab3f7a237749703fd1e833242 SHA1 5d485573d4428d47f2a3d62d69ae5a7b6c84b417 SHA256 ae14e78269ae37651f1e4284d56330d72114c22d37eb4d38e47dbb631fdfeb67
DIST libreoffice-libs-extern-sys-3.3.4.1.tar.bz2 38822907 RMD160 ee4d4cfa7f52932451558b9e99c7393d7c41c083 SHA1 b7eb3070a986941c8b9da5daef7da0f601cfdc70 SHA256 a7fccb82d88b61a999a632fad1d6bce2207167dd506100d5a48b1b40b5aaf204
DIST libreoffice-libs-extern-sys-3.4.3.2.tar.bz2 40030519 RMD160 d3fddb187baf995ab5a3bd6d998c9d6ff6115db1 SHA1 242fb62a076edd1cbbf8ed6ad58e438cdd4cd687 SHA256 d6086fac838167c733e135ecde70807ade4bed21687d6740d2d7a66ca7ee84ee
-DIST libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 40048456 RMD160 112147769cf60649a3091d336d023d267b83be8c SHA1 fe030d389eade869dfaca405b9c3ee20569577e1 SHA256 0052c8879f61404725e05cc22782984adb69328f1f6ff75384ed426aabb14894
+DIST libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 40034592 RMD160 d3150b71e100fd5ee118ae8ff25481ee301aaa7b SHA1 88d95a4336611f2dd66c3ac52cc5c84f00cfdf93 SHA256 0724e4317abd9ab77b56940a51da575e7c79cd28807a36f4d3c4ee749a36c2d0
DIST libreoffice-libs-gui-3.3.4.1.tar.bz2 10834251 RMD160 5bc3d2d828c03250930e19a9e26cc16b93dda8a3 SHA1 526bb57d2ef6c079c13d0e2bed051d585a653737 SHA256 edbf4c29e89500cd0add21379fd9e150842e1539401633ec29b66939128c71f2
DIST libreoffice-libs-gui-3.4.3.2.tar.bz2 10866411 RMD160 7f181ae1c1529963045b3d38002c46aa7d61742e SHA1 1bcdc59d55aab2023dc3242e32b5bdd1cb0a5ffb SHA256 9ae7e7092f4055bab2f3285cbfc388730caa91ab38af4307482906bd6c983ab6
-DIST libreoffice-libs-gui-3.4.5.2.tar.bz2 10866264 RMD160 6557e8d0e9dc451cd70e8764cf444eb7760fe8e0 SHA1 36a6a0d5222676f46242636ea713e15e09066af5 SHA256 99c18b9b9e7ff3ac99cd918dd238e9874781b432bc19d279766b4a2fa2463672
+DIST libreoffice-libs-gui-3.4.4.2.tar.bz2 10865441 RMD160 c570091e70ce20b424272d1b61df978a7976e8ec SHA1 80691d8a75de69ff35673077bbee7561c22db73b SHA256 6073ee58680a30c3625003914fc8e4ab9bb62b34a67757916f788f17b199134b
DIST libreoffice-postprocess-3.3.4.1.tar.bz2 43045 RMD160 de6e35c4f89cea80bdccb85548e1521619efeff6 SHA1 ea51f2022f03fa5cc6b7e7c57866902430cd0d1f SHA256 1331b08e97002d41d89a2438fddea038e84c2a1fe40949c6bce0f9162fed112e
DIST libreoffice-postprocess-3.4.3.2.tar.bz2 50913 RMD160 3a7b1976272fdcc5f209354effb89ca9c7e43b8c SHA1 fda94d598ac5e0f286b3ff43f290e151f5fd5389 SHA256 5066d9c3dc631e182f150c372a806b30f5428d39c7d7358a4beeec3f8065e6c2
-DIST libreoffice-postprocess-3.4.5.2.tar.bz2 50952 RMD160 a7795b898bf007f251df25e44c374bea89b2449f SHA1 26ba7ecd2cc36b741bee963b56640659ca41c63f SHA256 d7badba4b2c5bdc93b4aab62232c027c9f60f9e2a7a1ee5a1e72bbdc82c757e7
+DIST libreoffice-postprocess-3.4.4.2.tar.bz2 50884 RMD160 625ef2be0053c266b841ccf7693548fb613daf82 SHA1 701289d5cc406671f2097be4ef3013a8f2152c52 SHA256 ca7b3e50408065e2cdcf0892be566b0ccd59b5ff5ae1059e47069a8156402764
DIST libreoffice-sdk-3.3.4.1.tar.bz2 1710835 RMD160 78e95d956a890ac3abf016886f1405564afde668 SHA1 7c7e914eee4f1296e3fa51f63de831133f0fb8fc SHA256 b6b56a3ce6ce1bf55d7f97b9039c28afd994a28106fa882d849b05dc247516e1
DIST libreoffice-sdk-3.4.3.2.tar.bz2 1721285 RMD160 beb624a2bac03cf546c371c7356bdb7af8e68d52 SHA1 5859c05f15497c7b9539e43138bcd706a418b140 SHA256 fa540938fd9526bd242c2e46db813f679a0261914e4feed214763618f82ab34a
-DIST libreoffice-sdk-3.4.5.2.tar.bz2 1720970 RMD160 3cb67cc0673fc7b29abd4d4eb7173e7a87bd643b SHA1 c8d520904cb8c0756ce0d878b5d4bbd0af1735b8 SHA256 fce5074dee1c50f3f93886caac62c2f711d17798b110fa088b3a71550eda31b9
+DIST libreoffice-sdk-3.4.4.2.tar.bz2 1721685 RMD160 3de33833261337de725a4055582b2bff5b03f557 SHA1 2c28a2d3914aba39584b87a1201b1acb4dc69e1b SHA256 3ea5d0dda904da30a53d3b68065e4ccb5f233c6b4c60fbae024dd85f5ea382bb
DIST libreoffice-testing-3.3.4.1.tar.bz2 50947859 RMD160 3a95e68a6430a5cd2432e7644e79776e00a9275a SHA1 4ae0faff80df62950e57dbb626a4ac3a8f06cdbc SHA256 3282a0ef87fe14763cd482796103209fd2fc8d377ced80db8c827c3c62cf885d
DIST libreoffice-testing-3.4.3.2.tar.bz2 50848140 RMD160 a1b8b62e173230f2fde2654c70f6b439cdbec68a SHA1 a3102c3c46a30a1cdbf5e032ea9182ef688dea7c SHA256 89c25311bed6d9d8646bd0f8e7f37a9c227b125309cf7b49f2ab083a8b73d6c0
-DIST libreoffice-testing-3.4.5.2.tar.bz2 50846799 RMD160 0c5e26d1384aaaabd1443831ca5ec1b7cad17711 SHA1 b5b9fd86cd8350007146134a76a88cfb96b27b9c SHA256 18290afb6de88243fbe198c0bae7dcbac2ac4e1459332bc4d9b23e59221d5317
+DIST libreoffice-testing-3.4.4.2.tar.bz2 50846747 RMD160 bb26fc2d0b756b88d0379c6aa22a8a8fbf3dc9bc SHA1 e1af27fd38182a8e0a318e4559fc20c475d543ba SHA256 c68f1b879bf1f63f00cef19ebac0c93a101f2f5f1e3f63104123c5fba6360f27
DIST libreoffice-ure-3.3.4.1.tar.bz2 6164629 RMD160 1a3b874de71b719e4ea10134cc82dc43ddc7fbc2 SHA1 2c3562704e8cf275ec7db790dbf1cc8627587120 SHA256 535953cd6b97e109690d8b1329ef129218e38774109612d4390e21e0da4d8a70
DIST libreoffice-ure-3.4.3.2.tar.bz2 6214027 RMD160 188aa9c9621fa03d4af10832fc25fb80a2071c65 SHA1 d0dcf8531274cc80ca0104517b78dfbac148031f SHA256 9150a51fe93b803be51af02be585c8e9b2e2fce7c6a4061ed9b8c5d60183ca20
-DIST libreoffice-ure-3.4.5.2.tar.bz2 6215972 RMD160 873fbcde60e680f743449ac30fdc7c50528fe486 SHA1 9241f407314a1d24cae4603e825c57c1820ec290 SHA256 fe5780496381255bf330d53ddc0d7fcf76ade5ec0f2bd5d5c7d60facd633e071
+DIST libreoffice-ure-3.4.4.2.tar.bz2 6213533 RMD160 7621b5cdfed4f0b6f7860012ae62813576652912 SHA1 85395ee5fec63ad096ec2c1a12adbd033b521ed4 SHA256 4f7df352778a88bf693cd317beb749755dfdcbafba035123b9057cc79714b733
DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece249bc0752bd081c SHA1 d572efceaf4249ebd97df0446d7b2aa74d506858 SHA256 312aaf0610753a789d7e7ed5ebf407e0fc12a4e35f50d3df51dbcb40af799c15
DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a
-DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
+DIST libreoffice-writer-3.4.4.2.tar.bz2 7296517 RMD160 0ea8e99afe53c3ad81148562fb061e996eb7648e SHA1 3d4f5ab9cfabdfcaeba4b836e12d2d467a6260fb SHA256 f6e60ec963032cb1d3d11175c7b783072af84fb5b9db0cdc622eaecb237484cd
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
deleted file mode 100644
index 97aa1d0c2d59..000000000000
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-die() {
- echo "${1}"
- exit 1
-}
-
-VERSION="3.4.5.2"
-
-# first the default subset of useflags
-IUSES_BASE="bash-completion binfilter branding dbus graphite gstreamer gtk python templates webdav odk"
-
-# now for the options
-IUSES_J="java"
-IUSES_NJ="-java"
-IUSES_G="gnome eds"
-IUSES_NG="-gnome -eds"
-IUSES_K="kde"
-IUSES_NK="-kde"
-
-mkdir -p /etc/portage/package.use/
-
-# compile the flavor
-echo "Base"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}.tbz2 || die "Copying package failed"
-
-echo "Base - java"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}.tbz2 || die "Copying package failed"
-
-# kde flavor
-echo "KDE"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}.tbz2 || die "Copying package failed"
-
-echo "KDE - java"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}.tbz2 || die "Copying package failed"
-
-# gnome flavor
-echo "Gnome"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}.tbz2 || die "Copying package failed"
-
-echo "Gnome -java"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
-emerge -v =libreoffice-${VERSION} || die "emerge failed"
-quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}.tbz2 || die "Copying package failed"
-
-
diff --git a/app-office/libreoffice/files/libreoffice-kde48.patch b/app-office/libreoffice/files/libreoffice-kde48.patch
deleted file mode 100644
index a92df79a9d0e..000000000000
--- a/app-office/libreoffice/files/libreoffice-kde48.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
-From: Luboš Luňák
-Date: Fri, 06 Jan 2012 09:55:03 +0000
-Subject: workaround for LO namespace pollution breaking KDE4 fpicker build
-
----
-diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
-index f282645..69be3b1 100644
---- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
-+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
-@@ -56,7 +56,10 @@
- #define Region QtXRegion
-
- //kde has an enum that uses this...OO does too
-+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
- #undef SETTINGS_MOUSE
-+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
-+#undef SETTINGS_LOCALE
-
- #include
- #include
-@@ -70,6 +73,11 @@
-
- #undef Region
-
-+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
-+#undef LO_SETTINGS_MOUSE
-+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
-+#undef LO_SETTINGS_LOCALE
-+
- using namespace ::com::sun::star;
-
- using namespace ::com::sun::star::ui::dialogs;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index 3484e1764373..4bfcb883ea60 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.18 2011/12/18 20:52:15 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.17 2011/12/11 22:08:24 maekke Exp $
EAPI=3
@@ -105,7 +105,7 @@ gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
webdav pdfimport"
LICENSE="LGPL-3"
SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
# lingua for templates
LANGUAGES="de en_GB en_ZA es fr hu it"
diff --git a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
new file mode 100644
index 000000000000..85c9abaf0096
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.4 2011/11/30 10:21:52 scarabeus Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src
+ http://download.documentfoundation.org/libreoffice/old/src
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Bootstrap MUST be first!
+MODULES="bootstrap artwork base calc components extensions extras filters help
+impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
+ure writer"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# addons
+# FIXME: actually review which one of these are used
+ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SRC_URI+=" ${ADDONS_SRC}"
+
+TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
+TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
+TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
+TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
+TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
+SRC_URI+=" templates? ( ${TDEPEND} )"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
+templates test +vba webdav"
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+# lingua for templates
+LANGUAGES="de en_GB en_ZA es fr hu it"
+for X in ${LANGUAGES} ; do
+ IUSE+=" linguas_${X}"
+done
+unset X
+
+COMMON_DEPEND="
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ app-text/libwpd:0.9[tools]
+ app-text/libwpg:0.2
+ >=app-text/libwps-0.2.2
+ dev-db/unixODBC
+ dev-libs/expat
+ >=dev-libs/glib-2.28
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1-r1
+ >=dev-lang/perl-5.0
+ >=dev-libs/openssl-1.0.0d
+ >=dev-libs/redland-1.0.14[ssl]
+ media-libs/freetype:2
+ >=media-libs/fontconfig-2.8.0
+ >=media-libs/vigra-1.7
+ >=media-libs/libpng-1.4
+ net-print/cups
+ sci-mathematics/lpsolve
+ >=sys-libs/db-4.8
+ virtual/jpeg
+ >=x11-libs/cairo-1.10.0
+ x11-libs/libXaw
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ gnome? (
+ gnome-base/gconf:2
+ gnome-base/orbit:2
+ )
+ gtk? ( >=x11-libs/gtk+-2.24:2 )
+ graphite? ( media-gfx/graphite2 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10
+ >=media-libs/gst-plugins-base-0.10
+ )
+ java? (
+ >=dev-java/bsh-2.0_beta4
+ dev-java/lucene:2.9
+ dev-java/lucene-analyzers:2.3
+ dev-java/saxon:0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ nsplugin? (
+ net-libs/xulrunner:1.9
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ )
+ opengl? ( virtual/opengl )
+ pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+ webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/openoffice-bin
+ !app-office/openoffice
+ java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.46
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/gperf-3
+ dev-util/intltool
+ dev-util/mdds
+ >=dev-util/pkgconfig-0.26
+ >=net-misc/curl-7.21.4
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ >=sys-devel/make-3.82
+ sys-libs/zlib
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ =virtual/jdk-1.6*
+ >=dev-java/ant-core-1.7
+ test? ( dev-java/junit:4 )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
+ "${FILESDIR}/${PN}-libdb5-fix-check.diff"
+ "${FILESDIR}/${PN}-3.4.1-salfix.diff"
+ "${FILESDIR}/sdext-presenter.diff"
+ "${FILESDIR}/${PN}-svx.patch"
+ "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
+ "${FILESDIR}/${PN}-solenv-build-crash.patch"
+ "${FILESDIR}/${PN}-as-needed-gtk.patch"
+ "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
+ "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
+ "${FILESDIR}/${PN}-installed-files-permissions.patch"
+ "${FILESDIR}/${PN}-check-for-avx.patch"
+ "${FILESDIR}/${PN}-append-no-avx.patch"
+ "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
+ "${FILESDIR}/${PN}-binfilter-as-needed.patch"
+ "${FILESDIR}/${PN}-kill-cppunit.patch"
+ "${FILESDIR}/${PN}-honor-strip.patch"
+ "${FILESDIR}/${PN}-java.patch"
+)
+
+REQUIRED_USE="
+ gnome? ( gtk )
+ nsplugin? ( gtk )
+ eds? ( gnome )
+"
+
+# Needs lots and lots of work and compiling
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-bootstrap-${PV}"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="1G"
+ use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ eerror "Compilation with gcc older than 4.0 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+
+ python_set_active_version 2
+ python_pkg_setup
+
+ if use custom-cflags; then
+ ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
+ ewarn "all sorts of build and runtime errors."
+ ewarn
+ ewarn "Before reporting a bug, please make sure you rebuild and try with"
+ ewarn "basic CFLAGS, otherwise the bug will not be accepted."
+ ewarn
+ fi
+
+ if ! use java; then
+ ewarn "You are building with java-support disabled, this results in some"
+ ewarn "of the LibreOffice functionality being disabled."
+ ewarn "If something you need does not work for you, rebuild with"
+ ewarn "java in your USE-flags."
+ ewarn
+ ewarn "Some java libraries will be provided internally by libreoffice"
+ ewarn "during the build. You should really reconsider enabling java"
+ ewarn "use flag."
+ ewarn
+ fi
+
+ if ! use gtk; then
+ ewarn "If you want the LibreOffice systray quickstarter to work"
+ ewarn "activate the 'gtk' use flag."
+ ewarn
+ fi
+}
+
+src_unpack() {
+ local mod dest tmplfile tmplname mypv
+
+ if use branding; then
+ unpack "${BRANDING}"
+ fi
+
+ if [[ ${PV} != *9999* ]]; then
+ for mod in ${MODULES}; do
+ unpack "${PN}-${mod}-${PV}.tar.bz2"
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_PROJECT="${PN}/${mod}"
+ EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ EGIT_NOUNPACK="true"
+ git-2_src_unpack
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+
+ # copy extension templates; o what fun ...
+ if use templates; then
+ dest="${S}/extras/source/extensions"
+ mkdir -p "${dest}"
+
+ for template in ${TDEPEND}; do
+ if [[ ${template} == *.oxt ]]; then
+ tmplfile="${DISTDIR}/$(basename ${template})"
+ tmplname="$(echo "${template}" | \
+ cut -f 2- -s -d - | cut -f 1 -d _)"
+ echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
+ if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
+ cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
+ fi
+ fi
+ done
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export ARCH_FLAGS="${CXXFLAGS}"
+ use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+ # compiler flags
+ use custom-cflags || strip-flags
+ use debug || filter-flags "-g*"
+ # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
+ filter-flags "-O*"
+
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local extensions
+ local themes="crystal"
+ local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+ # recheck that there is some value in jobs
+ [[ -z ${jbs} ]] && jbs="1"
+
+ # expand themes we are going to build based on DE useflags
+ use gnome && themes+=" tango"
+ use kde && themes+=" oxygen"
+
+ # list the extensions we are going to build by default
+ extensions="
+ $(use_enable pdfimport ext-pdfimport)
+ --enable-ext-presenter-console
+ --enable-ext-presenter-minimizer
+ "
+
+ # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
+ # dmake: not worth of splitting out
+ # cppunit: patched not to run anything, just main() { return 0; }
+ # workaround to upstream running the tests during build
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ internal_libs+="
+ --without-system-hsqldb
+ --without-system-cppunit
+ --without-system-sane-header
+ "
+
+ # When building without java some things needs to be done
+ # as internal libraries.
+ if ! use java; then
+ internal_libs+="
+ --without-junit
+ "
+ else
+ java_opts="
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-java-target-version=$(java-pkg_get-target)
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+ --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+ --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+ --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
+ "
+ if use test; then
+ java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+ else
+ java_opts+=" --without-junit"
+ fi
+ fi
+
+ if use branding; then
+ extensions+="
+ --with-about-bitmap="${WORKDIR}/branding-about.png"
+ --with-intro-bitmap="${WORKDIR}/branding-intro.png"
+ "
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # only expections are mozilla and odbc/sane/xrender-header(s).
+ # for jars the exception is db.jar controlled by --with-system-db
+ # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+ # --disable-broffice: do not use brazillian brand just be uniform
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-pch: precompiled headers cause build crashes
+ # --disable-rpath: relative runtime path is not desired
+ # --disable-static-gtk: ensure that gtk is linked dynamically
+ # --disable-zenity: disable build icon
+ # --with-extension-integration: enable any extension integration support
+ # --with-{max-jobs,num-cpus}: ensuring parallel building
+ # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --without-stlport: disable deprecated extensions framework
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-db \
+ --with-system-dicts \
+ --enable-cairo \
+ --enable-cups \
+ --enable-fontconfig \
+ --enable-largefile \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-unix-qstart-libpng \
+ --enable-Xaw \
+ --enable-xrender-link \
+ --disable-broffice \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-ldap \
+ --disable-online-update \
+ --disable-pch \
+ --disable-rpath \
+ --disable-static-gtk \
+ --disable-strip-solver \
+ --disable-zenity \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --with-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-max-jobs=${jbs} \
+ --with-num-cpus=1 \
+ --with-theme="${themes}" \
+ --with-unix-wrapper=libreoffice \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-afms \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-ppds \
+ --without-stlport \
+ --without-helppack-integration \
+ $(use_enable binfilter) \
+ $(use_enable dbus) \
+ $(use_enable debug crashdump) \
+ $(use_enable eds evolution2) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable graphite) \
+ $(use_enable gstreamer) \
+ $(use_enable gtk) \
+ $(use_enable gtk systray) \
+ $(use_enable java ext-scripting-beanshell) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mysql-connector) \
+ $(use_enable nsplugin mozilla) \
+ $(use_enable odk) \
+ $(use_enable opengl) \
+ $(use_enable python) \
+ $(use_enable python ext-scripting-python) \
+ $(use_enable vba) \
+ $(use_enable vba activex-component) \
+ $(use_enable webdav neon) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with nsplugin system-mozilla libxul) \
+ $(use_with templates sun-templates) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${extensions}
+}
+
+src_compile() {
+ # this is not a proper make script and the jobs are passed during configure
+ make || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
+ # symlink the plugin to system location
+ if use nsplugin; then
+ inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+ fi
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ fi
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
deleted file mode 100644
index ad648874975d..000000000000
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ /dev/null
@@ -1,514 +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/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.4 2012/01/16 11:52:51 ago Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src
- http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Bootstrap MUST be first!
-MODULES="bootstrap artwork base calc components extensions extras filters help
-impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
-ure writer"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# addons
-# FIXME: actually review which one of these are used
-ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
-test +vba webdav"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- app-text/libwpd:0.9[tools]
- app-text/libwpg:0.2
- >=app-text/libwps-0.2.2
- dev-db/unixODBC
- dev-libs/expat
- >=dev-libs/glib-2.28
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1-r1
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d
- >=dev-libs/redland-1.0.14[ssl]
- media-libs/freetype:2
- >=media-libs/fontconfig-2.8.0
- >=media-libs/vigra-1.7
- >=media-libs/libpng-1.4
- net-print/cups
- sci-mathematics/lpsolve
- >=sys-libs/db-4.8
- virtual/jpeg
- >=x11-libs/cairo-1.10.0
- x11-libs/libXaw
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- gnome? (
- gnome-base/gconf:2
- gnome-base/orbit:2
- )
- gtk? ( >=x11-libs/gtk+-2.24:2 )
- graphite? ( media-gfx/graphite2 )
- gstreamer? (
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10
- )
- java? (
- >=dev-java/bsh-2.0_beta4
- dev-java/lucene:2.9
- dev-java/lucene-analyzers:2.3
- dev-java/saxon:0
- )
- jemalloc? ( dev-libs/jemalloc )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- nsplugin? (
- net-libs/xulrunner:1.9
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- )
- opengl? ( virtual/opengl )
- pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
- webdav? ( net-libs/neon )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/openoffice-bin
- !app-office/openoffice
- java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
- =app-office/libreoffice-l10n-$(get_version_component_range 1-2)*
-"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.46
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/gperf-3
- dev-util/intltool
- dev-util/mdds
- >=dev-util/pkgconfig-0.26
- >=net-misc/curl-7.21.4
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- >=sys-devel/make-3.82
- sys-libs/zlib
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- =virtual/jdk-1.6*
- >=dev-java/ant-core-1.7
- test? ( dev-java/junit:4 )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
- "${FILESDIR}/${PN}-libdb5-fix-check.diff"
- "${FILESDIR}/sdext-presenter.diff"
- "${FILESDIR}/${PN}-svx.patch"
- "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
- "${FILESDIR}/${PN}-solenv-build-crash.patch"
- "${FILESDIR}/${PN}-as-needed-gtk.patch"
- "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
- "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
- "${FILESDIR}/${PN}-installed-files-permissions.patch"
- "${FILESDIR}/${PN}-check-for-avx.patch"
- "${FILESDIR}/${PN}-append-no-avx.patch"
- "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
- "${FILESDIR}/${PN}-binfilter-as-needed.patch"
- "${FILESDIR}/${PN}-kill-cppunit.patch"
- "${FILESDIR}/${PN}-honor-strip.patch"
- "${FILESDIR}/${PN}-java.patch"
- "${FILESDIR}/${PN}-kde48.patch"
-)
-
-REQUIRED_USE="
- gnome? ( gtk )
- nsplugin? ( gtk )
- eds? ( gnome )
-"
-
-# Needs lots and lots of work and compiling
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-bootstrap-${PV}"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="1G"
- use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- eerror "Compilation with gcc older than 4.0 is not supported"
- die "Too old gcc found."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
-
- python_set_active_version 2
- python_pkg_setup
-
- if use custom-cflags; then
- ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
- ewarn "all sorts of build and runtime errors."
- ewarn
- ewarn "Before reporting a bug, please make sure you rebuild and try with"
- ewarn "basic CFLAGS, otherwise the bug will not be accepted."
- ewarn
- fi
-
- if ! use java; then
- ewarn "You are building with java-support disabled, this results in some"
- ewarn "of the LibreOffice functionality being disabled."
- ewarn "If something you need does not work for you, rebuild with"
- ewarn "java in your USE-flags."
- ewarn
- ewarn "Some java libraries will be provided internally by libreoffice"
- ewarn "during the build. You should really reconsider enabling java"
- ewarn "use flag."
- ewarn
- fi
-
- if ! use gtk; then
- ewarn "If you want the LibreOffice systray quickstarter to work"
- ewarn "activate the 'gtk' use flag."
- ewarn
- fi
-}
-
-src_unpack() {
- local mod dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- if use branding; then
- unpack "${BRANDING}"
- fi
-
- if [[ ${PV} != *9999* ]]; then
- for mod in ${MODULES}; do
- unpack "${PN}-${mod}-${PV}.tar.bz2"
- if [[ ${mod} != bootstrap ]]; then
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_PROJECT="${PN}/${mod}"
- EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- EGIT_NOUNPACK="true"
- git-2_src_unpack
- if [[ ${mod} != bootstrap ]]; then
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export ARCH_FLAGS="${CXXFLAGS}"
- use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
- # compiler flags
- use custom-cflags || strip-flags
- use debug || filter-flags "-g*"
- # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
- filter-flags "-O*"
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local extensions
- local themes="crystal"
- local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
- # recheck that there is some value in jobs
- [[ -z ${jbs} ]] && jbs="1"
-
- # expand themes we are going to build based on DE useflags
- use gnome && themes+=" tango"
- use kde && themes+=" oxygen"
-
- # list the extensions we are going to build by default
- extensions="
- $(use_enable pdfimport ext-pdfimport)
- --enable-ext-presenter-console
- --enable-ext-presenter-minimizer
- "
-
- # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
- # dmake: not worth of splitting out
- # cppunit: patched not to run anything, just main() { return 0; }
- # workaround to upstream running the tests during build
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- internal_libs+="
- --without-system-hsqldb
- --without-system-cppunit
- --without-system-sane-header
- "
-
- # When building without java some things needs to be done
- # as internal libraries.
- if ! use java; then
- internal_libs+="
- --without-junit
- "
- else
- java_opts="
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-java-target-version=$(java-pkg_get-target)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
- --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
- --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
- --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
- --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
- "
- if use test; then
- java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
- else
- java_opts+=" --without-junit"
- fi
- fi
-
- if use branding; then
- extensions+="
- --with-about-bitmap="${WORKDIR}/branding-about.png"
- --with-intro-bitmap="${WORKDIR}/branding-intro.png"
- "
- fi
-
- # system headers/libs/...: enforce using system packages
- # only expections are mozilla and odbc/sane/xrender-header(s).
- # for jars the exception is db.jar controlled by --with-system-db
- # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
- # --disable-broffice: do not use brazillian brand just be uniform
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-pch: precompiled headers cause build crashes
- # --disable-rpath: relative runtime path is not desired
- # --disable-static-gtk: ensure that gtk is linked dynamically
- # --disable-zenity: disable build icon
- # --with-extension-integration: enable any extension integration support
- # --with-{max-jobs,num-cpus}: ensuring parallel building
- # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --without-stlport: disable deprecated extensions framework
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-db \
- --with-system-dicts \
- --enable-cairo \
- --enable-cups \
- --enable-fontconfig \
- --enable-largefile \
- --enable-randr \
- --enable-randr-link \
- --enable-unix-qstart-libpng \
- --enable-Xaw \
- --enable-xrender-link \
- --disable-broffice \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-kdeab \
- --disable-kde \
- --disable-ldap \
- --disable-online-update \
- --disable-pch \
- --disable-rpath \
- --disable-static-gtk \
- --disable-strip-solver \
- --disable-zenity \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --with-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-max-jobs=${jbs} \
- --with-num-cpus=1 \
- --with-theme="${themes}" \
- --with-unix-wrapper=libreoffice \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-afms \
- --without-fonts \
- --without-myspell-dicts \
- --without-ppds \
- --without-stlport \
- --without-helppack-integration \
- --without-sun-templates \
- $(use_enable binfilter) \
- $(use_enable dbus) \
- $(use_enable debug crashdump) \
- $(use_enable eds evolution2) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable graphite) \
- $(use_enable gstreamer) \
- $(use_enable gtk) \
- $(use_enable gtk systray) \
- $(use_enable java ext-scripting-beanshell) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mysql-connector) \
- $(use_enable nsplugin mozilla) \
- $(use_enable odk) \
- $(use_enable opengl) \
- $(use_enable python) \
- $(use_enable python ext-scripting-python) \
- $(use_enable vba) \
- $(use_enable vba activex-component) \
- $(use_enable webdav neon) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with nsplugin system-mozilla libxul) \
- ${internal_libs} \
- ${java_opts} \
- ${extensions}
-}
-
-src_compile() {
- # this is not a proper make script and the jobs are passed during configure
- make || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- rm -rf "${ED}"/etc/
-
- # symlink the plugin to system location
- if use nsplugin; then
- inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
- fi
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- fi
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild
new file mode 100644
index 000000000000..ed3681c42aae
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild,v 1.4 2011/12/15 13:01:55 scarabeus Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src
+ http://download.documentfoundation.org/libreoffice/old/src
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+MODULES="core binfilter"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]]; then
+ SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
++jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
++webdav +xmlsec"
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+NSS_DEPEND="
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+"
+
+COMMON_DEPEND="
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libexttextcat-3.2
+ app-text/libwpd:0.9[tools]
+ app-text/libwpg:0.2
+ >=app-text/libwps-0.2.2
+ dev-cpp/libcmis
+ dev-db/unixODBC
+ dev-libs/expat
+ >=dev-libs/glib-2.28
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1-r1
+ >=dev-lang/perl-5.0
+ >=dev-libs/openssl-1.0.0d
+ >=dev-libs/redland-1.0.14[ssl]
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/libpng-1.4
+ media-libs/libvisio
+ net-print/cups
+ sci-mathematics/lpsolve
+ >=sys-libs/db-4.8
+ virtual/jpeg
+ >=x11-libs/cairo-1.10.0
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ gnome? (
+ gnome-base/gconf:2
+ gnome-base/orbit
+ )
+ gtk? ( >=x11-libs/gtk+-2.24:2 )
+ gtk3? ( >=x11-libs/gtk+-3.2:3 )
+ graphite? ( media-gfx/graphite2 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10
+ >=media-libs/gst-plugins-base-0.10
+ )
+ java? (
+ >=dev-java/bsh-2.0_beta4
+ dev-java/lucene:2.9
+ dev-java/lucene-analyzers:2.3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ opengl? ( virtual/opengl )
+ pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+ postgres? ( >=dev-db/postgresql-base-8.4.0 )
+ svg? ( gnome-base/librsvg )
+ webdav? ( net-libs/neon )
+ xmlsec? ( ${NSS_DEPEND} )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/openoffice-bin
+ !app-office/openoffice
+ media-fonts/libertine-ttf
+ media-fonts/liberation-fonts
+ java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+ >=app-office/libreoffice-l10n-3.5.0
+"
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.46
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ dev-util/mdds
+ >=dev-util/pkgconfig-0.26
+ media-libs/sampleicc
+ >=net-misc/curl-7.21.4
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-libs/zlib
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ =virtual/jdk-1.6*
+ >=dev-java/ant-core-1.7
+ test? ( dev-java/junit:4 )
+ )
+"
+
+PATCHES=(
+)
+
+REQUIRED_USE="
+ nsplugin? ( gtk )
+ gnome? ( gtk )
+ eds? ( gnome )
+"
+
+S="${WORKDIR}/${PN}-core-${PV}"
+
+pkg_pretend() {
+ local pgslot
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ use debug && CHECKREQS_DISK_BUILD="9G" || CHECKREQS_DISK_BUILD="6G"
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ eerror "Compilation with gcc older than 4.0 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # ensure pg version
+ if use postgres; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} < 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+
+ python_set_active_version 2
+ python_pkg_setup
+
+ if ! use gtk; then
+ ewarn "If you want the LibreOffice systray quickstarter to work"
+ ewarn "activate the 'gtk' use flag."
+ ewarn
+ fi
+}
+
+src_unpack() {
+ local mod dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ if use branding; then
+ unpack "${BRANDING}"
+ fi
+
+ if [[ ${PV} != *9999* ]]; then
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]] && ! use binfilter; then
+ continue
+ fi
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ if [[ ${mod} != core ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ else
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]] && ! use binfilter; then
+ continue
+ fi
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_PROJECT="${PN}/${mod}"
+ EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ EGIT_NOUNPACK="true"
+ git-2_src_unpack
+ if [[ ${mod} != core ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export ARCH_FLAGS="${CXXFLAGS}"
+ export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+ eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local themes="default"
+ local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+ # recheck that there is some value in jobs
+ [[ -z ${jbs} ]] && jbs="1"
+
+ # expand themes we are going to build based on DE useflags
+ use gnome && themes+=" tango"
+ use kde && themes+=" oxygen"
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ if use java; then
+ # hsqldb: system one is too new
+ # saxon: system one does not work properly
+ java_opts="
+ --without-system-hsqldb
+ --without-system-saxon
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-java-target-version=$(java-pkg_get-target)
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+ --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+ --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+ "
+ if use test; then
+ java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+ else
+ java_opts+=" --without-junit"
+ fi
+ fi
+
+ if use branding; then
+ internal_libs+="
+ --with-about-bitmap="${WORKDIR}/branding-about.png"
+ --with-intro-bitmap="${WORKDIR}/branding-intro.png"
+ "
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
+ # --disable-mozilla: disable mozilla build that is used for adresbook, not
+ # affecting the nsplugin that is always ON
+ # --disable-pch: precompiled headers cause build crashes
+ # --disable-rpath: relative runtime path is not desired
+ # --disable-static-gtk: ensure that gtk is linked dynamically
+ # --disable-ugly: disable ugly pieces of code
+ # --disable-zenity: disable build icon
+ # --enable-extension-integration: enable any extension integration support
+ # --with-{max-jobs,num-cpus}: ensuring parallel building
+ # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --without-stlport: disable deprecated extensions framework
+ # --disable-ext-report-builder: too much java packages pulled in
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-largefile \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --enable-unix-qstart-libpng \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-ext-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-ldap \
+ --disable-mozilla \
+ --disable-online-update \
+ --disable-pch \
+ --disable-rpath \
+ --disable-static-gtk \
+ --disable-strip-solver \
+ --disable-ugly \
+ --disable-zenity \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-max-jobs=${jbs} \
+ --with-num-cpus=${jbs} \
+ --with-theme="${themes}" \
+ --with-unix-wrapper=libreoffice \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-afms \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-ppds \
+ --without-stlport \
+ --without-system-mozilla \
+ --without-help \
+ --without-helppack-integration \
+ --without-sun-templates \
+ $(use_enable binfilter) \
+ $(use_enable dbus) \
+ $(use_enable debug crashdump) \
+ $(use_enable eds evolution2) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable graphite) \
+ $(use_enable gstreamer) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable gtk systray) \
+ $(use_enable java ext-scripting-beanshell) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mysql-connector) \
+ $(use_enable nsplugin) \
+ $(use_enable odk) \
+ $(use_enable opengl) \
+ $(use_enable pdfimport ext-pdfimport) \
+ $(use_enable postgres ext-postgresql-sdbc) \
+ $(use_enable svg librsvg system) \
+ $(use_enable test linkoo) \
+ $(use_enable vba) \
+ $(use_enable vba activex-component) \
+ $(use_enable webdav neon) \
+ $(use_enable xmlsec) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ ${internal_libs} \
+ ${java_opts}
+}
+
+src_compile() {
+ # this is not a proper make script and the jobs are passed during configure
+ make build || die
+}
+
+src_test() {
+ make check || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
+ # symlink the nsplugin to system location
+ if use nsplugin; then
+ inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+ fi
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ fi
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
new file mode 100644
index 000000000000..ac28848b12f4
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
@@ -0,0 +1,514 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild,v 1.4 2011/11/30 10:21:52 scarabeus Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src
+ http://download.documentfoundation.org/libreoffice/old/src
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Bootstrap MUST be first!
+MODULES="bootstrap artwork base calc components extensions extras filters help
+impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
+ure writer"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# addons
+# FIXME: actually review which one of these are used
+ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
+test +vba webdav"
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ app-text/libwpd:0.9[tools]
+ app-text/libwpg:0.2
+ >=app-text/libwps-0.2.2
+ dev-db/unixODBC
+ dev-libs/expat
+ >=dev-libs/glib-2.28
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1-r1
+ >=dev-lang/perl-5.0
+ >=dev-libs/openssl-1.0.0d
+ >=dev-libs/redland-1.0.14[ssl]
+ media-libs/freetype:2
+ >=media-libs/fontconfig-2.8.0
+ >=media-libs/vigra-1.7
+ >=media-libs/libpng-1.4
+ net-print/cups
+ sci-mathematics/lpsolve
+ >=sys-libs/db-4.8
+ virtual/jpeg
+ >=x11-libs/cairo-1.10.0
+ x11-libs/libXaw
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ gnome? (
+ gnome-base/gconf:2
+ gnome-base/orbit:2
+ )
+ gtk? ( >=x11-libs/gtk+-2.24:2 )
+ graphite? ( media-gfx/graphite2 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10
+ >=media-libs/gst-plugins-base-0.10
+ )
+ java? (
+ >=dev-java/bsh-2.0_beta4
+ dev-java/lucene:2.9
+ dev-java/lucene-analyzers:2.3
+ dev-java/saxon:0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ nsplugin? (
+ net-libs/xulrunner:1.9
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ )
+ opengl? ( virtual/opengl )
+ pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+ webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/openoffice-bin
+ !app-office/openoffice
+ java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-$(get_version_component_range 1-2)*
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.46
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/gperf-3
+ dev-util/intltool
+ dev-util/mdds
+ >=dev-util/pkgconfig-0.26
+ >=net-misc/curl-7.21.4
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ >=sys-devel/make-3.82
+ sys-libs/zlib
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ =virtual/jdk-1.6*
+ >=dev-java/ant-core-1.7
+ test? ( dev-java/junit:4 )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
+ "${FILESDIR}/${PN}-libdb5-fix-check.diff"
+ "${FILESDIR}/sdext-presenter.diff"
+ "${FILESDIR}/${PN}-svx.patch"
+ "${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
+ "${FILESDIR}/${PN}-solenv-build-crash.patch"
+ "${FILESDIR}/${PN}-as-needed-gtk.patch"
+ "${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
+ "${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
+ "${FILESDIR}/${PN}-installed-files-permissions.patch"
+ "${FILESDIR}/${PN}-check-for-avx.patch"
+ "${FILESDIR}/${PN}-append-no-avx.patch"
+ "${FILESDIR}/${PN}-32b-qt4-libdir.patch"
+ "${FILESDIR}/${PN}-binfilter-as-needed.patch"
+ "${FILESDIR}/${PN}-kill-cppunit.patch"
+ "${FILESDIR}/${PN}-honor-strip.patch"
+ "${FILESDIR}/${PN}-java.patch"
+)
+
+REQUIRED_USE="
+ gnome? ( gtk )
+ nsplugin? ( gtk )
+ eds? ( gnome )
+"
+
+# Needs lots and lots of work and compiling
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-bootstrap-${PV}"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="1G"
+ use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ eerror "Compilation with gcc older than 4.0 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+
+ python_set_active_version 2
+ python_pkg_setup
+
+ if use custom-cflags; then
+ ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
+ ewarn "all sorts of build and runtime errors."
+ ewarn
+ ewarn "Before reporting a bug, please make sure you rebuild and try with"
+ ewarn "basic CFLAGS, otherwise the bug will not be accepted."
+ ewarn
+ fi
+
+ if ! use java; then
+ ewarn "You are building with java-support disabled, this results in some"
+ ewarn "of the LibreOffice functionality being disabled."
+ ewarn "If something you need does not work for you, rebuild with"
+ ewarn "java in your USE-flags."
+ ewarn
+ ewarn "Some java libraries will be provided internally by libreoffice"
+ ewarn "during the build. You should really reconsider enabling java"
+ ewarn "use flag."
+ ewarn
+ fi
+
+ if ! use gtk; then
+ ewarn "If you want the LibreOffice systray quickstarter to work"
+ ewarn "activate the 'gtk' use flag."
+ ewarn
+ fi
+}
+
+src_unpack() {
+ local mod dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ if use branding; then
+ unpack "${BRANDING}"
+ fi
+
+ if [[ ${PV} != *9999* ]]; then
+ for mod in ${MODULES}; do
+ unpack "${PN}-${mod}-${PV}.tar.bz2"
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_PROJECT="${PN}/${mod}"
+ EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ EGIT_NOUNPACK="true"
+ git-2_src_unpack
+ if [[ ${mod} != bootstrap ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export ARCH_FLAGS="${CXXFLAGS}"
+ use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+ # compiler flags
+ use custom-cflags || strip-flags
+ use debug || filter-flags "-g*"
+ # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
+ filter-flags "-O*"
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local extensions
+ local themes="crystal"
+ local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+ # recheck that there is some value in jobs
+ [[ -z ${jbs} ]] && jbs="1"
+
+ # expand themes we are going to build based on DE useflags
+ use gnome && themes+=" tango"
+ use kde && themes+=" oxygen"
+
+ # list the extensions we are going to build by default
+ extensions="
+ $(use_enable pdfimport ext-pdfimport)
+ --enable-ext-presenter-console
+ --enable-ext-presenter-minimizer
+ "
+
+ # hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
+ # dmake: not worth of splitting out
+ # cppunit: patched not to run anything, just main() { return 0; }
+ # workaround to upstream running the tests during build
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ internal_libs+="
+ --without-system-hsqldb
+ --without-system-cppunit
+ --without-system-sane-header
+ "
+
+ # When building without java some things needs to be done
+ # as internal libraries.
+ if ! use java; then
+ internal_libs+="
+ --without-junit
+ "
+ else
+ java_opts="
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-java-target-version=$(java-pkg_get-target)
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+ --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+ --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+ --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
+ "
+ if use test; then
+ java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+ else
+ java_opts+=" --without-junit"
+ fi
+ fi
+
+ if use branding; then
+ extensions+="
+ --with-about-bitmap="${WORKDIR}/branding-about.png"
+ --with-intro-bitmap="${WORKDIR}/branding-intro.png"
+ "
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # only expections are mozilla and odbc/sane/xrender-header(s).
+ # for jars the exception is db.jar controlled by --with-system-db
+ # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+ # --disable-broffice: do not use brazillian brand just be uniform
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-pch: precompiled headers cause build crashes
+ # --disable-rpath: relative runtime path is not desired
+ # --disable-static-gtk: ensure that gtk is linked dynamically
+ # --disable-zenity: disable build icon
+ # --with-extension-integration: enable any extension integration support
+ # --with-{max-jobs,num-cpus}: ensuring parallel building
+ # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --without-stlport: disable deprecated extensions framework
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-db \
+ --with-system-dicts \
+ --enable-cairo \
+ --enable-cups \
+ --enable-fontconfig \
+ --enable-largefile \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-unix-qstart-libpng \
+ --enable-Xaw \
+ --enable-xrender-link \
+ --disable-broffice \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-ldap \
+ --disable-online-update \
+ --disable-pch \
+ --disable-rpath \
+ --disable-static-gtk \
+ --disable-strip-solver \
+ --disable-zenity \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --with-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-max-jobs=${jbs} \
+ --with-num-cpus=1 \
+ --with-theme="${themes}" \
+ --with-unix-wrapper=libreoffice \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-afms \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-ppds \
+ --without-stlport \
+ --without-helppack-integration \
+ --without-sun-templates \
+ $(use_enable binfilter) \
+ $(use_enable dbus) \
+ $(use_enable debug crashdump) \
+ $(use_enable eds evolution2) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable graphite) \
+ $(use_enable gstreamer) \
+ $(use_enable gtk) \
+ $(use_enable gtk systray) \
+ $(use_enable java ext-scripting-beanshell) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mysql-connector) \
+ $(use_enable nsplugin mozilla) \
+ $(use_enable odk) \
+ $(use_enable opengl) \
+ $(use_enable python) \
+ $(use_enable python ext-scripting-python) \
+ $(use_enable vba) \
+ $(use_enable vba activex-component) \
+ $(use_enable webdav neon) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with nsplugin system-mozilla libxul) \
+ $(use_with templates sun-templates) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${extensions}
+}
+
+src_compile() {
+ # this is not a proper make script and the jobs are passed during configure
+ make || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
+ # symlink the plugin to system location
+ if use nsplugin; then
+ inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+ fi
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ fi
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-3.5.0.1.ebuild b/app-office/libreoffice/libreoffice-3.5.0.1.ebuild
deleted file mode 100644
index c5bc2e83b79b..000000000000
--- a/app-office/libreoffice/libreoffice-3.5.0.1.ebuild
+++ /dev/null
@@ -1,499 +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/libreoffice/libreoffice-3.5.0.1.ebuild,v 1.1 2012/01/18 12:49:59 scarabeus Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src
- http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-MODULES="core binfilter"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == binfilter ]]; then
- SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
-ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
-+jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
-+webdav +xmlsec"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-NSS_DEPEND="
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
-"
-
-COMMON_DEPEND="
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libexttextcat-3.2
- app-text/libwpd:0.9[tools]
- app-text/libwpg:0.2
- >=app-text/libwps-0.2.2
- dev-cpp/libcmis
- dev-db/unixODBC
- dev-libs/expat
- >=dev-libs/glib-2.28
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1-r1
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d
- >=dev-libs/redland-1.0.14[ssl]
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/libpng-1.4
- media-libs/libvisio
- net-print/cups
- sci-mathematics/lpsolve
- >=sys-libs/db-4.8
- virtual/jpeg
- >=x11-libs/cairo-1.10.0
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- gnome? (
- gnome-base/gconf:2
- gnome-base/orbit
- )
- gtk? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- graphite? ( media-gfx/graphite2 )
- gstreamer? (
- >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10
- )
- java? (
- >=dev-java/bsh-2.0_beta4
- dev-java/lucene:2.9
- dev-java/lucene-analyzers:2.3
- )
- jemalloc? ( dev-libs/jemalloc )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- opengl? ( virtual/opengl )
- pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
- postgres? ( >=dev-db/postgresql-base-8.4.0 )
- svg? ( gnome-base/librsvg )
- webdav? ( net-libs/neon )
- xmlsec? ( ${NSS_DEPEND} )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/openoffice-bin
- !app-office/openoffice
- media-fonts/libertine-ttf
- media-fonts/liberation-fonts
- java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
- >=app-office/libreoffice-l10n-3.5.0
-"
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.46
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- dev-util/mdds
- >=dev-util/pkgconfig-0.26
- media-libs/sampleicc
- >=net-misc/curl-7.21.4
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-libs/zlib
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- =virtual/jdk-1.6*
- >=dev-java/ant-core-1.7
- test? ( dev-java/junit:4 )
- )
-"
-
-PATCHES=(
-)
-
-REQUIRED_USE="
- nsplugin? ( gtk )
- gnome? ( gtk )
- eds? ( gnome )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G"
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- eerror "Compilation with gcc older than 4.0 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # ensure pg version
- if use postgres; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
-
- python_set_active_version 2
- python_pkg_setup
-
- if ! use gtk; then
- ewarn "If you want the LibreOffice systray quickstarter to work"
- ewarn "activate the 'gtk' use flag."
- ewarn
- fi
-}
-
-src_unpack() {
- local mod dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- if use branding; then
- unpack "${BRANDING}"
- fi
-
- if [[ ${PV} != *9999* ]]; then
- for mod in ${MODULES}; do
- if [[ ${mod} == binfilter ]] && ! use binfilter; then
- continue
- fi
- unpack "${PN}-${mod}-${PV}.tar.xz"
- if [[ ${mod} != core ]]; then
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- else
- for mod in ${MODULES}; do
- if [[ ${mod} == binfilter ]] && ! use binfilter; then
- continue
- fi
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_PROJECT="${PN}/${mod}"
- EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- EGIT_NOUNPACK="true"
- git-2_src_unpack
- if [[ ${mod} != core ]]; then
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export ARCH_FLAGS="${CXXFLAGS}"
- export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
- eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local themes="default"
- local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
- # recheck that there is some value in jobs
- [[ -z ${jbs} ]] && jbs="1"
-
- # expand themes we are going to build based on DE useflags
- use gnome && themes+=" tango"
- use kde && themes+=" oxygen"
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- if use java; then
- # hsqldb: system one is too new
- # saxon: system one does not work properly
- java_opts="
- --without-system-hsqldb
- --without-system-saxon
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-java-target-version=$(java-pkg_get-target)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
- --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
- --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
- --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
- "
- if use test; then
- java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
- else
- java_opts+=" --without-junit"
- fi
- fi
-
- if use branding; then
- internal_libs+="
- --with-about-bitmap="${WORKDIR}/branding-about.png"
- --with-intro-bitmap="${WORKDIR}/branding-intro.png"
- "
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
- # --disable-mozilla: disable mozilla build that is used for adresbook, not
- # affecting the nsplugin that is always ON
- # --disable-pch: precompiled headers cause build crashes
- # --disable-rpath: relative runtime path is not desired
- # --disable-static-gtk: ensure that gtk is linked dynamically
- # --disable-ugly: disable ugly pieces of code
- # --disable-zenity: disable build icon
- # --enable-extension-integration: enable any extension integration support
- # --with-{max-jobs,num-cpus}: ensuring parallel building
- # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --without-stlport: disable deprecated extensions framework
- # --disable-ext-report-builder: too much java packages pulled in
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --enable-unix-qstart-libpng \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-ext-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-ldap \
- --disable-mozilla \
- --disable-online-update \
- --disable-pch \
- --disable-rpath \
- --disable-static-gtk \
- --disable-strip-solver \
- --disable-ugly \
- --disable-zenity \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-max-jobs=${jbs} \
- --with-num-cpus=${jbs} \
- --with-theme="${themes}" \
- --with-unix-wrapper=libreoffice \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-afms \
- --without-fonts \
- --without-myspell-dicts \
- --without-ppds \
- --without-stlport \
- --without-system-mozilla \
- --without-help \
- --without-helppack-integration \
- --without-sun-templates \
- $(use_enable binfilter) \
- $(use_enable dbus) \
- $(use_enable debug crashdump) \
- $(use_enable eds evolution2) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable graphite) \
- $(use_enable gstreamer) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable gtk systray) \
- $(use_enable java ext-scripting-beanshell) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mysql-connector) \
- $(use_enable nsplugin) \
- $(use_enable odk) \
- $(use_enable opengl) \
- $(use_enable pdfimport ext-pdfimport) \
- $(use_enable postgres ext-postgresql-sdbc) \
- $(use_enable svg librsvg system) \
- $(use_enable test linkoo) \
- $(use_enable vba) \
- $(use_enable vba activex-component) \
- $(use_enable webdav neon) \
- $(use_enable xmlsec) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- ${internal_libs} \
- ${java_opts}
-}
-
-src_compile() {
- # this is not a proper make script and the jobs are passed during configure
- make build || die
-}
-
-src_test() {
- make check || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- rm -rf "${ED}"/etc/
-
- # symlink the nsplugin to system location
- if use nsplugin; then
- inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
- fi
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- fi
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 14fdea904170..e03369d8bf7d 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.7 2012/01/13 14:56:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.6 2011/12/15 13:01:55 scarabeus Exp $
EAPI=4
@@ -382,7 +382,6 @@ src_configure() {
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
- --enable-mergelibs \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 02711f169ac1..b8924e29bd3d 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.20 2012/01/13 14:56:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.18 2011/12/15 13:01:55 scarabeus Exp $
EAPI=4
@@ -118,10 +118,7 @@ COMMON_DEPEND="
gnome-base/gconf:2
gnome-base/orbit
)
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
+ gtk? ( >=x11-libs/gtk+-2.24:2 )
gtk3? ( >=x11-libs/gtk+-3.2:3 )
graphite? ( media-gfx/graphite2 )
gstreamer? (
@@ -382,7 +379,6 @@ src_configure() {
--with-system-libcdr \
--enable-cairo-canvas \
--enable-largefile \
- --enable-mergelibs \
--enable-python=system \
--enable-randr \
--enable-randr-link \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 7292756b90ba..d9e38ea4eaf8 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -1,7 +1,6 @@
- maintainer-needed@gentoo.org
openoffice
LibreOffice is a fork of OpenOffice.org.
This ebuild allows you to compile it yourself. Unfortunately this
diff --git a/app-office/lyx/lyx-2.0.1.ebuild b/app-office/lyx/lyx-2.0.1.ebuild
index 6d0c3fed9c2d..9c1e16cd77bc 100644
--- a/app-office/lyx/lyx-2.0.1.ebuild
+++ b/app-office/lyx/lyx-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.1.ebuild,v 1.8 2012/01/15 15:53:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.1.ebuild,v 1.4 2011/12/15 18:02:24 ago Exp $
EAPI=3
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index d9cd2cad66c2..933301a89de7 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/metadata.xml
@@ -2,6 +2,6 @@
-maintainer-needed@gentoo.org
+graaff@gentoo.org
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 7a525f24782a..e7217b66d74b 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,6 +1,6 @@
+DIST orage-4.8.1.tar.bz2 2235528 RMD160 328aadd08a6f3cc20fff789e1982794e4f4bd1f9 SHA1 60ca98e3afbfd00533b2e3b1cf6d0c7902b607d3 SHA256 612d9e0e6b0113e04332d13cfbe027e464ff1c8e7ddef5052369ac88e67e09d8
DIST orage-4.8.2-hr.po.bz2 15501 RMD160 25fb6d46c939eb00f22227bf144f8c619de2b0cd SHA1 4edff5af779df4d6c8b4a742265feb0bada10a66 SHA256 c4c30697afd44d1a70b08d1f0fad62c6bed67d67e05d2a841aa2aa54cd3329d5
DIST orage-4.8.2-kk.po.bz2 11770 RMD160 cef077592b30d572305aebe0f62048e0328961e9 SHA1 b97f3a417c15a068ff6cd8a440b520de561c96fc SHA256 ae55c0aaa154203664d4083e02d1b5d3c9f438f0a7332fcc6c49735c03526296
DIST orage-4.8.2-si.po.bz2 12933 RMD160 92db8d8f9eaa846348af0a2af2798a14db40cda0 SHA1 db3a1cba2c9c67e0d0163eac344c33400f718748 SHA256 dba638c192f54bbcf11aca733bc06c363df2b2463f1e0bc964278d86c53c0775
DIST orage-4.8.2-ug.po.bz2 16999 RMD160 ccd7f900131d3456357e2cae86406a7a073eb344 SHA1 2c3636fc939faed41a86a6d051c5eff901649e42 SHA256 d6f5703867eea5fada20d13296fb411c7408315c59fe56596f16120e963f95b8
DIST orage-4.8.2.tar.bz2 2453171 RMD160 8316423688cc5766c9b07d540230dc72c246405f SHA1 310c84f3787d88cf75ee7be0ceb96926bbbb7295 SHA256 51cc78f856331cdb5de25ae601efd26e70790a5a0797c139bdd1f2246dd2fdcc
-DIST orage-4.8.3.tar.bz2 2438461 RMD160 640bd061f4e4031c38a2cdbed9e8cc804193117a SHA1 f4f89ea1f301514c419e7643661b510132ebb012 SHA256 9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e
diff --git a/app-office/orage/orage-4.8.1.ebuild b/app-office/orage/orage-4.8.1.ebuild
new file mode 100644
index 000000000000..f9c4f51610d1
--- /dev/null
+++ b/app-office/orage/orage-4.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.1.ebuild,v 1.8 2011/05/19 21:52:12 ssuominen Exp $
+
+EAPI=4
+inherit flag-o-matic xfconf
+
+DESCRIPTION="Xfce's calendar suite (with panel plug-in)"
+HOMEPAGE="http://www.xfce.org/projects/orage/"
+SRC_URI="mirror://xfce/src/apps/${PN}/4.8/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
+
+RDEPEND=">=dev-libs/libical-0.43
+ dev-libs/popt
+ >=x11-libs/gtk+-2.10:2
+ berkdb? ( >=sys-libs/db-4 )
+ dbus? ( >=dev-libs/dbus-glib-0.88 )
+ libnotify? ( >=x11-libs/libnotify-0.4.5 )
+ xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ dev-util/intltool"
+
+pkg_setup() {
+ append-flags -I/usr/include/libical
+
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable xfce_plugins_clock libxfce4panel)
+ $(use_enable dbus)
+ $(use_enable libnotify)
+ $(use_with berkdb bdb4)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/app-office/orage/orage-4.8.2.ebuild b/app-office/orage/orage-4.8.2.ebuild
index 0bb11288ef9a..8fdcd74a741e 100644
--- a/app-office/orage/orage-4.8.2.ebuild
+++ b/app-office/orage/orage-4.8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.2.ebuild,v 1.9 2012/01/06 10:55:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.2.ebuild,v 1.8 2011/11/26 18:20:42 armin76 Exp $
EAPI=4
inherit flag-o-matic xfconf
DESCRIPTION="Xfce's calendar suite (with panel plug-in)"
HOMEPAGE="http://www.xfce.org/projects/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
+SRC_URI="mirror://xfce/src/apps/${PN}/4.8/${P}.tar.bz2
http://dev.gentoo.org/~ssuominen/${P}-hr.po.bz2
http://dev.gentoo.org/~ssuominen/${P}-kk.po.bz2
http://dev.gentoo.org/~ssuominen/${P}-si.po.bz2
@@ -15,15 +15,15 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
RDEPEND=">=dev-libs/libical-0.43
dev-libs/popt
>=x11-libs/gtk+-2.10:2
berkdb? ( >=sys-libs/db-4 )
- dbus? ( >=dev-libs/dbus-glib-0.90 )
- libnotify? ( >=x11-libs/libnotify-0.7 )
+ dbus? ( >=dev-libs/dbus-glib-0.88 )
+ libnotify? ( >=x11-libs/libnotify-0.4.5 )
xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
diff --git a/app-office/orage/orage-4.8.3.ebuild b/app-office/orage/orage-4.8.3.ebuild
deleted file mode 100644
index 0fc6de0f9d61..000000000000
--- a/app-office/orage/orage-4.8.3.ebuild
+++ /dev/null
@@ -1,39 +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/orage/orage-4.8.3.ebuild,v 1.2 2012/01/30 16:43:40 ago Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
-
-RDEPEND=">=dev-libs/libical-0.48
- dev-libs/popt
- >=x11-libs/gtk+-2.10:2
- berkdb? ( >=sys-libs/db-4 )
- dbus? ( >=dev-libs/dbus-glib-0.90 )
- libnotify? ( >=x11-libs/libnotify-0.7 )
- xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
-
-pkg_setup() {
- XFCONF=(
- --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable xfce_plugins_clock libxfce4panel)
- $(use_enable dbus)
- $(use_enable libnotify)
- $(use_with berkdb bdb4)
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index c589015f1850..3e9e49346c45 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,2 +1 @@
DIST planner-0.14.5.tar.xz 3385520 RMD160 0f670514c8f9399d02791bccdf3ffe9fb63f6608 SHA1 1006d8da7481fef905a2cdbd332c65fcab29ffab SHA256 6289b12cf7ecad00900ff09c76214196436cf32e8bdd71defd207a32b3af54ce
-DIST planner-0.14.6.tar.xz 3392796 RMD160 edfb1df0158695d918a6848b7e62ebed8830a210 SHA1 3e6220aaf106d8d7e1fa6325b9a0b5f09ebf0917 SHA256 130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696
diff --git a/app-office/planner/files/planner-0.14.6-find-python.patch b/app-office/planner/files/planner-0.14.6-find-python.patch
deleted file mode 100644
index 60f503a88875..000000000000
--- a/app-office/planner/files/planner-0.14.6-find-python.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- acinclude.m4.old 2011-07-05 14:33:18.000000000 +0200
-+++ acinclude.m4 2011-07-05 14:34:23.000000000 +0200
-@@ -85,14 +85,8 @@
-
- # Check for Python library path
- AC_MSG_CHECKING([for Python library path])
-- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
-- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
-- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
-- if test -n "$python_path" ; then
-- break
-- fi
-- done
-- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
-+ [python_path=`$PYTHON -c 'import distutils.sysconfig, os; \
-+ print(os.path.sep.join(distutils.sysconfig.get_python_lib(standard_lib=True).split(os.path.sep)[:-1]))'`]
- AC_MSG_RESULT([$python_path])
- if test -z "$python_path" ; then
- AC_MSG_ERROR([cannot find Python library path])
diff --git a/app-office/planner/planner-0.14.6.ebuild b/app-office/planner/planner-0.14.6.ebuild
deleted file mode 100644
index 0da742295280..000000000000
--- a/app-office/planner/planner-0.14.6.ebuild
+++ /dev/null
@@ -1,76 +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/planner/planner-0.14.6.ebuild,v 1.1 2012/01/04 19:55:13 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2"
-
-inherit python gnome2 eutils autotools
-
-DESCRIPTION="Project manager for Gnome"
-HOMEPAGE="http://live.gnome.org/Planner/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="doc eds python examples"
-
-RDEPEND=">=dev-libs/glib-2.6:2
- >=x11-libs/gtk+-2.14:2
- >=gnome-base/libgnomecanvas-2.10
- >=gnome-base/libgnomeui-2.10
- >=gnome-base/libglade-2.4:2.0
- >=gnome-base/gconf-2.6:2
- >=dev-libs/libxml2-2.6.27:2
- >=dev-libs/libxslt-1.1.23
- python? ( >=dev-python/pygtk-2.6:2 )
- eds? (
- >=gnome-extra/evolution-data-server-1.1
- >=mail-client/evolution-2.1.3 )"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.12.0
- app-text/scrollkeeper
- >=dev-util/intltool-0.35.5
- doc? ( >=dev-util/gtk-doc-1.0 )
- dev-util/gtk-doc-am
- gnome-base/gnome-common"
-
-# FIXME: disable eds backend for now, it fails, upstream bug #654005
-pkg_setup() {
- DOCS="AUTHORS COPYING ChangeLog NEWS README"
- G2CONF="${G2CONF}
- $(use_enable python)
- $(use_enable python python-plugin)
- $(use_enable eds)
- --disable-eds-backend
- --with-database=no
- --disable-update-mimedb"
- #$(use_enable eds eds-backend)
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- # Find python in a faster way, bug #344231, upstream bug #654044
- epatch "${FILESDIR}/${PN}-0.14.6-find-python.patch"
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install \
- sqldocdir="\$(datadir)/doc/${PF}" \
- sampledir="\$(datadir)/doc/${PF}/examples"
-
- if ! use examples; then
- rm -rf "${D}/usr/share/doc/${PF}/examples"
- fi
-}
diff --git a/app-office/rabbit/Manifest b/app-office/rabbit/Manifest
index 53463c1cb97b..a4b2a50728d5 100644
--- a/app-office/rabbit/Manifest
+++ b/app-office/rabbit/Manifest
@@ -1 +1,2 @@
+DIST rabbit-0.6.4.tar.gz 5895707 RMD160 0243187185641923232c71fffd16d4ce22cf73bb SHA1 77b9850a2a616b45790735ec544d039503fd2327 SHA256 fa9cf8a9fb6db565b3e574086c8273afc1f4722b7cf73637b12dea06b1f65fc5
DIST rabbit-0.9.2.tar.gz 6088701 RMD160 3d078b948524f2d1a13f754b1c67582d58b7b835 SHA1 caa1492e3ffb4aa2ef5513af1cd32827280b3da0 SHA256 17f5a195ff85453733c8d67f5ad8af794f446081c1729efb2b5f76f033b3c9e7
diff --git a/app-office/rabbit/rabbit-0.6.4-r1.ebuild b/app-office/rabbit/rabbit-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..593db7ee4c4b
--- /dev/null
+++ b/app-office/rabbit/rabbit-0.6.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/rabbit/rabbit-0.6.4-r1.ebuild,v 1.2 2011/03/12 11:50:03 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit ruby-ng elisp-common eutils
+
+DESCRIPTION="An application to do presentation with RD document"
+HOMEPAGE="http://www.cozmixng.org/~rwiki/?cmd=view;name=Rabbit"
+SRC_URI="http://www.cozmixng.org/~kou/download/${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls gs migemo tgif enscript emacs"
+
+CDEPEND="emacs? ( virtual/emacs )"
+DEPEND="${DEPEND} ${CDEPEND}"
+RDEPEND="${RDEPEND} ${CDEPEND}
+ nls? ( dev-ruby/ruby-gettext )
+ gs? ( app-text/ghostscript-gpl )
+ migemo? ( app-text/migemo )
+ enscript? ( app-text/enscript )
+ tgif? ( media-gfx/tgif )"
+
+ruby_add_rdepend "
+ dev-ruby/ruby-gnome2
+ >=dev-ruby/ruby-gdkpixbuf2-0.15.0
+ dev-ruby/rdtool"
+
+each_ruby_configure() {
+ ${RUBY} setup.rb config --prefix=/usr || die
+ ${RUBY} setup.rb setup || die
+}
+
+all_ruby_compile() {
+ if use emacs; then
+ cd "${S}/misc/emacs"
+ elisp-compile rabbit-mode.el
+ fi
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die "Tests failed."
+}
+
+each_ruby_install() {
+ ${RUBY} setup.rb install --prefix="${D}"
+}
+
+all_ruby_install() {
+ dodoc NEWS.en NEWS.ja README.en README.ja TODO || die
+
+ if use emacs; then
+ cd "${S}/misc/emacs"
+ elisp-install rabbit-mode rabbit-mode.el{,c}
+ elisp-site-file-install "${FILESDIR}/50rabbit-mode-gentoo.el"
+ fi
+
+ insinto /usr/share/doc/${PF}
+ doins -r sample
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 45b97f9d8f1f..262dc5ab3a53 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1,5 @@
+DIST scribus-1.3.6.tar.bz2 22911379 RMD160 8f31a7e1030999fb85be9511ec97f7fc12d86a89 SHA1 35ceba09bea73b3cb10f38dddc5bc24185df794e SHA256 51399f004b3d9ae8cba48772421a307fa53cdf3bedd6a7ffb0f23909574e9675
+DIST scribus-1.3.8.tar.bz2 24942860 RMD160 6f2423062daa5dd17e6b6da9695fc81323199ac2 SHA1 be54c93a8da56d9efe5e4d46c5cebebc36104670 SHA256 4ad5f78b9e8421d621f195d185d3213e525e9c2cf1a63ebb935d13128a2126c3
DIST scribus-1.3.9.tar.bz2 35729860 RMD160 63e1d3f7f723843e9d1c787e1405b57a15f08fcc SHA1 86bc4db2d8fbb91fe94f8535327991e9128c5862 SHA256 fb172f6b9a812f3b0a9de911b245012a067a9aad50473fa1da1d1c5861641eac
-DIST scribus-1.4.0.tar.bz2 42134397 RMD160 f4a0813c1961f1929bccaaa4c0a21f84dfd75c62 SHA1 d19e455f261c4075076f1d6f4a55fbd934a66c60 SHA256 9ae4e50523f0891c9dce45893ca9f58d32096442e43e75acec466fd9405362a9
+DIST scribus-1.4.0.rc5.tar.bz2 36661351 RMD160 73d040ef136df76fbbc440f0e8589b913919a936 SHA1 51ff4646a25656beafc494144eb94d8574fafa8d SHA256 4a65d0de346a00972447a9bed03e2a3c039023752bf5ce2fffd892a3879c2a80
+DIST scribus-1.4.0.rc6.tar.bz2 39287217 RMD160 0d5737aa15512d1c8334c74af6fcf225aaf2cdcf SHA1 1962052d5faf52dcb6988e4e0ff87d5d626351d1 SHA256 91b218469f96818d00e0ff606b3524757bda03289e72edfca34462f865ff36e7
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 08bff7ce5327..c8954cc93984 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -13,15 +13,5 @@
Don't install headers (only required for e.g. plug-in developers)
Document tamplates
- Language support for cs_CZ
- Language support for da_DK
- Language support for de_1901
- Language support for de_CH
- Language support for en_AU
- Language support for lt_LT
- Language support for pl_PL
- Language support for sa
- Language support for sk_SK
- Language support for th_TH
diff --git a/app-office/scribus/scribus-1.3.6.ebuild b/app-office/scribus/scribus-1.3.6.ebuild
new file mode 100644
index 000000000000..565ccba3b644
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.12 2011/11/17 17:05:54 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils fdo-mime multilib python
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="cairo debug +minimal +pdf spell"
+
+COMMON_DEPEND="
+ dev-libs/hyphen
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:0
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ virtual/jpeg
+ spell? ( app-text/aspell )
+ pdf? ( app-text/podofo )
+ cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost"
+
+RESTRICT="mirror" #318643
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
+ "${FILESDIR}/${PN}-1.3.6-podofo-0.8.0.patch"
+ )
+
+DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DHAVE_PYTHON=ON"
+ "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+ "-DPYTHON_LIBRARY=$(python_get_library)"
+ "-DWANT_NORPATH=ON"
+ "-DWANT_QTARTHUR=ON"
+ "-DWANT_QT3SUPPORT=OFF"
+ $(cmake-utils_use_has spell ASPELL)
+ $(cmake-utils_use_has pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.3.8.ebuild b/app-office/scribus/scribus-1.3.8.ebuild
new file mode 100644
index 000000000000..fc380b6f6fe6
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.8.ebuild,v 1.4 2011/11/17 17:05:54 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils fdo-mime multilib python
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug +minimal +pdf spell"
+
+COMMON_DEPEND="
+ dev-libs/hyphen
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:0
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ virtual/jpeg
+ spell? ( app-text/aspell )
+ pdf? ( app-text/podofo )
+ cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
+ )
+
+DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DHAVE_PYTHON=ON"
+ "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+ "-DPYTHON_LIBRARY=$(python_get_library)"
+ "-DWANT_NORPATH=ON"
+ "-DWANT_QTARTHUR=ON"
+ "-DWANT_QT3SUPPORT=OFF"
+ $(cmake-utils_use_has spell ASPELL)
+ $(cmake-utils_use_has pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.3.9-r1.ebuild b/app-office/scribus/scribus-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..5a20696e6c2e
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.9-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r1.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils fdo-mime multilib python
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples +minimal +pdf spell templates"
+
+COMMON_DEPEND="
+ dev-libs/hyphen
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:0
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ virtual/jpeg
+ spell? ( app-text/aspell )
+ pdf? ( app-text/podofo )
+ cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.5.1-system-hyphen.patch"
+ )
+
+DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ use templates || \
+ sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+ use examples || \
+ sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+ base_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DHAVE_PYTHON=ON"
+ "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+ "-DPYTHON_LIBRARY=$(python_get_library)"
+ "-DWANT_NORPATH=ON"
+ "-DWANT_QTARTHUR=ON"
+ "-DWANT_QT3SUPPORT=OFF"
+ $(cmake-utils_use_has spell ASPELL)
+ $(cmake-utils_use_has pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.4.0.ebuild b/app-office/scribus/scribus-1.4.0.ebuild
deleted file mode 100644
index 0c1e651e1f90..000000000000
--- a/app-office/scribus/scribus-1.4.0.ebuild
+++ /dev/null
@@ -1,114 +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/scribus/scribus-1.4.0.ebuild,v 1.2 2012/01/22 13:01:35 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit cmake-utils fdo-mime multilib python
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo debug examples +minimal +pdf spell templates"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-COMMON_DEPEND="
- dev-libs/hyphen
- dev-libs/libxml2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- media-libs/libpng:0
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- virtual/jpeg
- spell? ( app-text/aspell )
- pdf? ( app-text/podofo )
- cairo? ( x11-libs/cairo[X,svg] )"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
- )
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- if use templates; then
- sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
- fi
- if use examples; then
- sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
- fi
-
- sed \
- -e '1i#define OF(x) x' \
- -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
-
- base_src_prepare
-}
-
-src_configure() {
- local lang langs
- for lang in ${IUSE_LINGUAS}; do
- use linguas_${lang} && langs+=",${lang}"
- done
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY=$(python_get_library)
- -DWANT_NORPATH=ON
- -DWANT_QTARTHUR=ON
- -DWANT_QT3SUPPORT=OFF
- -DGENTOOVERSION=${PVR}
- -DWANT_GUI_LANG=${langs#,}
- $(cmake-utils_use_has spell ASPELL)
- $(cmake-utils_use_has pdf PODOFO)
- $(cmake-utils_use_want cairo)
- $(cmake-utils_use_want minimal NOHEADERINSTALL)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
- ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
- docompress -x /usr/share/doc/${PF}/en
- doicon resources/icons/scribus.png
- domenu scribus.desktop
-}
-
-pkg_preinst() {
- # 399595
- rm -vf "${ED}"/usr/share/doc/${PF}/en* ||Â die
- ln -sf html "${ED}"/usr/share/doc/${PF}/en
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-}
diff --git a/app-office/scribus/scribus-1.4.0_rc5.ebuild b/app-office/scribus/scribus-1.4.0_rc5.ebuild
new file mode 100644
index 000000000000..a40bf8a131b2
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.0_rc5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.5 2011/11/17 17:05:54 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils fdo-mime multilib python
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples +minimal +pdf spell templates"
+
+COMMON_DEPEND="
+ dev-libs/hyphen
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:2
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ virtual/jpeg
+ spell? ( app-text/aspell )
+ pdf? ( app-text/podofo )
+ cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ )
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ use templates || \
+ sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+ use examples || \
+ sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+
+sed \
+ -e '1i#define OF(x) x' \
+ -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+
+ base_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DHAVE_PYTHON=ON"
+ "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+ "-DPYTHON_LIBRARY=$(python_get_library)"
+ "-DWANT_NORPATH=ON"
+ "-DWANT_QTARTHUR=ON"
+ "-DWANT_QT3SUPPORT=OFF"
+ "-DGENTOOVERSION=${PVR}"
+ $(cmake-utils_use_has spell ASPELL)
+ $(cmake-utils_use_has pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ mv "${ED}"/usr/share/doc/${PF}/{en,html}
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en
+
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.4.0_rc6.ebuild b/app-office/scribus/scribus-1.4.0_rc6.ebuild
new file mode 100644
index 000000000000..6876db6f0d84
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.0_rc6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc6.ebuild,v 1.2 2011/11/17 17:05:54 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils fdo-mime multilib python
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples +minimal +pdf spell templates"
+
+COMMON_DEPEND="
+ dev-libs/hyphen
+ dev-libs/libxml2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:2
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ virtual/jpeg
+ spell? ( app-text/aspell )
+ pdf? ( app-text/podofo )
+ cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+ )
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ use templates || \
+ sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+ use examples || \
+ sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+
+sed \
+ -e '1i#define OF(x) x' \
+ -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+
+ base_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ "-DHAVE_PYTHON=ON"
+ "-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+ "-DPYTHON_LIBRARY=$(python_get_library)"
+ "-DWANT_NORPATH=ON"
+ "-DWANT_QTARTHUR=ON"
+ "-DWANT_QT3SUPPORT=OFF"
+ "-DGENTOOVERSION=${PVR}"
+ $(cmake-utils_use_has spell ASPELL)
+ $(cmake-utils_use_has pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ mv "${ED}"/usr/share/doc/${PF}/{en,html}
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en
+
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index d405a58d443e..3b9d68a82247 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,3 @@
DIST skrooge-0.8.0.tar.bz2 8262568 RMD160 094659591763bf757cf5bb050f191492163b072a SHA1 47182435735a9abbe733782814ff770ddb5f0ab6 SHA256 67cb3f557bbeb55afa77f7b306187cead45915d1cf0161bbd1206a942d2af66e
-DIST skrooge-1.1.1.tar.bz2 8559953 RMD160 030e9f16f9ec9a81a48c7610fc0df5b7d73442bf SHA1 063af1a04c2406babc59203e0d57912e834e46f1 SHA256 6553a61a74bb4f5d0272fff4844e47d983fa38cd6af0481658f4d1e3150c6d62
-DIST skrooge-1.2.0.tar.bz2 9709899 RMD160 9652414237b000a1ba206911876d6104423e642c SHA1 1587d493f6064637805e3601bdae08fd5258a633 SHA256 059d2e1dd6feb8e7fcf86b61c0932359b182c207f9dda21642a50253b7857f2a
+DIST skrooge-0.9.1.tar.bz2 7246125 RMD160 4a7cb0be10e1e006d429c7b483e1b24c53b0cc37 SHA1 e08ab33dc1e35934d5fd21e320dbefbfe44dcd05 SHA256 896e61a65b33b0403c62eb5bf0ec0ffb80dffa571355f9f674d115d34f7afffd
+DIST skrooge-1.0.0.tar.bz2 7083506 RMD160 3d40192242621231ef6761d633a1e55cc3ce6ab9 SHA1 f67a9c4fe1dc53c8fd4e26d2e37935fa3f96c1b6 SHA256 8c78cec3ff873d46cf45c809029d72c61e789226ca337b47f75dc41a128de98e
diff --git a/app-office/skrooge/skrooge-0.9.1.ebuild b/app-office/skrooge/skrooge-0.9.1.ebuild
new file mode 100644
index 000000000000..dad08555f0ee
--- /dev/null
+++ b/app-office/skrooge/skrooge-0.9.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-0.9.1.ebuild,v 1.1 2011/09/06 19:45:52 scarabeus Exp $
+
+EAPI=4
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja ko lt ms nb
+nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_TW"
+KDE_DOC_DIRS="doc"
+inherit kde4-base
+
+DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
+HOMEPAGE="http://skrooge.org/"
+SRC_URI="http://skrooge.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +handbook"
+
+DEPEND=">=dev-libs/libofx-0.9.1
+ app-crypt/qca:2
+ x11-libs/qt-sql:4[sqlite]"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdesdk-scripts)"
+
+DOCS="AUTHORS CHANGELOG README TODO"
+
+src_test() { :; }
+# tests are not included in tarball, bug 372315
diff --git a/app-office/skrooge/skrooge-1.0.0.ebuild b/app-office/skrooge/skrooge-1.0.0.ebuild
new file mode 100644
index 000000000000..a28c06c449b8
--- /dev/null
+++ b/app-office/skrooge/skrooge-1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.0.0.ebuild,v 1.1 2011/10/18 22:36:55 dilfridge Exp $
+
+EAPI=4
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja lt nb
+nl pl pt pt_BR ro ru sk sv tr ug zh_CN"
+KDE_DOC_DIRS="doc"
+inherit kde4-base
+
+DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
+HOMEPAGE="http://skrooge.org/"
+SRC_URI="http://skrooge.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +handbook"
+
+DEPEND="
+ app-crypt/qca:2
+ dev-libs/grantlee
+ >=dev-libs/libofx-0.9.1
+ x11-libs/qt-sql:4[sqlite]
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdesdk-scripts)
+"
+
+DOCS="AUTHORS CHANGELOG README TODO"
+
+src_test() { :; }
+# tests are not included in tarball, bug 372315
diff --git a/app-office/skrooge/skrooge-1.1.1.ebuild b/app-office/skrooge/skrooge-1.1.1.ebuild
deleted file mode 100644
index 0863cc1d64df..000000000000
--- a/app-office/skrooge/skrooge-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +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/skrooge/skrooge-1.1.1.ebuild,v 1.2 2012/01/18 14:46:30 johu Exp $
-
-EAPI=4
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja lt nb
-nl pl pt pt_BR ro ru sk sv tr ug zh_CN"
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- app-crypt/qca:2
- dev-libs/grantlee
- >=dev-libs/libofx-0.9.1
- x11-libs/qt-sql:4[sqlite]
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdesdk-scripts)
-"
-
-DOCS="AUTHORS CHANGELOG README TODO"
-
-src_test() { :; }
-# tests are not included in tarball, bug 372315
diff --git a/app-office/skrooge/skrooge-1.2.0.ebuild b/app-office/skrooge/skrooge-1.2.0.ebuild
deleted file mode 100644
index f7464c216ebc..000000000000
--- a/app-office/skrooge/skrooge-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +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/skrooge/skrooge-1.2.0.ebuild,v 1.1 2012/01/18 14:46:30 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja
-ko lt ms nb nl pl pt pt_BR ro ru sk sv tr ug zh_CN zh_TW"
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- app-crypt/qca:2
- dev-libs/grantlee
- >=dev-libs/libofx-0.9.1
- x11-libs/qt-sql:4[sqlite]
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdesdk-scripts)
-"
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_test() { :; }
-# tests are not included in tarball, bug 372315
diff --git a/app-office/taxbird/Manifest b/app-office/taxbird/Manifest
index 369608ec93ed..d268b5ee4782 100644
--- a/app-office/taxbird/Manifest
+++ b/app-office/taxbird/Manifest
@@ -1,3 +1,2 @@
DIST taxbird-0.15.tar.gz 410501 RMD160 bf0c5037ae5595c659d81e96e90de95f6f11d889 SHA1 90e33c06abaf6dd1e32aa1aa29372c073e26aa0b SHA256 0a573fd5400acdeb1b3f580bf4be010bd684dd1e46f307506350df5f776e0bbb
DIST taxbird-0.16.tar.gz 419770 RMD160 0e598a491a2cf491ef19f975b7faea1a945a9648 SHA1 9fc9aa6baf1e415beda58a50dcc6ba818bb2d6db SHA256 afb582a37d1879ebdbbb6ae40fdea7092386dac840a38c191be3a799f2742f82
-DIST taxbird-0.18.tar.gz 414988 RMD160 af77d931f00f2001aa32971684b5029e16188c31 SHA1 2fec2f7f3744ae89c3d7e025bbe0bd45824daeab SHA256 4ed073989eb9d17b06e120e3e9a5669fc48c2b2df26b118521baa98f11e81413
diff --git a/app-office/taxbird/taxbird-0.18.ebuild b/app-office/taxbird/taxbird-0.18.ebuild
deleted file mode 100644
index 5e8606eae730..000000000000
--- a/app-office/taxbird/taxbird-0.18.ebuild
+++ /dev/null
@@ -1,38 +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/taxbird/taxbird-0.18.ebuild,v 1.1 2012/01/13 01:07:39 xmw Exp $
-
-EAPI="2"
-
-inherit eutils fdo-mime
-
-DESCRIPTION="Taxbird provides a GUI to submit tax forms to the german digital tax project ELSTER."
-HOMEPAGE="http://www.taxbird.de/"
-SRC_URI="http://www.taxbird.de/download/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libgeier-0.13
- >=gnome-extra/gtkhtml-3.8:3.14
- gnome-base/libgnomeui
- sys-devel/gettext
- >=dev-scheme/guile-1.8.0[regex,deprecated]"
-RDEPEND="${DEPEND}"
-
-src_install() {
- dodoc README* || die "dodoc failed"
-
- einstall || die "Installation failed!"
-
- # clean out the installed mime files, those get recreated in the pkg_postinst function
- einfo "Deleting mime files in ${D}/usr/share/mime"
- find "${D}/usr/share/mime/" -maxdepth 1 -type f -delete
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index ef35c0b94c70..407065b63a0c 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,5 +1,6 @@
+DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
+DIST texmaker-3.0.1.tar.bz2 5180509 RMD160 18b26895ab46c6f9781e806c1b79335d626e3e70 SHA1 a160eda2e56fd9dba9f68499e4d5dd62f8b66a69 SHA256 badde87708a95bd54e65d3d17595f790486053000052926f860ad5b7e03cf6e7
+DIST texmaker-3.0.2.tar.bz2 5207700 RMD160 795deca96ffba36d9b744c915310cac21885b20d SHA1 24aa9e6cdbb8b33c38979fddab4ff5598f1467f1 SHA256 612ed98ddc6a889a10624a111ea99f6ed5aed9eb813e4b55eabb3c2a711d7026
+DIST texmaker-3.0.tar.bz2 5158725 RMD160 a2458b095b92d1ecc4b463009c5903089c8e3db3 SHA1 d187b826d520390d9164a2e435bc37127a6dd59a SHA256 4957d1e5f84bf928fa2a16bd094247a55f4fe405457b0738fc7bfbae84b85db2
DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
-DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6
-DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a
-DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
diff --git a/app-office/texmaker/files/texmaker-3.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2-hunspell.patch
deleted file mode 100644
index 76613c60ab59..000000000000
--- a/app-office/texmaker/files/texmaker-3.2-hunspell.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
- latexeditor.h
- texmaker.pro
----
- configdialog.cpp | 4 ++--
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
-
-diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include
- #include
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- #include
-
-diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS += texmaker.h \
- scandialog.h \
- synctex_parser.h \
- synctex_parser_utils.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS += texmaker.h \
- encodingprober/nsSJISProber.h \
- encodingprober/nsUniversalDetector.h \
- encodingprober/qencodingprober.h \
-- encodingprober/UnicodeGroupProber.h
-+ encodingprober/UnicodeGroupProber.h
- SOURCES += main.cpp \
- texmakerapp.cpp \
- texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES += main.cpp \
- scandialog.cpp \
- synctex_parser.c \
- synctex_parser_utils.c \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS += -lpoppler-qt4
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
---
-1.7.8.1
-
diff --git a/app-office/texmaker/files/texmaker-3.2.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.2.1-hunspell.patch
deleted file mode 100644
index 76613c60ab59..000000000000
--- a/app-office/texmaker/files/texmaker-3.2.1-hunspell.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
- latexeditor.h
- texmaker.pro
----
- configdialog.cpp | 4 ++--
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
-
-diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include
- #include
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- #include
-
-diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS += texmaker.h \
- scandialog.h \
- synctex_parser.h \
- synctex_parser_utils.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS += texmaker.h \
- encodingprober/nsSJISProber.h \
- encodingprober/nsUniversalDetector.h \
- encodingprober/qencodingprober.h \
-- encodingprober/UnicodeGroupProber.h
-+ encodingprober/UnicodeGroupProber.h
- SOURCES += main.cpp \
- texmakerapp.cpp \
- texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES += main.cpp \
- scandialog.cpp \
- synctex_parser.c \
- synctex_parser_utils.c \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS += -lpoppler-qt4
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
---
-1.7.8.1
-
diff --git a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
deleted file mode 100644
index b680f30d1aa4..000000000000
--- a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
- latexeditor.h
- texmaker.pro
----
- configdialog.cpp | 4 ++--
- latexeditor.h | 2 +-
- latexeditorview.h | 2 +-
- latexhighlighter.h | 2 +-
- spellerdialog.h | 2 +-
- texmaker.h | 2 +-
- texmaker.pro | 44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
-
-diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,7 @@
-
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- typedef int UserBookmarkList[3];
-
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class LatexEditorView : public QWidget {
- Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include
- #include
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
-
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
-
- #include
-
-diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET = texmaker
- QT += network \
- xml \
- webkit
--CONFIG += qt warn_off release
-+CONFIG += qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS += texmaker.h \
- scandialog.h \
- synctex_parser.h \
- synctex_parser_utils.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
- singleapp/qtlocalpeer.h \
- singleapp/qtlockedfile.h \
- singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS += texmaker.h \
- encodingprober/nsSJISProber.h \
- encodingprober/nsUniversalDetector.h \
- encodingprober/qencodingprober.h \
-- encodingprober/UnicodeGroupProber.h
-+ encodingprober/UnicodeGroupProber.h
- SOURCES += main.cpp \
- texmakerapp.cpp \
- texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES += main.cpp \
- scandialog.cpp \
- synctex_parser.c \
- synctex_parser_utils.c \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
- singleapp/qtlocalpeer.cpp \
- singleapp/qtlockedfile.cpp \
- singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
- ICONDIR=/usr/share/pixmaps
- }
-
--INCLUDEPATH += /usr/include/poppler/qt4
--LIBS += -L/usr/lib -lpoppler-qt4
--LIBS += -L/usr/lib -lz
-+INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS += -lpoppler-qt4
-+LIBS += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
-
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
-
-
- INSTALLS = target
---
-1.7.8.1
-
diff --git a/app-office/texmaker/texmaker-1.92.ebuild b/app-office/texmaker/texmaker-1.92.ebuild
new file mode 100644
index 000000000000..ba6d8b7f7c01
--- /dev/null
+++ b/app-office/texmaker/texmaker-1.92.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.92.ebuild,v 1.8 2010/10/23 14:48:48 armin76 Exp $
+
+EAPI=1
+
+inherit eutils versionator qt4
+
+DESCRIPTION="A nice LaTeX-IDE"
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+S="${WORKDIR}/${MY_P}"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.5.1:4
+ >=x11-libs/qt-core-4.5.1:4
+ >=app-text/hunspell-1.2.4"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-1.91-hunspell.patch"
+}
+
+src_compile() {
+ eqmake4 texmaker.pro || die "qmake failed"
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+ insinto /usr/share/pixmaps/texmaker
+ doins utilities/texmaker*.png || die "doins failed."
+ doins utilities/texmaker.svg || die "doins failed."
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "/usr/share/${PN}/usermanual_en.html"
+ elog
+}
diff --git a/app-office/texmaker/texmaker-3.00.ebuild b/app-office/texmaker/texmaker-3.00.ebuild
new file mode 100644
index 000000000000..fde9988e8bea
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.00.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.00.ebuild,v 1.1 2011/04/04 06:56:52 jlec Exp $
+
+EAPI="3"
+
+inherit base qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ app-text/poppler[qt4]
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.6.1:4
+ >=x11-libs/qt-core-4.6.1:4
+ >=x11-libs/qt-webkit-4.6.1:4
+ >=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+ insinto /usr/share/pixmaps/texmaker
+ doins utilities/texmaker*.png || die "doins failed."
+ doins utilities/texmaker.svg || die "doins failed."
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-office/texmaker/texmaker-3.01.ebuild b/app-office/texmaker/texmaker-3.01.ebuild
new file mode 100644
index 000000000000..9b21edae4734
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.01.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.01.ebuild,v 1.1 2011/04/17 16:11:24 jlec Exp $
+
+EAPI="3"
+
+inherit base qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ app-text/poppler[qt4]
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.6.1:4
+ >=x11-libs/qt-core-4.6.1:4
+ >=x11-libs/qt-webkit-4.6.1:4
+ >=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+ insinto /usr/share/pixmaps/texmaker
+ doins utilities/texmaker*.png || die "doins failed."
+ doins utilities/texmaker.svg || die "doins failed."
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-office/texmaker/texmaker-3.02.ebuild b/app-office/texmaker/texmaker-3.02.ebuild
new file mode 100644
index 000000000000..ea0d0c4da51b
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.02.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.02.ebuild,v 1.1 2011/04/27 06:38:17 jlec Exp $
+
+EAPI="3"
+
+inherit base qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ app-text/poppler[qt4]
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/qt-gui-4.6.1:4
+ >=x11-libs/qt-core-4.6.1:4
+ >=x11-libs/qt-webkit-4.6.1:4
+ >=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+ insinto /usr/share/pixmaps/texmaker
+ doins utilities/texmaker*.png || die "doins failed."
+ doins utilities/texmaker.svg || die "doins failed."
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-office/texmaker/texmaker-3.1.ebuild b/app-office/texmaker/texmaker-3.1.ebuild
index c6579a3a4e22..bb1ab3deea92 100644
--- a/app-office/texmaker/texmaker-3.1.ebuild
+++ b/app-office/texmaker/texmaker-3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.6 2012/01/04 17:51:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.3 2011/12/04 10:10:03 jlec Exp $
EAPI="3"
@@ -25,14 +25,13 @@ SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}/${MY_P}"
COMMON_DEPEND="
app-text/poppler[qt4]
- sys-libs/zlib
x11-libs/libX11
x11-libs/libXext
>=x11-libs/qt-gui-4.6.1:4
diff --git a/app-office/texmaker/texmaker-3.2.1.ebuild b/app-office/texmaker/texmaker-3.2.1.ebuild
deleted file mode 100644
index a003c9dae34d..000000000000
--- a/app-office/texmaker/texmaker-3.2.1.ebuild
+++ /dev/null
@@ -1,70 +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/texmaker/texmaker-3.2.1.ebuild,v 1.1 2012/01/05 08:17:31 jlec Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
- MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
- MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
- app-text/poppler[qt4]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/qt-gui-4.6.1:4
- >=x11-libs/qt-core-4.6.1:4
- >=x11-libs/qt-webkit-4.6.1:4
- >=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
- qt4-r2_src_prepare
- eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
- insinto /usr/share/pixmaps/texmaker
- doins utilities/texmaker*.png || die "doins failed."
- doins utilities/texmaker.svg || die "doins failed."
-
- dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
- elog "A user manual with many screenshots is available at:"
- elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.2.2.ebuild b/app-office/texmaker/texmaker-3.2.2.ebuild
deleted file mode 100644
index 6e3e3280d458..000000000000
--- a/app-office/texmaker/texmaker-3.2.2.ebuild
+++ /dev/null
@@ -1,70 +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/texmaker/texmaker-3.2.2.ebuild,v 1.1 2012/01/12 10:49:59 jlec Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
- MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
- MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
- app-text/poppler[qt4]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/qt-gui-4.6.1:4
- >=x11-libs/qt-core-4.6.1:4
- >=x11-libs/qt-webkit-4.6.1:4
- >=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
- qt4-r2_src_prepare
- eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
- insinto /usr/share/pixmaps/texmaker
- doins utilities/texmaker*.png || die "doins failed."
- doins utilities/texmaker.svg || die "doins failed."
-
- dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
- elog "A user manual with many screenshots is available at:"
- elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.2.ebuild b/app-office/texmaker/texmaker-3.2.ebuild
deleted file mode 100644
index 4d040507ad46..000000000000
--- a/app-office/texmaker/texmaker-3.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.ebuild,v 1.1 2011/12/22 11:22:26 jlec Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
- MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
- MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
- app-text/poppler[qt4]
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/qt-gui-4.6.1:4
- >=x11-libs/qt-core-4.6.1:4
- >=x11-libs/qt-webkit-4.6.1:4
- >=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
- qt4-r2_src_prepare
- eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
- insinto /usr/share/pixmaps/texmaker
- doins utilities/texmaker*.png || die "doins failed."
- doins utilities/texmaker.svg || die "doins failed."
-
- dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
- elog "A user manual with many screenshots is available at:"
- elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-pda/gtkpod/gtkpod-2.1.0.ebuild b/app-pda/gtkpod/gtkpod-2.1.0.ebuild
index 6b34df9e77db..129fb2bfb299 100644
--- a/app-pda/gtkpod/gtkpod-2.1.0.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.0.ebuild,v 1.2 2011/12/22 13:04:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.0.ebuild,v 1.1 2011/09/17 14:24:32 ssuominen Exp $
EAPI=4
inherit gnome2-utils
@@ -83,5 +83,5 @@ pkg_postinst() {
pkg_postrm() {
gnome2_icon_cache_update
- gnome2_schemas_update
+ gnome2_schemas_update --uninstall
}
diff --git a/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild b/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild
index 7fdcca2b58e4..42f695ca28e2 100644
--- a/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild
+++ b/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild,v 1.3 2012/01/24 02:59:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild,v 1.2 2011/03/30 18:26:57 ssuominen Exp $
EAPI=3
@@ -19,7 +19,7 @@ IUSE="bluetooth"
RDEPEND="~app-pda/libopensync-${PV}
~app-pda/libopensync-plugin-python-${PV}
- dev-python/python-dateutil:python-2
+ dev-python/python-dateutil
bluetooth? ( dev-python/pybluez )"
DEPEND=""
diff --git a/app-pda/usbmuxd/files/usbmuxd-1.0.7-receive_packet_overflow.patch b/app-pda/usbmuxd/files/usbmuxd-1.0.7-receive_packet_overflow.patch
deleted file mode 100644
index eed63f364b83..000000000000
--- a/app-pda/usbmuxd/files/usbmuxd-1.0.7-receive_packet_overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 8968476bb5262d8aef20cb199337b174d338beb8 Mon Sep 17 00:00:00 2001
-From: Nikias Bassen
-Date: Thu, 12 Jan 2012 16:58:26 +0000
-Subject: Fix possible buffer overflow (thanks Rigan)
-
----
-diff --git a/libusbmuxd/libusbmuxd.c b/libusbmuxd/libusbmuxd.c
-index e06ee61..98e92df 100644
---- a/libusbmuxd/libusbmuxd.c
-+++ b/libusbmuxd/libusbmuxd.c
-@@ -189,7 +189,7 @@ static int receive_packet(int sfd, struct usbmuxd_header *header, void **payload
- char *strval = NULL;
- plist_get_string_val(n, &strval);
- if (strval) {
-- strcpy(dev->serial_number, strval);
-+ strncpy(dev->serial_number, strval, 255);
- free(strval);
- }
- n = plist_dict_get_item(props, "LocationID");
---
-cgit v0.8.3.1-34-gbf3d
diff --git a/app-pda/usbmuxd/usbmuxd-1.0.7-r1.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.7-r1.ebuild
deleted file mode 100644
index 707ad350a367..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.7-r1.ebuild,v 1.3 2012/01/23 14:11:36 tomka Exp $
-
-EAPI=3
-inherit eutils cmake-utils
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-SRC_URI="http://marcansoft.com/uploads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="app-pda/libplist
- virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup plugdev
- enewuser usbmux -1 -1 -1 "usb,plugdev"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-receive_packet_overflow.patch #399409
-}
-
-DOCS="AUTHORS README README.devel"
diff --git a/app-portage/cfg-update/cfg-update-1.8.7.ebuild b/app-portage/cfg-update/cfg-update-1.8.7.ebuild
index d134202fcdf0..e8a281948786 100644
--- a/app-portage/cfg-update/cfg-update-1.8.7.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.7.ebuild,v 1.4 2012/02/01 22:36:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.7.ebuild,v 1.2 2011/12/11 15:01:39 rich0 Exp $
EAPI=2
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
IUSE="X"
RDEPEND="X? ( >=x11-misc/sux-1.0
diff --git a/app-portage/conf-update/conf-update-1.0.1.ebuild b/app-portage/conf-update/conf-update-1.0.1.ebuild
index 80f2ac2f9c46..773616068746 100644
--- a/app-portage/conf-update/conf-update-1.0.1.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/conf-update/conf-update-1.0.1.ebuild,v 1.4 2012/01/04 22:28:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/conf-update/conf-update-1.0.1.ebuild,v 1.3 2011/12/14 09:20:13 phajdan.jr Exp $
inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ~ppc x86"
IUSE="colordiff"
RDEPEND=">=dev-libs/glib-2.6
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 3f824d122f66..80f35f6c5ebe 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,2 @@
+DIST eix-0.22.11.tar.xz 438672 RMD160 8b6496d7409bf2347f736acc998142aee4397165 SHA1 94e9a9c290ef4e6d4668b165a52bddd3860d6a4c SHA256 48e78234b4c0233b1e4532f77f941300b41dba892835738ad3c17a463564606d
DIST eix-0.23.3.tar.xz 443364 RMD160 ad7b6842ceeaa4d93bdf7fa6fcdc85f773b54970 SHA1 55d9a6ef2ebf07ba4293b9b2b78443658c47b12f SHA256 c9525a4f8605250469600667e364e2d9325d7964b3476653bb8908f28cccb828
-DIST eix-0.23.7.tar.xz 436020 RMD160 5ee7c0836ea035563987786046168ff084cce6cd SHA1 ef034c36f5514a7c6a4af2cef19d6335c06ac725 SHA256 b37b6bf417c0d5fdbbce9eeb8e1133feee73c0e70f54bc75b3ea8cf63c5abf66
-DIST eix-0.23.9.tar.xz 437468 RMD160 ed6e7009368e3149f6769ffe6638f9d8a6de9986 SHA1 a078726469837d681c8f9ce3e421336a082d1b1c SHA256 194bcaf7315a96b21990d2b51f13651e11c20a7e9814134bcfa31a88a7f087f5
diff --git a/app-portage/eix/eix-0.22.11.ebuild b/app-portage/eix/eix-0.22.11.ebuild
new file mode 100644
index 000000000000..e6c1402288e3
--- /dev/null
+++ b/app-portage/eix/eix-0.22.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.22.11.ebuild,v 1.10 2011/12/06 19:55:30 darkside Exp $
+
+EAPI="4"
+
+inherit multilib
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+HOMEPAGE="http://eix.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="bzip2 debug doc hardened nls optimization strong-optimization sqlite tools zsh-completion"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+ nls? ( virtual/libintl )
+ bzip2? ( app-arch/bzip2 )
+ zsh-completion? ( !!=dev-db/sqlite-3 )
- nls? ( virtual/libintl )
- zsh-completion? ( !!=dev-db/sqlite-3 )
- nls? ( virtual/libintl )
- zsh-completion? ( !!
-Date: Mon, 19 Dec 2011 13:09:42 -0600
-Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage.
-
----
- setup.py | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 2990e33..b24cd8f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,7 @@ cwd = os.getcwd()
- try:
- from portage.const import EPREFIX
- except ImportError:
-- EPREFIX='/'
-+ EPREFIX=''
-
- # Python files that need `__version__ = ""` subbed, relative to this dir:
- python_scripts = [os.path.join(cwd, path) for path in (
-@@ -80,9 +80,9 @@ core.setup(
- packages=packages,
- scripts=(glob('bin/*')),
- data_files=(
-- (os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/en/*')),
-- (os.path.join(EPREFIX, 'usr/share/man/fr/man1'), glob('man/fr/*')),
-- (os.path.join(EPREFIX, 'usr/share/man/it/man1'), glob('man/it/*')),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/en/*')),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/fr/man1'), glob('man/fr/*')),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/it/man1'), glob('man/it/*')),
- ),
- cmdclass={
- 'set_version': set_version,
---
-1.7.8
-
diff --git a/app-portage/euscan/Manifest b/app-portage/euscan/Manifest
index 712a18f9d164..b16a29404997 100644
--- a/app-portage/euscan/Manifest
+++ b/app-portage/euscan/Manifest
@@ -1,2 +1 @@
DIST euscan-0.1.0.tar.gz 441148 RMD160 302921ddd943a7a4dec5d4786685da81f49f9f4e SHA1 4d200cd5eca9c059f7621786c386ac2e0a48b50d SHA256 8a489777a10de76f0d93bbfda41177c3ee991df6472ac1503e8cb5b99782fb61
-DIST euscan-0.1.1.tar.gz 441780 RMD160 86428da634e78511932754adc0aca6bddce55862 SHA1 c1bc996dbc0c9cba759c63d416b8788bc02e0318 SHA256 cbf89803c0c8d6025239f0abd1ac17179c8ff81b1b059be7fc9415a8cfe6dd7e
diff --git a/app-portage/euscan/euscan-0.1.1.ebuild b/app-portage/euscan/euscan-0.1.1.ebuild
deleted file mode 100644
index 39eedd5aed5a..000000000000
--- a/app-portage/euscan/euscan-0.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-0.1.1.ebuild,v 1.1 2012/01/18 18:59:00 hwoarang Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python
-
-DESCRIPTION="Ebuild upstream scan utility"
-HOMEPAGE="http://euscan.iksaif.net"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
- >=app-portage/gentoolkit-0.2.8
- dev-python/argparse
- dev-python/setuptools
- dev-python/beautifulsoup"
-
-distutils_src_compile_pre_hook() {
- echo VERSION="${PV}" "$(PYTHON)" setup.py set_version
- VERSION="${PV}" "$(PYTHON)" setup.py set_version
-}
-
-src_compile() {
- distutils_src_compile
-}
diff --git a/app-portage/flaggie/flaggie-0.2.ebuild b/app-portage/flaggie/flaggie-0.2.ebuild
index 55e8956ed153..2956a25f8728 100644
--- a/app-portage/flaggie/flaggie-0.2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.ebuild,v 1.3 2012/01/28 15:27:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.ebuild,v 1.1 2011/12/17 16:23:34 mgorny Exp $
EAPI=4
PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=sys-apps/portage-2.1.8.3"
diff --git a/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch b/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
deleted file mode 100644
index 93bd6264cc52..000000000000
--- a/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 10aaed2b07c11065418d0e9e2c7aa52ae0837300 Mon Sep 17 00:00:00 2001
-From: Paul Varner
-Date: Mon, 19 Dec 2011 13:38:40 -0600
-Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage (Bug
- 394909).
-
----
- setup.py | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f65a933..1efba94 100755
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,7 @@ cwd = os.getcwd()
- try:
- from portage.const import EPREFIX
- except ImportError:
-- EPREFIX='/'
-+ EPREFIX=''
-
-
- # Bash files that need `VERSION=""` subbed, relative to this dir:
-@@ -127,10 +127,10 @@ core.setup(
- package_data = test_data,
- scripts=(glob('bin/*')),
- data_files=(
-- (os.path.join(EPREFIX, 'etc/env.d'), ['data/99gentoolkit-env']),
-- (os.path.join(EPREFIX, 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
-- (os.path.join(EPREFIX, 'etc/eclean'), glob('data/eclean/*')),
-- (os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/*')),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/env.d'), ['data/99gentoolkit-env']),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/eclean'), glob('data/eclean/*')),
-+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/*')),
- ),
- cmdclass={
- 'test': load_test(),
---
-1.7.8
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild
new file mode 100644
index 000000000000..7f5c8c57337b
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r1.ebuild,v 1.1 2011/07/28 02:55:53 fuzzyray Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit distutils python eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+ !<=app-portage/gentoolkit-dev-0.2.7
+ dev-python/argparse
+ || ( app-misc/realpath sys-freebsd/freebsd-bin )
+ sys-apps/gawk
+ sys-apps/grep"
+
+distutils_src_compile_pre_hook() {
+ echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+ VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
+ || die "setup.py set_version failed"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-euse.patch"
+}
+
+src_install() {
+ python_convert_shebangs -r "" build-*/scripts-*
+ distutils_src_install
+
+ # Create cache directory for revdep-rebuild
+ dodir /var/cache/revdep-rebuild
+ keepdir /var/cache/revdep-rebuild
+ use prefix || fowners root:root /var/cache/revdep-rebuild
+ fperms 0700 /var/cache/revdep-rebuild
+
+ # remove on Gentoo Prefix platforms where it's broken anyway
+ if use prefix; then
+ elog "The revdep-rebuild command is removed, the preserve-libs"
+ elog "feature of portage will handle issues."
+ rm "${ED}"/usr/bin/revdep-rebuild
+ rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+ rm -rf "${ED}"/etc/revdep-rebuild
+ rm -rf "${ED}"/var
+ fi
+
+ # Can distutils handle this?
+ dosym eclean /usr/bin/eclean-dist
+ dosym eclean /usr/bin/eclean-pkg
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ einfo
+ einfo "For further information on gentoolkit, please read the gentoolkit"
+ einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+ einfo
+ einfo "Another alternative to equery is app-portage/portage-utils"
+ ewarn
+ ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
+ ewarn "options and default behavior. The list of injected GLSAs"
+ ewarn "has moved to /var/lib/portage/glsa_injected, please"
+ ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild
new file mode 100644
index 000000000000..01747fbd6ed2
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r2.ebuild,v 1.1 2011/08/24 18:18:49 fuzzyray Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit distutils python eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+ !<=app-portage/gentoolkit-dev-0.2.7
+ dev-python/argparse
+ || ( app-misc/realpath sys-freebsd/freebsd-bin )
+ sys-apps/gawk
+ sys-apps/grep"
+
+distutils_src_compile_pre_hook() {
+ echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+ VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
+ || die "setup.py set_version failed"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-euse-376393.patch"
+ epatch "${FILESDIR}/${PV}-euse-379599.patch"
+ epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
+}
+
+src_install() {
+ python_convert_shebangs -r "" build-*/scripts-*
+ distutils_src_install
+
+ # Create cache directory for revdep-rebuild
+ dodir /var/cache/revdep-rebuild
+ keepdir /var/cache/revdep-rebuild
+ use prefix || fowners root:root /var/cache/revdep-rebuild
+ fperms 0700 /var/cache/revdep-rebuild
+
+ # remove on Gentoo Prefix platforms where it's broken anyway
+ if use prefix; then
+ elog "The revdep-rebuild command is removed, the preserve-libs"
+ elog "feature of portage will handle issues."
+ rm "${ED}"/usr/bin/revdep-rebuild
+ rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+ rm -rf "${ED}"/etc/revdep-rebuild
+ rm -rf "${ED}"/var
+ fi
+
+ # Can distutils handle this?
+ dosym eclean /usr/bin/eclean-dist
+ dosym eclean /usr/bin/eclean-pkg
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ einfo
+ einfo "For further information on gentoolkit, please read the gentoolkit"
+ einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+ einfo
+ einfo "Another alternative to equery is app-portage/portage-utils"
+ ewarn
+ ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
+ ewarn "options and default behavior. The list of injected GLSAs"
+ ewarn "has moved to /var/lib/portage/glsa_injected, please"
+ ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r3.ebuild
new file mode 100644
index 000000000000..195fc77a73ba
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r3.ebuild,v 1.1 2011/08/26 21:42:17 fuzzyray Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit distutils python eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+ !<=app-portage/gentoolkit-dev-0.2.7
+ dev-python/argparse
+ || ( app-misc/realpath sys-freebsd/freebsd-bin )
+ sys-apps/gawk
+ sys-apps/grep"
+
+distutils_src_compile_pre_hook() {
+ echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+ VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
+ || die "setup.py set_version failed"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-euse-376393.patch"
+ epatch "${FILESDIR}/${PV}-euse-379599.patch"
+ epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
+ epatch "${FILESDIR}/${PV}-equery-380573.patch"
+}
+
+src_install() {
+ python_convert_shebangs -r "" build-*/scripts-*
+ distutils_src_install
+
+ # Create cache directory for revdep-rebuild
+ dodir /var/cache/revdep-rebuild
+ keepdir /var/cache/revdep-rebuild
+ use prefix || fowners root:root /var/cache/revdep-rebuild
+ fperms 0700 /var/cache/revdep-rebuild
+
+ # remove on Gentoo Prefix platforms where it's broken anyway
+ if use prefix; then
+ elog "The revdep-rebuild command is removed, the preserve-libs"
+ elog "feature of portage will handle issues."
+ rm "${ED}"/usr/bin/revdep-rebuild
+ rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+ rm -rf "${ED}"/etc/revdep-rebuild
+ rm -rf "${ED}"/var
+ fi
+
+ # Can distutils handle this?
+ dosym eclean /usr/bin/eclean-dist
+ dosym eclean /usr/bin/eclean-pkg
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ einfo
+ einfo "For further information on gentoolkit, please read the gentoolkit"
+ einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+ einfo
+ einfo "Another alternative to equery is app-portage/portage-utils"
+ ewarn
+ ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
+ ewarn "options and default behavior. The list of injected GLSAs"
+ ewarn "has moved to /var/lib/portage/glsa_injected, please"
+ ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
deleted file mode 100644
index 3ce70188f468..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild,v 1.9 2012/02/01 21:14:19 ranger Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-PYTHON_USE_WITH="xml"
-PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-
-inherit distutils python eutils
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml. This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
-DEPEND="sys-apps/portage"
-RDEPEND="${DEPEND}
- >=dev-lang/python-2.6[xml]
- !>=dev-lang/python-2.6[-xml]
- !<=app-portage/gentoolkit-dev-0.2.7
- dev-python/argparse
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
- sys-apps/gawk
- sys-apps/grep"
-
-distutils_src_compile_pre_hook() {
- echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
- VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
- || die "setup.py set_version failed"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-euse-376393.patch"
- epatch "${FILESDIR}/${PV}-euse-379599.patch"
- epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
- epatch "${FILESDIR}/${PV}-equery-380573.patch"
- epatch "${FILESDIR}/${PV}-euse-382219.patch"
- epatch "${FILESDIR}/${PV}-setup-394909.patch"
-}
-
-src_install() {
- python_convert_shebangs -r "" build-*/scripts-*
- distutils_src_install
-
- # Create cache directory for revdep-rebuild
- dodir /var/cache/revdep-rebuild
- keepdir /var/cache/revdep-rebuild
- use prefix || fowners root:root /var/cache/revdep-rebuild
- fperms 0700 /var/cache/revdep-rebuild
-
- # remove on Gentoo Prefix platforms where it's broken anyway
- if use prefix; then
- elog "The revdep-rebuild command is removed, the preserve-libs"
- elog "feature of portage will handle issues."
- rm "${ED}"/usr/bin/revdep-rebuild
- rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
- rm -rf "${ED}"/etc/revdep-rebuild
- rm -rf "${ED}"/var
- fi
-
- # Can distutils handle this?
- dosym eclean /usr/bin/eclean-dist
- dosym eclean /usr/bin/eclean-pkg
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
-
- einfo
- einfo "For further information on gentoolkit, please read the gentoolkit"
- einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
- einfo
- einfo "Another alternative to equery is app-portage/portage-utils"
- ewarn
- ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
- ewarn "options and default behavior. The list of injected GLSAs"
- ewarn "has moved to /var/lib/portage/glsa_injected, please"
- ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
-}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index a36dcfaad8c7..beb7dac66867 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.20 2012/01/31 17:19:21 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.18 2011/12/04 20:21:56 mgorny Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -25,16 +25,11 @@ IUSE="minimal"
KEYWORDS=""
-# Note: dev-lang/python dependencies are so emerge will print a blocker if any
-# installed slot of python is not built with +xml. This is used since
-# PYTHON_USE_WITH just dies in the middle of the emerge. See bug 399331.
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}
- >=dev-lang/python-2.6[xml]
- !>=dev-lang/python-2.6[-xml]
!<=app-portage/gentoolkit-dev-0.2.7
dev-python/argparse
- || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+ || ( app-misc/realpath sys-freebsd/freebsd-bin )
sys-apps/gawk
sys-apps/grep
!minimal? (
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 1cfeb2884675..5eb2efb1a1e7 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,2 +1,2 @@
DIST gentoopm-0.2.1.tar.bz2 23839 RMD160 22bc9d2e381461da4080bc6ac7a1f2c4423fa6f7 SHA1 35942d91736b6d0ff8b4568d76d6262077c9e658 SHA256 f1ebfc4ab84d99f0750e5fb683b3f70ca1a042a3d11e37f8db8fb52190e5418c
-DIST gentoopm-0.2.5.tar.bz2 24450 RMD160 1725854471a063c977154fce347bd15890d96e42 SHA1 5154d622e0fa4d605f23497e4858a58d958270e8 SHA256 884ecf5507ad3f623c1f371e6a25b9e91c87511448921593c956c1ee1aca1f1d
+DIST gentoopm-0.2.3.tar.bz2 24360 RMD160 3c7e7dcfb39eb6e3f4585bd7d48bf8e6d57aa081 SHA1 dfafaafad607a3b506ad120fe10e4aa56326f10b SHA256 d1a1b1a4e92efe396270ad5e4e694681a7ec94375a87f715dfaa52daa1ca104f
diff --git a/app-portage/gentoopm/gentoopm-0.2.3.ebuild b/app-portage/gentoopm/gentoopm-0.2.3.ebuild
new file mode 100644
index 000000000000..123f903830bb
--- /dev/null
+++ b/app-portage/gentoopm/gentoopm-0.2.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.3.ebuild,v 1.2 2011/12/09 11:09:58 naota Exp $
+
+EAPI=4
+
+PYTHON_DEPEND='2:2.6'
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
+DISTUTILS_SRC_TEST=setup.py
+
+inherit base distutils
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="|| ( >=sys-apps/portage-2.1.10.3
+ sys-apps/pkgcore
+ >=sys-apps/paludis-0.64.2[python-bindings] )"
+DEPEND="doc? ( dev-python/epydoc )"
+PDEPEND="app-admin/eselect-package-manager"
+
+src_prepare() {
+ base_src_prepare
+ distutils_src_prepare
+}
+
+src_compile() {
+ distutils_src_compile
+
+ if use doc; then
+ "$(PYTHON -2)" setup.py doc || die
+ fi
+}
+
+src_install() {
+ distutils_src_install
+
+ if use doc; then
+ dohtml -r doc/*
+ fi
+}
diff --git a/app-portage/gentoopm/gentoopm-0.2.5.ebuild b/app-portage/gentoopm/gentoopm-0.2.5.ebuild
deleted file mode 100644
index 89e89d57b86a..000000000000
--- a/app-portage/gentoopm/gentoopm-0.2.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.5.ebuild,v 1.1 2012/01/09 16:22:34 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
-DISTUTILS_SRC_TEST=setup.py
-
-inherit base distutils
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="|| ( >=sys-apps/portage-2.1.10.3
- sys-apps/pkgcore
- >=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
-PDEPEND="app-admin/eselect-package-manager"
-
-src_prepare() {
- base_src_prepare
- distutils_src_prepare
-}
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- "$(PYTHON -2)" setup.py doc || die
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- dohtml -r doc/*
- fi
-}
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index af39b9b5b930..33d858617a34 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -10,6 +10,6 @@
mgorny@gentoo.org
Michał Górny
- https://github.com/mgorny/gentoopm/issues/
+ http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux&component=Applications&short_desc=app-portage/gentoopm:%20
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index 576dc44448c4..37e04ca40aa3 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -3,8 +3,13 @@
tools-portage
- dolsen@gentoo.org
+ idl0r@gentoo.org
+ Christian Ruppert
+
+
+ brian.dolbec@gmail.com
Brian Dolbec
+ Proxied co-maintainer, please CC on all bugs
Support dev-vcs/bzr based overlays
diff --git a/app-portage/metagen/metagen-0.6.2.ebuild b/app-portage/metagen/metagen-0.6.2.ebuild
index 027e591f64c3..673efbaa3d3e 100644
--- a/app-portage/metagen/metagen-0.6.2.ebuild
+++ b/app-portage/metagen/metagen-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.6.2.ebuild,v 1.4 2012/02/06 18:56:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.6.2.ebuild,v 1.1 2011/09/28 14:58:05 neurogeek Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE=""
DEPEND=">=dev-python/jaxml-3.01
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
index 46e5e7a8415c..42db77ccdf85 100644
--- a/app-portage/perl-info/perl-info-0.16.ebuild
+++ b/app-portage/perl-info/perl-info-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/perl-info/perl-info-0.16.ebuild,v 1.5 2012/02/03 15:23:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/perl-info/perl-info-0.16.ebuild,v 1.1 2010/11/03 08:40:45 tove Exp $
DESCRIPTION="Tool to gather relevant perl data useful for bugreports; 'emerge --info' for perl"
HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND="dev-lang/perl
diff --git a/app-portage/pfl/pfl-2.3.ebuild b/app-portage/pfl/pfl-2.3.ebuild
index 9797f1658dd8..da947d7caf40 100644
--- a/app-portage/pfl/pfl-2.3.ebuild
+++ b/app-portage/pfl/pfl-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.3.ebuild,v 1.6 2012/02/05 20:57:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.3.ebuild,v 1.2 2011/12/03 19:44:37 grobian Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="http://files.portagefilelist.de/${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
IUSE="+network-cron"
DEPEND=""
diff --git a/app-portage/pms-test-suite/Manifest b/app-portage/pms-test-suite/Manifest
index 89532ce53f95..ed3a9770467e 100644
--- a/app-portage/pms-test-suite/Manifest
+++ b/app-portage/pms-test-suite/Manifest
@@ -1,2 +1 @@
DIST pms-test-suite-0.1.tar.bz2 21773 RMD160 c095b9265ee67e02c4917eed3bfc923723a49199 SHA1 243e545e36a7fc81721338e81c392c207d82b4b3 SHA256 7d71d8b74787120e95e0c8e6aa181280a0fbedf7d1acd8fb6c91d1330f64224d
-DIST pms-test-suite-0.2.tar.bz2 21962 RMD160 754adbe72c65e6fffcaea5427fb992fa3dd48b3f SHA1 9993852ac31bc16bdac8a52d01dd5dc6a3792d78 SHA256 104a757edf5b223ff38885691b332420da82a0c62b80469787883579385aafea
diff --git a/app-portage/pms-test-suite/metadata.xml b/app-portage/pms-test-suite/metadata.xml
index f9ee48a1657f..f77c818b7a00 100644
--- a/app-portage/pms-test-suite/metadata.xml
+++ b/app-portage/pms-test-suite/metadata.xml
@@ -10,6 +10,6 @@
mgorny@gentoo.org
Michał Górny
- https://github.com/mgorny/pms-test-suite/issues/
+ http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux&component=Applications&short_desc=app-portage/pms-test-suite:%20
diff --git a/app-portage/pms-test-suite/pms-test-suite-0.2.ebuild b/app-portage/pms-test-suite/pms-test-suite-0.2.ebuild
deleted file mode 100644
index b39cfd3ec5c0..000000000000
--- a/app-portage/pms-test-suite/pms-test-suite-0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pms-test-suite/pms-test-suite-0.2.ebuild,v 1.1 2012/01/04 16:48:14 mgorny Exp $
-
-EAPI=4
-
-PYTHON_DEPEND='2:2.6'
-# Python ABIs are not supported by pkgcore
-#SUPPORT_PYTHON_ABIS=1
-# Python3 is not supported by dbus & gobject
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
-DISTUTILS_SRC_TEST=setup.py
-
-inherit base distutils
-
-DESCRIPTION="A test suite for Package Manager PMS compliance"
-HOMEPAGE="http://www.gentoo.org/proj/en/qa/pms/pms-test-suite.xml"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=app-portage/gentoopm-0.1.5
- dev-python/dbus-python
- dev-python/pygobject:2"
-DEPEND="doc? ( dev-python/epydoc )
- test? ( >=sys-apps/portage-2.1.10.3
- sys-apps/pkgcore
- >=sys-apps/paludis-0.64.2[python-bindings] )"
-
-# broken atm
-RESTRICT=test
-
-PYTHON_MODNAME=pmstestsuite
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
- distutils_src_prepare
-}
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- "$(PYTHON)" setup.py "${_DISTUTILS_GLOBAL_OPTIONS[@]}" doc || die
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- dohtml -r doc/*
- fi
-}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index f440ae8a5f5d..b75d5f7433aa 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,5 +2,4 @@ DIST portage-utils-0.3.1.tar.bz2 89122 RMD160 5eb3ac32b755547af2939ef279d033ca18
DIST portage-utils-0.4.tar.bz2 89409 RMD160 da15721380f0a25cd7b0cfa3653b274303f3e02c SHA1 38fa6059eb946f37c5c2f5e619575703ba605b89 SHA256 334af67cadb485db2f7269458fd7cc7f3c03742dd420b85ed1b2536735fdc645
DIST portage-utils-0.5.tar.xz 99916 RMD160 e3588cbbb5e6f5c251431930b24edb7e6aa76a1c SHA1 dc34895795a647e37356b19af84a3ca7ed3ef308 SHA256 be8992cc7f4cfc0225d773065ce4c75b1bc6d7c1cab9e44862716f7f697b76bf
DIST portage-utils-0.6.tar.xz 101672 RMD160 d2630a5a8fb08f9a87973d4ce6ecc3ae05ce1459 SHA1 c49ae47c618a1329f10ad5f11f0628bb7db79cf0 SHA256 1c902be00679910c04cf70ef2d765388213c7bb339ffd47c660e681a6eac88a1
-DIST portage-utils-0.8.tar.xz 378220 RMD160 df2d7cef2795564f57d63c53045d1b90627b1699 SHA1 00837e3d0def5c9b13ae70900030f1cbe4154485 SHA256 d7a0dd6f8afc959f965a0dfcba12e808f623035cf1a38f3be4a5765d42174c74
-DIST portage-utils-0.9.tar.xz 378044 RMD160 81984a429a2c3b9877a8ac446b2c823563899a56 SHA1 de637ca1838aa97eec00c7df6847b4a4e520d975 SHA256 dc6ca6c8394a17e47966e7a5aa21030690abd80e493e59780b85c561307c4c58
+DIST portage-utils-0.7.tar.xz 368028 RMD160 40fd954f93559d2fb2d9b6243b9342b6fe216812 SHA1 3b09d8e9c0b3ea43c42f91a767e6ef863656c9ca SHA256 6bd4093a789607803155c6ccac576f09340236aa5068a9bb598f46a91f76f7c1
diff --git a/app-portage/portage-utils/portage-utils-0.7.ebuild b/app-portage/portage-utils/portage-utils-0.7.ebuild
new file mode 100644
index 000000000000..f586a34d1322
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.7.ebuild,v 1.1 2011/12/11 05:58:05 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd"
+IUSE="static"
+
+src_configure() {
+ use static && append-ldflags -static
+
+ # Avoid slow configure+gnulib+make if on an up-to-date Linux system
+ if ! use kernel_linux ; then
+ econf --with-eprefix="${EPREFIX}"
+ else
+ tc-export CC
+ fi
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ prepalldocs
+
+ exeinto /etc/portage/bin
+ doexe "${FILESDIR}"/post_sync || die
+ insinto /etc/portage/postsync.d
+ doins "${FILESDIR}"/q-reinitialize || die
+}
+
+pkg_preinst() {
+ # preserve +x bit on postsync files #301721
+ local x
+ pushd "${D}" >/dev/null
+ for x in etc/portage/postsync.d/* ; do
+ [[ -x ${ROOT}/${x} ]] && chmod +x "${x}"
+ done
+}
+
+pkg_postinst() {
+ elog "/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+ elog "If you wish for it to be automatically run at the end of every --sync:"
+ elog " # chmod +x /etc/portage/postsync.d/q-reinitialize"
+ elog "Normally this should only take a few seconds to run but file systems"
+ elog "such as ext3 can take a lot longer. To disable, simply do:"
+ elog " # chmod -x /etc/portage/postsync.d/q-reinitialize"
+}
diff --git a/app-portage/portage-utils/portage-utils-0.8.ebuild b/app-portage/portage-utils/portage-utils-0.8.ebuild
deleted file mode 100644
index 495221c22a32..000000000000
--- a/app-portage/portage-utils/portage-utils-0.8.ebuild
+++ /dev/null
@@ -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-portage/portage-utils/portage-utils-0.8.ebuild,v 1.6 2012/02/06 20:13:39 vapier Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static"
-
-src_configure() {
- use static && append-ldflags -static
-
- # Avoid slow configure+gnulib+make if on an up-to-date Linux system
- if ! use kernel_linux || has_version '/dev/null
- for x in etc/portage/postsync.d/* ; do
- [[ -x ${ROOT}/${x} ]] && chmod +x "${x}"
- done
-}
-
-pkg_postinst() {
- elog "/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
- elog "If you wish for it to be automatically run at the end of every --sync:"
- elog " # chmod +x /etc/portage/postsync.d/q-reinitialize"
- elog "Normally this should only take a few seconds to run but file systems"
- elog "such as ext3 can take a lot longer. To disable, simply do:"
- elog " # chmod -x /etc/portage/postsync.d/q-reinitialize"
-}
diff --git a/app-portage/portage-utils/portage-utils-0.9.ebuild b/app-portage/portage-utils/portage-utils-0.9.ebuild
deleted file mode 100644
index c8885588c284..000000000000
--- a/app-portage/portage-utils/portage-utils-0.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.9.ebuild,v 1.3 2012/01/06 20:13:18 vapier Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static"
-
-src_configure() {
- use static && append-ldflags -static
-
- # Avoid slow configure+gnulib+make if on an up-to-date Linux system
- if use prefix || ! use kernel_linux || \
- has_version '/dev/null
- for x in etc/portage/postsync.d/* ; do
- [[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
- done
-}
-
-pkg_postinst() {
- elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
- elog "If you wish for it to be automatically run at the end of every --sync:"
- elog " # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
- elog "Normally this should only take a few seconds to run but file systems"
- elog "such as ext3 can take a lot longer. To disable, simply do:"
- elog " # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
-}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index b3d5fd54db05..2d5a1fadbf87 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,5 +1,6 @@
DIST portpeek-1.9.70.tar.gz 8634 RMD160 3da26cddb24b4f6d7eb99d81e6ccef49b48d2224 SHA1 c0c4f49a8cc865313e842d1775d6dd74c21c25c8 SHA256 21a6edab38ea5c3cba99b27856f5f0918154c5d5f93286618c213f5385e32e2b
DIST portpeek-1.9.74.tar.gz 9822 RMD160 9496bd086c7aa4cd1afcf6dc7371fc99e6d42f01 SHA1 6e7e7ea684355a8225e9ed123c22a68bfbcaefbd SHA256 e41474e8160ba5a4680aafadd1509b0c88f43b96e126519dbbc577992ff3da03
-DIST portpeek-1.9.83.tar.gz 10535 RMD160 b9637e5cd4b8bb2237773227f2d5680af63cfc4c SHA1 541fe4a9f0c26348dc6121438c4f8860223b50a1 SHA256 882703c3b4646eb8f15d34af2d87d7e80ce14b8b15f47706760a84fb1f76cc02
-DIST portpeek-2.0.17.tar.gz 10549 RMD160 9c29ac2e16408d007694efb63a9135a3b72b670b SHA1 64f402b8e3a847f09aacd04b47acbe08b5cefe5a SHA256 d060fabfc54fcb43cea508419d2e7f6b8c629914a9d97aaa5d850350c0f06ac4
-DIST portpeek-2.0.18.tar.gz 10550 RMD160 d10fbbb8ce8b9f259ea4e54760e5cc4bdd2dfb38 SHA1 0bcd46ddc397bc1a3fc292994967041266a6c2be SHA256 cc62a3a1b04d6cbcf5ebea855a9dd962cd444912c84fc8750ad483b89b84ce8c
+DIST portpeek-1.9.82.tar.gz 10356 RMD160 6f1babdbaafed553c7db82fd50a363ad33635fe5 SHA1 3850a60eec902ee6430d4dedcfd18cdbb6dcb120 SHA256 fd1a0466c80bfa196db61e1e3b41ae333b60203bed71f9b40305a5f14ac7601e
+DIST portpeek-2.0.12.tar.gz 9355 RMD160 353fd10f69ad00aec883bc4fe0a2a470c4e2a7de SHA1 6cd7d682d97af6214ca5bb0834eb72bada69191b SHA256 eb8e4b11598546fcc6a982dad1d216ed157b6015ef76e9a590b55bd3b7f5d8a1
+DIST portpeek-2.0.13.tar.gz 9971 RMD160 c3677b1d8f1afd683bf4625d890689677ee9ebb1 SHA1 1bbf261d6ed4063e39d28d57704a101212c233f3 SHA256 a85fc084825130dcf9bfa15f7dd9a7f9e32d86884d7a09a424d19b4acea74c01
+DIST portpeek-2.0.15.tar.gz 10326 RMD160 40728e97b8dd7401d8f5b362ae0f3e9c411438a2 SHA1 6a621c575583eec485cc805c6336045a73cb2509 SHA256 475f5f75e2cf33b37b03d281d098c7cb43d22fc2d235752db001bf522bb4733c
diff --git a/app-portage/portpeek/portpeek-1.9.82.ebuild b/app-portage/portpeek/portpeek-1.9.82.ebuild
new file mode 100644
index 000000000000..c4c01ad3e9ef
--- /dev/null
+++ b/app-portage/portpeek/portpeek-1.9.82.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.9.82.ebuild,v 1.1 2011/12/16 18:02:04 mpagano Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-portage/gentoolkit-0.3.0.4
+ >=sys-apps/portage-2.1.10.11
+ || ( dev-lang/python:2.6 dev-lang/python:2.7 )"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ python_convert_shebangs 2 portpeek
+}
+
+src_install() {
+ dobin ${PN} || die "dobin failed"
+ doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-1.9.83.ebuild b/app-portage/portpeek/portpeek-1.9.83.ebuild
deleted file mode 100644
index 00d6e5e2bf73..000000000000
--- a/app-portage/portpeek/portpeek-1.9.83.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.9.83.ebuild,v 1.1 2011/12/19 15:45:32 mpagano Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-portage/gentoolkit-0.3.0.4
- >=sys-apps/portage-2.1.10.11
- || ( dev-lang/python:2.6 dev-lang/python:2.7 )"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- python_convert_shebangs 2 portpeek
-}
-
-src_install() {
- dobin ${PN} || die "dobin failed"
- doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.0.12.ebuild b/app-portage/portpeek/portpeek-2.0.12.ebuild
new file mode 100644
index 000000000000..d524f61a006f
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.0.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.12.ebuild,v 1.1 2011/10/13 19:05:56 mpagano Exp $
+
+EAPI="2"
+PYTHON_DEPEND="3"
+
+inherit eutils python
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-portage/gentoolkit-0.3.0.4
+ >=sys-apps/portage-2.1.10.11"
+
+pkg_setup() {
+ python_set_active_version 3
+}
+
+src_prepare() {
+ python_convert_shebangs 3 portpeek
+}
+
+src_install() {
+ dobin ${PN} || die "dobin failed"
+ doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.0.13.ebuild b/app-portage/portpeek/portpeek-2.0.13.ebuild
new file mode 100644
index 000000000000..cb5a2f1126b7
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.0.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.13.ebuild,v 1.1 2011/10/21 13:30:08 mpagano Exp $
+
+EAPI="2"
+PYTHON_DEPEND="3"
+
+inherit eutils python
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-portage/gentoolkit-0.3.0.4
+ >=sys-apps/portage-2.1.10.11"
+
+pkg_setup() {
+ python_set_active_version 3
+}
+
+src_prepare() {
+ python_convert_shebangs 3 portpeek
+}
+
+src_install() {
+ dobin ${PN} || die "dobin failed"
+ doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.0.15.ebuild b/app-portage/portpeek/portpeek-2.0.15.ebuild
new file mode 100644
index 000000000000..8fd801f774ad
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.0.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.15.ebuild,v 1.1 2011/12/16 18:02:04 mpagano Exp $
+
+EAPI="2"
+PYTHON_DEPEND="3"
+
+inherit eutils python
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-portage/gentoolkit-0.3.0.4
+ >=sys-apps/portage-2.1.10.11"
+
+pkg_setup() {
+ python_set_active_version 3
+}
+
+src_prepare() {
+ python_convert_shebangs 3 portpeek
+}
+
+src_install() {
+ dobin ${PN} || die "dobin failed"
+ doman *.[0-9]
+}
diff --git a/app-portage/portpeek/portpeek-2.0.17.ebuild b/app-portage/portpeek/portpeek-2.0.17.ebuild
deleted file mode 100644
index fead267daef2..000000000000
--- a/app-portage/portpeek/portpeek-2.0.17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.17.ebuild,v 1.2 2012/01/04 18:19:25 mpagano Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.7"
-
-inherit python
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-portage/gentoolkit-0.3.0.4-r5
- >=sys-apps/portage-2.1.10.41"
-
-src_install() {
- dobin ${PN} || die "dobin failed"
- doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-2.0.18.ebuild b/app-portage/portpeek/portpeek-2.0.18.ebuild
deleted file mode 100644
index f8fc65666d02..000000000000
--- a/app-portage/portpeek/portpeek-2.0.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.18.ebuild,v 1.1 2012/02/02 11:37:32 mpagano Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.7"
-
-inherit python
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
-SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-portage/gentoolkit-0.3.0.4-r5
- >=sys-apps/portage-2.1.10.41"
-
-src_install() {
- dobin ${PN} || die "dobin failed"
- doman *.[0-9]
-}
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
index 26bdb41cf8cd..353e6df86037 100644
--- a/app-portage/repo-commit/Manifest
+++ b/app-portage/repo-commit/Manifest
@@ -1 +1 @@
-DIST repo-commit-0.3.2.tar.bz2 52948 RMD160 2f36c56598e6633a5bf7bc487ae4e7fd947ac080 SHA1 5fd5a53b3ab200c6f78350882500a2e552f62f38 SHA256 567862bd7f66a1e874420102f8701facf7e0b58f7afddb9d8937b359b0c5d15b
+DIST repo-commit-0.3.1.tar.bz2 51203 RMD160 0861477c231908c45a31dd22f0aeb243968ca625 SHA1 f92bacc8cbbb3cb44d62aea21d3f85f317b1002c SHA256 d0715e801c52660556f71302be5ac4ab8b55b0a29c4d56bfd8f8e3cf407560db
diff --git a/app-portage/repo-commit/metadata.xml b/app-portage/repo-commit/metadata.xml
index 334bbcee3390..9f71f3fffc6a 100644
--- a/app-portage/repo-commit/metadata.xml
+++ b/app-portage/repo-commit/metadata.xml
@@ -18,6 +18,6 @@
binki@gentoo.org
Nathan Phillip Brink
- https://github.com/mgorny/repo-commit/issues/
+ http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux&component=Applications&short_desc=app-portage/repo-commit:%20
diff --git a/app-portage/repo-commit/repo-commit-0.3.1-r1.ebuild b/app-portage/repo-commit/repo-commit-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..f0f55d89c9d0
--- /dev/null
+++ b/app-portage/repo-commit/repo-commit-0.3.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/repo-commit/repo-commit-0.3.1-r1.ebuild,v 1.1 2011/09/01 07:21:39 mgorny Exp $
+
+EAPI=4
+inherit autotools-utils
+
+DESCRIPTION="A repository commit helper"
+HOMEPAGE="https://github.com/mgorny/repo-commit/"
+SRC_URI="http://cloud.github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-portage/gentoolkit-dev
+ sys-apps/portage"
diff --git a/app-portage/repo-commit/repo-commit-0.3.2.ebuild b/app-portage/repo-commit/repo-commit-0.3.2.ebuild
deleted file mode 100644
index f7c884c09e56..000000000000
--- a/app-portage/repo-commit/repo-commit-0.3.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/repo-commit/repo-commit-0.3.2.ebuild,v 1.1 2012/01/27 13:52:58 mgorny Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A repository commit helper"
-HOMEPAGE="https://github.com/mgorny/repo-commit/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-portage/gentoolkit-dev
- sys-apps/portage"
diff --git a/app-shells/dash/dash-0.5.5.1.7.ebuild b/app-shells/dash/dash-0.5.5.1.7.ebuild
index a95424bbe8f3..802079c35474 100644
--- a/app-shells/dash/dash-0.5.5.1.7.ebuild
+++ b/app-shells/dash/dash-0.5.5.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.7.ebuild,v 1.9 2012/02/01 09:18:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.7.ebuild,v 1.8 2011/10/30 16:15:52 armin76 Exp $
EAPI="2"
@@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
IUSE="libedit static"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/esh/esh-0.8.5-r1.ebuild b/app-shells/esh/esh-0.8.5-r1.ebuild
index 65c310019e45..e6514ea6ba08 100644
--- a/app-shells/esh/esh-0.8.5-r1.ebuild
+++ b/app-shells/esh/esh-0.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r1.ebuild,v 1.2 2012/02/06 15:18:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r1.ebuild,v 1.1 2010/09/17 04:58:31 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="debug"
DEPEND=">=sys-libs/ncurses-5.1
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index f8ecb2094ec0..d989a9819827 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1 +1 @@
-DIST posh_0.10.1.tar.gz 468771 RMD160 1d1b60696cf7d0fc6e33a2b5e0831be6e393025b SHA1 ecb86988a951bbbb9ca0f6ca99ef272383b3e6c4 SHA256 393fcb4123cd8539c1ecdd45f9d7afd4f9bc51904981abdf6239a31d1c42e18d
+DIST posh_0.10.tar.gz 347508 RMD160 e2b4acce88934bb667b5172f6339c8e3d6c8c0ac SHA1 a91e7f1645bfb4d5695bff129d5093acd27b5868 SHA256 85c95fc95af0f0cd1733d75e0859aad96d74617c6f5598865d6b0c9c760e0b5b
diff --git a/app-shells/posh/posh-0.10.1.ebuild b/app-shells/posh/posh-0.10.1.ebuild
deleted file mode 100644
index 6328d73a9423..000000000000
--- a/app-shells/posh/posh-0.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/posh/posh-0.10.1.ebuild,v 1.1 2012/01/27 13:55:13 mgorny Exp $
-
-EAPI=3
-inherit autotools-utils
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="http://packages.debian.org/posh"
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_configure() {
- myeconfargs=(
- --exec-prefix=/
- )
- autotools-utils_src_configure
-}
diff --git a/app-shells/posh/posh-0.10.ebuild b/app-shells/posh/posh-0.10.ebuild
new file mode 100644
index 000000000000..92dd320143a5
--- /dev/null
+++ b/app-shells/posh/posh-0.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/posh/posh-0.10.ebuild,v 1.1 2011/06/18 02:22:48 mgorny Exp $
+
+EAPI=3
+inherit autotools-utils
+
+DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
+HOMEPAGE="http://packages.debian.org/posh"
+SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_configure() {
+ myeconfargs=(
+ --exec-prefix=/
+ )
+ autotools-utils_src_configure
+}
diff --git a/app-shells/prll/prll-0.6.2.ebuild b/app-shells/prll/prll-0.6.2.ebuild
index f00117933f6e..d2f20bd83e75 100644
--- a/app-shells/prll/prll-0.6.2.ebuild
+++ b/app-shells/prll/prll-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/prll/prll-0.6.2.ebuild,v 1.2 2012/01/28 10:59:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/prll/prll-0.6.2.ebuild,v 1.1 2011/10/29 19:31:50 jlec Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
src_prepare() {
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 124244a2e84e..142132c015a8 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,7 @@
+DIST tcsh-6.14-conffiles.tar.bz2 20200 RMD160 96e5e43985fe1b6e53b4a2a53f1b7bed3c2ae103 SHA1 3ec8841c88b2c99c6b5978b907d9f3daa22faa7c SHA256 1bae5000c84593187974580c48b0edcec88e2f6363e3c1ec1e43da45c9a63049
+DIST tcsh-6.14.00.tar.gz 859780 RMD160 fa7635225ceb0225aedcfad5dd9d8e17d8d70849 SHA1 55a08b31a57cfd8631edd1fb7e42f18578d8198a SHA256 fd738ac0c003d283a214d15d46c1bc3fb80afad697110994dccb8d101f0d6f0e
+DIST tcsh-6.15.00.tar.gz 870886 RMD160 8065279e93bd3fddb2a95a3f74a680858d36508c SHA1 d24f7bf27e80222a6293b6629c14db547f0b7387 SHA256 dca83e59025f18a9811895cd7cf2a760ab1750240ea7c8c86ea21e24f783acdc
DIST tcsh-6.16.00.tar.gz 886468 RMD160 ed23351273bb737c184658235f33869488e64696 SHA1 3d3536bbb9201abdf39b8b364b95e0a218970a5c SHA256 7603b8d67553e0a83159f0f463b642e3679a878a70743285bb7b288b314517d4
DIST tcsh-6.17.00.tar.gz 890084 RMD160 2cc41a895799ade6d62640f877bb626f136dac35 SHA1 9bf67d5ce1b406178e9ba535ecd34553fe0d4d36 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9
-DIST tcsh-6.17.06.tar.gz 919999 RMD160 34e92c7f2af089313c9c416b305e164b684b0f76 SHA1 f3754b0ac8bbccc655b5e4d247fff2c853cc7cc2 SHA256 c9eff6aa782ecec5c6719954b529fadac97c32f3ba4c56fa07c40d425c2d91df
+DIST tcsh-config-1.6.tar.bz2 2352 RMD160 28bc4d50211ee247f7202a4b49267d745142ef6e SHA1 5056d00da21cfad4550028821ebde49574244d87 SHA256 af86d79921c446b1ad4f8d665168ff6fd3fb24a875abde81e336ba91644c5160
DIST tcsh-gentoo-patches-r1.8.tar.bz2 2484 RMD160 d2ac41730bbbdfb8db77a67a0104edc08bb4570e SHA1 9059e209f433a023f264907d84d55824ec6854f0 SHA256 77fa4ae60090ad5a6ec50185eec9070757eedb798b1c29327d27fc582cb59f37
-DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 RMD160 60abc2583e2ee0706558d4171756a07da31df6c9 SHA1 fcb945bb77afbd49687545da8b62239739583a08 SHA256 6375f48d78b64fd97fc2cb07e8117e41459521a8de3919d174eec321a98af483
diff --git a/app-shells/tcsh/files/tcsh-6.14-r2.patch b/app-shells/tcsh/files/tcsh-6.14-r2.patch
new file mode 100644
index 000000000000..c1dc772dac15
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.14-r2.patch
@@ -0,0 +1,59 @@
+--- gentoo/csh.cshrc
++++ gentoo/csh.cshrc
+@@ -1,6 +1,9 @@
+ ## Gentoo csh.cshrc
+ ##
+-## 2005-09-29 -- Fabian Groffen (grobian@gentoo.org)
++## 2005-11-10 -- Fabian Groffen (grobian@gentoo.org)
++## * Disabled sourcing environment defaults and additional settings
++## when having a non-interactive shell. Bug #104763
++## 2005-09-29 -- Fabian Groffen
+ ## * Initial version of a complete redo of this file to fix many bugs
+ ## and resolve many annoyances experienced by numerous users
+ ##
+@@ -8,7 +11,7 @@
+ ##
+ ## Load the environment defaults.
+ ##
+-if ( -r /etc/csh.env ) then
++if ( $?prompt && -r /etc/csh.env ) then
+ source /etc/csh.env
+ endif
+
+@@ -55,7 +58,7 @@
+ ##
+ ## Source extensions
+ ##
+-if ( -d /etc/profile.d ) then
++if ( $?prompt && -d /etc/profile.d ) then
+ set nonomatch
+ foreach i ( /etc/profile.d/*.csh )
+ if ( -r $i ) then
+--- gentoo/tcsh-complete
++++ gentoo/tcsh-complete
+@@ -3,8 +3,11 @@
+ ## Based on the TCSH complete.tcsh script, with changed from the TCSHRC
+ ## package (http://tcshrc.sourceforge.net)
+ ##
+-## Please do not change this file! Place your personal customizations in
+-## ~/.tcshrc and system-wide customizations in /etc/profiles.d/local.csh
++## Please note that the tcsh-complete file is a large set of examples
++## that is not meant to be used in its exact form, as it defines an
++## excessive -- sometimes conflicting -- amount of completion scripts.
++## It is highly encouraged to copy over the desired auto completion
++## scripts to the personal ~/.tcshrc file.
+ ##
+ ## 2005-09-27 -- Fabian Groffen (grobian@gentoo.org)
+ ## fixed some bugs reported by users and cleaned it a bit
+--- gentoo/tcsh-gentoo_legacy
++++ gentoo/tcsh-gentoo_legacy
+@@ -4,6 +4,9 @@
+ ## by gentoo ebuilds prior to 6.14-r1. If you wonder what it does, you
+ ## probably don't want this at all, so stay away from it.
+ ##
++## Remember that you have to copy over these files into their
++## appropriate places, such as /etc/profile.d and /etc/skel.
++##
+
+ ##
+ ## Start by unsetting all our variables. This is needed to prevent
diff --git a/app-shells/tcsh/files/tcsh-6.14-r4.patch b/app-shells/tcsh/files/tcsh-6.14-r4.patch
new file mode 100644
index 000000000000..a9628b78df0c
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.14-r4.patch
@@ -0,0 +1,35 @@
+--- gentoo/csh.login
++++ gentoo/csh.login
+@@ -1,6 +1,9 @@
+ ## Gentoo csh.login
+ ##
+-## 2005-09-27 -- Fabian Groffen (grobian@gentoo.org)
++## 2006-12-02 -- Fabian Groffen (grobian@gentoo.org)
++## Don't set SHELL variable, should be done by login (bug #91725)
++## Properly call tset, such that it actually does something (bug #156422)
++## 2005-09-27 -- Fabian Groffen
+ ## Resolved reported bug on MOTD (disabled it)
+ ## 2003-01-13 -- Alain Penders (alain@gentoo.org)
+ ## Initial version. Inspired by the Suse version.
+@@ -14,9 +17,7 @@
+ # Console
+ if ( ! ${?TERM} ) setenv TERM linux
+ if ( "$TERM" == "unknown" ) setenv TERM linux
+- # No tset available on SlackWare
+ if ( -x "`which stty`" ) stty sane cr0 pass8 dec
+- if ( -x "`which tset`" ) tset -I -Q
+ unsetenv TERMCAP
+ settc km yes
+ endif
+@@ -27,11 +30,6 @@
+ umask 022
+
+ ##
+-## Set our SHELL variable.
+-##
+-setenv SHELL /bin/tcsh
+-
+-##
+ ## Setup a default MAIL variable
+ ##
+ if ( -f /var/spool/mail/$USER ) then
diff --git a/app-shells/tcsh/tcsh-6.14-r5.ebuild b/app-shells/tcsh/tcsh-6.14-r5.ebuild
new file mode 100644
index 000000000000..9a2881fcbbbf
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.14-r5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.14-r5.ebuild,v 1.6 2010/10/06 07:45:27 grobian Exp $
+
+inherit eutils
+
+MY_P="${P}.00"
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
+ mirror://gentoo/${P}-conffiles.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="perl catalogs"
+
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}
+ perl? ( dev-lang/perl )
+ !app-shells/csh" # bug #119703
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${A}
+ epatch "${FILESDIR}/${MY_P}"-debian-dircolors.patch # bug #120792
+ epatch "${FILESDIR}/${P}"-r2.patch
+ epatch "${FILESDIR}/${P}"-makefile.patch # bug #151951
+ epatch "${FILESDIR}/${P}"-r4.patch
+
+ if use catalogs ; then
+ einfo "enabling NLS catalogs support..."
+ sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
+ "${WORKDIR}"/${MY_P}/config_f.h || die
+ eend $?
+ fi
+}
+
+src_compile() {
+ econf --prefix=/ || die "econf failed"
+ emake || die "compile problem"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.man || die
+
+ if use perl ; then
+ perl tcsh.man2html tcsh.man || die
+ dohtml tcsh.html/*.html
+ fi
+
+ insinto /etc
+ doins \
+ "${WORKDIR}"/gentoo/csh.cshrc \
+ "${WORKDIR}"/gentoo/csh.login
+
+ insinto /etc/profile.d
+ doins \
+ "${WORKDIR}"/gentoo/tcsh-bindkey.csh \
+ "${WORKDIR}"/gentoo/tcsh-settings.csh
+
+ dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+ docinto examples
+ dodoc \
+ "${WORKDIR}"/gentoo/tcsh-aliases \
+ "${WORKDIR}"/gentoo/tcsh-complete \
+ "${WORKDIR}"/gentoo/tcsh-gentoo_legacy \
+ "${WORKDIR}"/gentoo/tcsh.config
+
+ # bug #119703: add csh -> tcsh symlink
+ dosym /bin/tcsh /bin/csh
+}
diff --git a/app-shells/tcsh/tcsh-6.15-r2.ebuild b/app-shells/tcsh/tcsh-6.15-r2.ebuild
new file mode 100644
index 000000000000..a59eb70c5978
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.15-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.15-r2.ebuild,v 1.15 2011/02/06 22:03:07 leio Exp $
+
+inherit eutils
+
+CONFVER="1.6"
+
+MY_P="${P}.00"
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
+ mirror://gentoo/tcsh-config-${CONFVER}.tar.bz2
+ http://www.gentoo.org/~grobian/distfiles/tcsh-config-${CONFVER}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="perl catalogs"
+RESTRICT="test"
+
+RDEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="${RDEPEND}
+ perl? ( dev-lang/perl )
+ !app-shells/csh" # bug #119703
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${MY_P/15/14}"-debian-dircolors.patch # bug #120792
+ epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+ epatch "${FILESDIR}"/${MY_P}-normalize-command-fix.patch # bug #183754
+
+ if use catalogs ; then
+ einfo "enabling NLS catalogs support..."
+ sed -i -e "s/#undef NLS_CATALOGS/#define NLS_CATALOGS/" \
+ config_f.h || die
+ eend $?
+ fi
+}
+
+src_compile() {
+ econf --prefix=/ || die "econf failed"
+ emake || die "compile problem"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.man || die
+
+ if use perl ; then
+ perl tcsh.man2html tcsh.man || die
+ dohtml tcsh.html/*.html
+ fi
+
+ insinto /etc
+ doins \
+ "${WORKDIR}"/tcsh-config/csh.cshrc \
+ "${WORKDIR}"/tcsh-config/csh.login
+
+ dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+ # bug #119703: add csh -> tcsh symlink
+ dosym /bin/tcsh /bin/csh
+}
+
+pkg_postinst() {
+ elog "This revision of tcsh does use a completely revamped configuration"
+ elog "files system, which is based on the bash equivalents. It should"
+ elog "fix issues for KDE users, and miscelaneous issues of environment"
+ elog "variables not set that should have, like EDITOR. If you rely"
+ elog "on the /etc/csh.* files heavily, you may find your setup will be"
+ elog "broken now."
+}
diff --git a/app-shells/tcsh/tcsh-6.17-r1.ebuild b/app-shells/tcsh/tcsh-6.17-r1.ebuild
index 0a12c7efc376..8c4361afec4f 100644
--- a/app-shells/tcsh/tcsh-6.17-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.10 2012/01/09 20:24:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17-r1.ebuild,v 1.9 2011/11/26 19:01:27 armin76 Exp $
EAPI=3
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/old/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="catalogs doc"
RESTRICT="test"
diff --git a/app-shells/tcsh/tcsh-6.17.06.ebuild b/app-shells/tcsh/tcsh-6.17.06.ebuild
deleted file mode 100644
index 12968ce252b9..000000000000
--- a/app-shells/tcsh/tcsh-6.17.06.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.17.06.ebuild,v 1.1 2011/12/31 16:38:34 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools prefix
-
-CONFVER="1.9"
-
-DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
-HOMEPAGE="http://www.tcsh.org/"
-SRC_URI="ftp://ftp.astron.com/pub/tcsh/beta/${P}.tar.gz
- http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls doc"
-RESTRICT="test"
-
-# we need gettext because we run autoconf (AM_ICONV)
-RDEPEND=">=sys-libs/ncurses-5.1
- virtual/libiconv"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
-
-CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
- epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
- epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
- eautoreconf
-
- # fix gencat usage
- sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
- nls/Makefile.in || die
-
- # unify ECHO behaviour
- echo "#undef ECHO_STYLE" >> config_f.h
- echo "#define ECHO_STYLE BOTH_ECHO" >> config_f.h
-
- eprefixify "${CONFDIR}"/*
- # activate the right default PATH
- if [[ -z ${EPREFIX} ]] ; then
- sed -i \
- -e 's/^#MAIN//' -e '/^#PREFIX/d' \
- "${CONFDIR}"/csh.login || die
- else
- sed -i \
- -e 's/^#PREFIX//' -e '/^#MAIN/d' \
- "${CONFDIR}"/csh.login || die
- fi
-}
-
-src_configure() {
- # make tcsh look and live along the lines of the prefix
- append-flags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
- append-flags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
- append-flags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
- append-flags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
- append-flags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
-
- econf \
- --prefix="${EPREFIX:-/}" \
- --datarootdir='${prefix}/usr/share' \
- $(use_enable nls) \
- || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man || die
-
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- dohtml tcsh.html/*.html
- fi
-
- insinto /etc
- doins \
- "${CONFDIR}"/csh.cshrc \
- "${CONFDIR}"/csh.login
-
- dodoc FAQ Fixes NewThings Ported README WishList Y2K
-
- # bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
-}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index ddcd502ca18e..81c21a2c4f22 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -8,6 +8,4 @@ DIST zsh-4.3.13-doc.tar.bz2 2709769 RMD160 5fea5f918e388f8d8ea2296eb0fe607b82f51
DIST zsh-4.3.13.tar.bz2 2964918 RMD160 6fc4c9667f52e77a7151038a652bb8ececee57f8 SHA1 c1f447090101359f20d7f725132827c2ca7060c1 SHA256 173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c
DIST zsh-4.3.14-doc.tar.bz2 2709354 RMD160 e052f60d4b2abb55bfa91fd8853b3f0f0ab207c1 SHA1 4a23aa1c86aeda43d04d5b613371986ef8037fca SHA256 45ace79194440afb7dbfebb20435ffa9c672cd8825210dd9784b7da94c042142
DIST zsh-4.3.14.tar.bz2 2965367 RMD160 24ccf42c0a42fc5da9fd18cac3fa2301888d53e3 SHA1 9de3d1e96a26419e0a8863c9da31e068411d3257 SHA256 a85a31e243c10106b159923b164935b11bc282d1388bbabe1c77408c93f6b2b8
-DIST zsh-4.3.15-doc.tar.bz2 2712215 RMD160 87e3f43982e9a2688a4a50441483d9893cddbfef SHA1 b100e76aa81c215cd04276b5888245d7b6954449 SHA256 73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4
-DIST zsh-4.3.15.tar.bz2 2969951 RMD160 cf10504b2ee1085a4ace9387c5751fb117a2a245 SHA1 ff78f98ec3bf96bf9507e34098b64f33e6d6b3a5 SHA256 8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486
DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
diff --git a/app-shells/zsh/zsh-4.3.12.ebuild b/app-shells/zsh/zsh-4.3.12.ebuild
index b58a61bb424a..12871e79ff04 100644
--- a/app-shells/zsh/zsh-4.3.12.ebuild
+++ b/app-shells/zsh/zsh-4.3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.12.ebuild,v 1.7 2012/02/02 15:19:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.12.ebuild,v 1.3 2011/12/15 09:57:56 ago Exp $
EAPI=4
@@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
LICENSE="ZSH gdbm? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug doc examples gdbm maildir pcre static unicode"
RDEPEND="
diff --git a/app-shells/zsh/zsh-4.3.15.ebuild b/app-shells/zsh/zsh-4.3.15.ebuild
deleted file mode 100644
index 2ae6bb80b0f2..000000000000
--- a/app-shells/zsh/zsh-4.3.15.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.15.ebuild,v 1.1 2011/12/18 07:09:16 radhermit Exp $
-
-EAPI=4
-
-# doc package for -dev version exists?
-doc_available=true
-
-inherit eutils flag-o-matic multilib prefix
-
-MY_PV=${PV/_p/-dev-}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-zsh_ftp="ftp://ftp.zsh.org/pub"
-
-if [[ ${PV} != "${MY_PV}" ]] ; then
- ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2"
- if ${doc_available} ; then
- ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2"
- else
- ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
- fi
-else
- ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- ${zsh_ftp}/${P}.tar.bz2"
- ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="${ZSH_URI}
- doc? ( ${ZSH_DOC_URI} )"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND="
- >=sys-libs/ncurses-5.1
- static? ( >=sys-libs/ncurses-5.7-r4[static-libs] )
- caps? ( sys-libs/libcap )
- pcre? ( >=dev-libs/libpcre-3.9
- static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
- gdbm? ( sys-libs/gdbm )
-"
-DEPEND="sys-apps/groff
- ${RDEPEND}"
-PDEPEND="
- examples? ( app-doc/zsh-lovers )
-"
-
-src_prepare() {
- # fix zshall problem with soelim
- ln -s Doc man1
- mv Doc/zshall.1 Doc/zshall.1.soelim
- soelim Doc/zshall.1.soelim > Doc/zshall.1
-
- epatch "${FILESDIR}/${PN}"-init.d-gentoo-r1.diff
-
- cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
- eprefixify "${T}"/zprofile || die
- if use prefix ; then
- sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
- else
- sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
- fi
-}
-
-src_configure() {
- local myconf=
-
- if use static ; then
- myconf+=" --disable-dynamic"
- append-ldflags -static
- fi
- if use debug ; then
- myconf+=" \
- --enable-zsh-debug \
- --enable-zsh-mem-debug \
- --enable-zsh-mem-warning \
- --enable-zsh-secure-free \
- --enable-zsh-hash-debug"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=" --enable-libs=-liconv"
- append-ldflags -Wl,-x
- fi
-
- econf \
- --bindir="${EPREFIX}"/bin \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --enable-etcdir="${EPREFIX}"/etc/zsh \
- --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
- --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
- --enable-function-subdirs \
- --with-term-lib="ncursesw ncurses" \
- --with-tcsetpgrp \
- $(use_enable maildir maildir-support) \
- $(use_enable pcre) \
- $(use_enable caps cap) \
- $(use_enable unicode multibyte) \
- $(use_enable gdbm ) \
- ${myconf}
-
- if use static ; then
- # compile all modules statically, see Bug #27392
- # removed cap and curses because linking failes
- sed -i \
- -e "s,link=no,link=static,g" \
- -e "/^name=zsh\/cap/s,link=static,link=no," \
- -e "/^name=zsh\/curses/s,link=static,link=no," \
- "${S}"/config.modules || die
- if ! use gdbm ; then
- sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
- "${S}"/config.modules || die
- fi
-# else
-# sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
- fi
-}
-
-src_test() {
- local i
- addpredict /dev/ptmx
- for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
- rm "${S}"/Test/${i} || die
- done
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.info
-
- insinto /etc/zsh
- doins "${T}"/zprofile
-
- keepdir /usr/share/zsh/site-functions
- insinto /usr/share/zsh/${PV%_*}/functions/Prompts
- newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
- # install miscellaneous scripts; bug #54520
- local i
- sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
- -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die
- for i in Util Misc ; do
- insinto /usr/share/zsh/${PV%_*}/${i}
- doins ${i}/*
- done
-
- dodoc ChangeLog* META-FAQ NEWS README config.modules
-
- if use doc ; then
- pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
- dohtml -r Doc/*
- insinto /usr/share/doc/${PF}
- doins Doc/zsh.{dvi,pdf}
- popd >/dev/null
- fi
-
- docinto StartupFiles
- dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
- # should link to http://www.gentoo.org/doc/en/zsh.xml
- elog
- elog "If you want to enable Portage completions and Gentoo prompt,"
- elog "emerge app-shells/zsh-completion and add"
- elog " autoload -U compinit promptinit"
- elog " compinit"
- elog " promptinit; prompt gentoo"
- elog "to your ~/.zshrc"
- elog
- elog "Also, if you want to enable cache for the completions, add"
- elog " zstyle ':completion::complete:*' use-cache 1"
- elog "to your ~/.zshrc"
- elog
-}
diff --git a/app-text/a2ps/a2ps-4.14-r2.ebuild b/app-text/a2ps/a2ps-4.14-r2.ebuild
index e15ac35113be..2e1e7f144376 100644
--- a/app-text/a2ps/a2ps-4.14-r2.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r2.ebuild,v 1.5 2012/01/06 02:11:56 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.14-r2.ebuild,v 1.4 2011/12/07 07:47:36 phajdan.jr Exp $
EAPI=3
inherit eutils autotools elisp-common
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs nls latex vanilla userland_BSD userland_GNU linguas_ja"
RESTRICT="test"
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 8417d53eb0e5..4b70cb13d7d6 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1 +1,4 @@
-DIST AdbeRdr9.4.7-1_i486linux_enu.tar.bz2 57112529 RMD160 fcbb3397a063387eaee0af02f89f844a51c9f0fd SHA1 83ff5262523216a087206cb6f8e9815eaa1ac35e SHA256 65b91a1d925d5690050515d233fadeb47f52c692103904a72c7125c6590efd2f
+DIST AdbeRdr9.4.2-1_i486linux_deu.tar.bz2 65981114 RMD160 d21c2079400e0fec175cdb1173068648dda79358 SHA1 110df6c6b884fc5e09df7f8f5854ff5cd354155f SHA256 4e19e8794e0830a16e6dab41a91fc5efc1bbca4528d4107843e81ba354993949
+DIST AdbeRdr9.4.2-1_i486linux_enu.tar.bz2 60286782 RMD160 8b1c442044409cdb78eb3c59c393135b058ad81d SHA1 2ed2032c9d055af9611e8a8e0de355c2e9cdd815 SHA256 10ec272ae12a52a06ae88e1e7737423742160f172f789a22ed906a7af2b3a876
+DIST AdbeRdr9.4.2-1_i486linux_fra.tar.bz2 64485671 RMD160 64a32bbc7516e3322fe86fa86728dd2bc237a66c SHA1 b08bd541cdbaf6c8949b16dc8a85522125bf8783 SHA256 b5d017859057ea1ff2ea6c238a33cb7f5f4ab404c06b0a91d9c9ae41baa1e051
+DIST AdbeRdr9.4.2-1_i486linux_jpn.tar.bz2 68341985 RMD160 537f2ee58936f920b91ec53a8e8fefdfed6ecf47 SHA1 6ba11402ae91964c847fa820d95f329301dfd6cb SHA256 228bc45f59c587b9bea0652aa36b0add10a340ba022347ee9205931214d017ba
diff --git a/app-text/acroread/acroread-9.4.2.ebuild b/app-text/acroread/acroread-9.4.2.ebuild
new file mode 100644
index 000000000000..6bbece98de85
--- /dev/null
+++ b/app-text/acroread/acroread-9.4.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.2.ebuild,v 1.6 2011/06/25 07:40:18 zmedico Exp $
+
+EAPI="1"
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
+SRC_FOOT=".tar.bz2"
+
+# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan
+LINGUA_LIST="de:deu en:enu fr:fra ja:jpn"
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_enu${SRC_FOOT}"
+for ll in ${LINGUA_LIST} ; do
+ iuse_l="linguas_${ll/:*}"
+ src_l=${ll/*:}
+ IUSE="${IUSE} ${iuse_l}"
+ DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
+ SRC_URI="${SRC_URI}
+ ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+SRC_URI="${SRC_URI}
+ ${DEFAULT_URI}"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip mirror"
+
+# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
+RDEPEND="media-libs/fontconfig
+ x86? ( =dev-libs/openssl-0.9.8* )
+ cups? ( net-print/cups )
+ x86? ( x11-libs/gtk+:2
+ ldap? ( net-nds/openldap )
+ !minimal? ( || ( net-libs/xulrunner
+ www-client/firefox
+ www-client/seamonkey ) ) )
+ amd64? ( app-emulation/emul-linux-x86-gtklibs )"
+
+QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+ opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+ opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+ opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+ opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
+
+QA_DT_HASH="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+ opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+ opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+ opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+ opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+ opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+ opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+ opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+ opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+ opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+ opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+ opt/netscape/plugins/nppdf.so"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# Actually, ahv segfaults when run standalone so presumably
+# it isn't intended for direct use - so the only launcher is
+# acroread after all.
+LAUNCHERS="Adobe/Reader9/bin/acroread"
+# Adobe/HelpViewer/1.0/intellinux/bin/ahv"
+
+pkg_setup() {
+ # x86 binary package, ABI=x86
+ has_multilib_profile && ABI="x86"
+}
+
+# Determine lingua from filename
+acroread_get_ll() {
+ local f_src_l ll lingua src_l
+ f_src_l=${1/${SRC_FOOT}}
+ f_src_l=${f_src_l/*_}
+ for ll in ${LINGUA_LIST} ; do
+ lingua=${ll/:*}
+ src_l=${ll/*:}
+ if [[ ${src_l} == ${f_src_l} ]] ; then
+ echo ${lingua}
+ return
+ fi
+ done
+ die "Failed to match file $1 to a LINGUA; please report."
+}
+
+src_unpack() {
+ local ll linguas fl launcher
+ # Unpack all into the same place; overwrite common files.
+ fl=""
+ for pkg in ${A} ; do
+ cd "${WORKDIR}"
+ unpack ${pkg}
+ cd "${S}"
+ tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+ tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+ ll=$(acroread_get_ll ${pkg})
+ for launcher in ${LAUNCHERS} ; do
+ mv ${launcher} ${launcher}.${ll}
+ done
+ if [[ -z ${fl} ]] ; then
+ fl=${ll}
+ linguas="${ll}"
+ else
+ linguas="${linguas} ${ll}"
+ fi
+ done
+ if [[ ${linguas} == ${fl} ]] ; then
+ # Only one lingua selected - skip building the wrappers
+ for launcher in ${LAUNCHERS} ; do
+ mv ${launcher}.${fl} ${launcher} ||
+ die "Failed to put ${launcher}.${fl} back to ${launcher}; please report."
+ done
+ else
+ # Build wrappers. Launch the acroread for the environment variable
+ # LANG (matched with a trailing * so that for example 'de_DE' matches
+ # 'de', 'en_GB' matches 'en' etc).
+ #
+ # HelpViewer is new - We don't know if Adobe are likely to
+ # internationalize it or not.
+ for launcher in ${LAUNCHERS} ; do
+ cat > ${launcher} <<-EOF
+ #!/bin/bash
+ # Copyright 1999-2009 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ #
+ # Automatically generated by ${CATEGORY}/${PF}
+
+ # Exec the acroread script for the language chosen in
+ # LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
+ L=\${LC_ALL}
+ L=\${L:-\${LC_MESSAGES}}
+ L=\${L:-\${LANG}}
+ case \${L} in
+ EOF
+ for ll in ${linguas} ; do
+ echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
+ done
+ # default to English (in particular for LANG=C)
+ cat >> ${launcher} <<-EOF
+ *) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
+ esac
+ EOF
+ chmod 755 ${launcher}
+ done
+ fi
+
+ # remove cruft
+ rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+ rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+ rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+ # replace some configuration sections
+ for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+ sed -i -e '/Font-config/,+9d' \
+ -e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+ "${binfile}" || die "sed configuration settings failed."
+ done
+}
+
+src_install() {
+ # Install desktop files
+ domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop || die "Installing desktop files failed."
+
+ # Install commonly used icon sizes
+ for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+ insinto /usr/share/icons/hicolor/${res}/apps
+ doins Adobe/Reader9/Resource/Icons/${res}/* || die "Installing icons failed."
+ done
+
+ dodir /opt || die "Creating directory failed."
+ chown -R --dereference -L root:0 Adobe
+ cp -dpR Adobe "${D}"opt/
+
+ doman Adobe/Reader9/Resource/Shell/acroread.1.gz || die "Installing manpage failed."
+
+ if use nsplugin ; then
+ exeinto /opt/netscape/plugins
+ doexe Adobe/Reader9/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
+ inst_plugin /opt/netscape/plugins/nppdf.so
+ fi
+
+ dodir /opt/bin || die "Creating directory failed."
+ for launcher in ${LAUNCHERS} ; do
+ dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
+ done
+
+ # We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+ # they don't install a configuration file for libgtkembedmoz.so
+ # detection in /etc/gre.d/ like xulrunner does.
+ if ! use minimal ; then
+ if use x86 ; then
+ for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+ if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+ echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+ elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+ elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+ break # don't search any more libraries
+ fi
+ done
+ fi
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst () {
+ local ll lc
+ lc=0
+ for ll in ${LINGUA_LIST} ; do
+ use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+ done
+ if [[ ${lc} > 1 ]] ; then
+ echo
+ elog "Multiple languages have been installed, selected via a wrapper script."
+ elog "The language is selected according to the LANG environment variable"
+ elog "(defaulting to English if LANG is not set, or no matching language"
+ elog "version is installed). Users may need to remove their preferences in"
+ elog "~/.adobe to switch languages."
+ echo
+ fi
+
+ if use minimal ; then
+ echo
+ ewarn "If you want html support and/or view the Adobe Reader help you have"
+ ewarn "to re-emerge acroread with USE=\"-minimal\"."
+ echo
+ fi
+
+ if use nsplugin ; then
+ echo
+ elog "If you're running a 64bit browser you may also want to install"
+ elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
+ elog "browser plugin."
+ echo
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-text/acroread/acroread-9.4.7.ebuild b/app-text/acroread/acroread-9.4.7.ebuild
deleted file mode 100644
index 64db2cb9b1b3..000000000000
--- a/app-text/acroread/acroread-9.4.7.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.7.ebuild,v 1.6 2012/01/31 00:08:44 dilfridge Exp $
-
-EAPI=4
-
-inherit eutils gnome2-utils nsplugins
-
-DESCRIPTION="Adobe's PDF reader"
-HOMEPAGE="http://www.adobe.com/products/reader/"
-IUSE="cups ldap minimal nsplugin"
-
-SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
-SRC_FOOT=".tar.bz2"
-
-# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan de:deu fr:fra ja:jpn
-# asian fonts are handled separately
-LINGUA_LIST="en:enu"
-DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_enu${SRC_FOOT}"
-for ll in ${LINGUA_LIST} ; do
- iuse_l="linguas_${ll/:*}"
- src_l=${ll/*:}
- IUSE="${IUSE} ${iuse_l}"
- DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
- SRC_URI="${SRC_URI}
- ${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
-done
-
-# asian fonts from separate package:
-IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-
-SRC_URI="${SRC_URI}
- ${DEFAULT_URI}"
-
-LICENSE="Adobe"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip mirror"
-
-# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
-RDEPEND="media-libs/fontconfig
- x86? ( =dev-libs/openssl-0.9.8* )
- cups? ( net-print/cups )
- x86? ( x11-libs/gtk+:2 net-dns/libidn
- ldap? ( net-nds/openldap )
- !minimal? ( || ( net-libs/xulrunner
- www-client/firefox
- www-client/seamonkey ) ) )
- amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
- linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
- linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] )
- linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] )
- linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )"
-
-QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
- opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
- opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
- opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
- opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
-
-QA_DT_HASH="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
- opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
- opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
- opt/Adobe/Reader9/Reader/intellinux/bin/acroread
- opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
- opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
- opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
- opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
- opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
- opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
- opt/Adobe/Reader9/Browser/intellinux/nppdf.so
- opt/netscape/plugins/nppdf.so"
-
-QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so"
-
-INSTALLDIR=/opt
-
-S="${WORKDIR}/AdobeReader"
-
-# Actually, ahv segfaults when run standalone so presumably
-# it isn't intended for direct use - so the only launcher is
-# acroread after all.
-LAUNCHERS="Adobe/Reader9/bin/acroread"
-# Adobe/HelpViewer/1.0/intellinux/bin/ahv"
-
-# remove bundled libs to force use of system version, bug 340527
-REMOVELIBS="libcrypto libssl"
-
-pkg_setup() {
- # x86 binary package, ABI=x86
- has_multilib_profile && ABI="x86"
-}
-
-# Determine lingua from filename
-acroread_get_ll() {
- local f_src_l ll lingua src_l
- f_src_l=${1/${SRC_FOOT}}
- f_src_l=${f_src_l/*_}
- for ll in ${LINGUA_LIST} ; do
- lingua=${ll/:*}
- src_l=${ll/*:}
- if [[ ${src_l} == ${f_src_l} ]] ; then
- echo ${lingua}
- return
- fi
- done
- die "Failed to match file $1 to a LINGUA; please report."
-}
-
-src_unpack() {
- local ll linguas fl launcher
- # Unpack all into the same place; overwrite common files.
- fl=""
- for pkg in ${A} ; do
- cd "${WORKDIR}"
- unpack ${pkg}
- cd "${S}"
- tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
- tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
- ll=$(acroread_get_ll ${pkg})
- for launcher in ${LAUNCHERS} ; do
- mv ${launcher} ${launcher}.${ll}
- done
- if [[ -z ${fl} ]] ; then
- fl=${ll}
- linguas="${ll}"
- else
- linguas="${linguas} ${ll}"
- fi
- done
- if [[ ${linguas} == ${fl} ]] ; then
- # Only one lingua selected - skip building the wrappers
- for launcher in ${LAUNCHERS} ; do
- mv ${launcher}.${fl} ${launcher} ||
- die "Failed to put ${launcher}.${fl} back to ${launcher}; please report."
- done
- else
- # Build wrappers. Launch the acroread for the environment variable
- # LANG (matched with a trailing * so that for example 'de_DE' matches
- # 'de', 'en_GB' matches 'en' etc).
- #
- # HelpViewer is new - We don't know if Adobe are likely to
- # internationalize it or not.
- for launcher in ${LAUNCHERS} ; do
- cat > ${launcher} <<-EOF
- #!/bin/bash
- # Copyright 1999-2009 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- #
- # Automatically generated by ${CATEGORY}/${PF}
-
- # Exec the acroread script for the language chosen in
- # LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
- L=\${LC_ALL}
- L=\${L:-\${LC_MESSAGES}}
- L=\${L:-\${LANG}}
- case \${L} in
- EOF
- for ll in ${linguas} ; do
- echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
- done
- # default to English (in particular for LANG=C)
- cat >> ${launcher} <<-EOF
- *) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
- esac
- EOF
- chmod 755 ${launcher}
- done
- fi
-
- # remove cruft
- rm "${S}"/Adobe/Reader9/bin/UNINSTALL
- rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
- rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
-
- # replace some configuration sections
- for binfile in "${S}"/Adobe/Reader9/bin/* ; do
- sed -i -e '/Font-config/,+9d' \
- -e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
- "${binfile}" || die "sed configuration settings failed."
- done
-
- # fix erroneous Exec entry in .desktop
- sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
- "${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
- ||die "sed .desktop fix failed"
-}
-
-src_install() {
- # Install desktop files
- domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
-
- # Install commonly used icon sizes
- for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
- insinto /usr/share/icons/hicolor/${res}/apps
- doins Adobe/Reader9/Resource/Icons/${res}/*
- done
-
- dodir /opt
- chown -R --dereference -L root:0 Adobe
- cp -dpR Adobe "${D}"opt/ || die
-
- # remove some bundled libs
- for mylib in ${REMOVELIBS} ; do
- einfo Removing bundled ${mylib}
- rm -v "${D}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
- done
-
- doman Adobe/Reader9/Resource/Shell/acroread.1.gz
-
- if use nsplugin ; then
- exeinto /opt/netscape/plugins
- doexe Adobe/Reader9/Browser/intellinux/nppdf.so
- inst_plugin /opt/netscape/plugins/nppdf.so
- fi
-
- dodir /opt/bin
- for launcher in ${LAUNCHERS} ; do
- dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
- done
-
- # We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
- # they don't install a configuration file for libgtkembedmoz.so
- # detection in /etc/gre.d/ like xulrunner does.
- if ! use minimal ; then
- if use x86 ; then
- for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
- if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
- echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
- elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
- elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
- break # don't search any more libraries
- fi
- done
- fi
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst () {
- local ll lc
- lc=0
- for ll in ${LINGUA_LIST} ; do
- use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
- done
- if [[ ${lc} > 1 ]] ; then
- echo
- elog "Multiple languages have been installed, selected via a wrapper script."
- elog "The language is selected according to the LANG environment variable"
- elog "(defaulting to English if LANG is not set, or no matching language"
- elog "version is installed). Users may need to remove their preferences in"
- elog "~/.adobe to switch languages."
- echo
- fi
-
- if use minimal ; then
- echo
- ewarn "If you want html support and/or view the Adobe Reader help you have"
- ewarn "to re-emerge acroread with USE=\"-minimal\"."
- echo
- fi
-
- if use nsplugin ; then
- echo
- elog "If you're running a 64bit browser you may also want to install"
- elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
- elog "browser plugin."
- echo
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 3ee7c30ec613..8518f88961c4 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,2 +1 @@
DIST ansifilter-1.6.tar.bz2 50449 RMD160 d68556ab42273d52ab531bf86d6c338af96b5bbf SHA1 2b10c74d070fe440c56ee46dd065a38c536f8988 SHA256 7a704438f6b93b9695e6f15c17df189a1a343dc65678a0a16fdf521a53e91c52
-DIST ansifilter-1.7.tar.bz2 133803 RMD160 020cb3cd9f06b7af3f302b471d916ac12a15af83 SHA1 5b88db508ea100f327bf6b621c959742694fe2d8 SHA256 a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c
diff --git a/app-text/ansifilter/ansifilter-1.7.ebuild b/app-text/ansifilter/ansifilter-1.7.ebuild
deleted file mode 100644
index bfc307415828..000000000000
--- a/app-text/ansifilter/ansifilter-1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ansifilter/ansifilter-1.7.ebuild,v 1.1 2012/01/06 05:44:32 radhermit Exp $
-
-EAPI=4
-
-inherit toolchain-funcs qt4-r2
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-RDEPEND="
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- myopts=(
- "CC=$(tc-getCXX)"
- "CFLAGS=${CFLAGS} -c"
- "LDFLAGS=${LDFLAGS}"
- "DESTDIR=${ED}"
- "PREFIX=${EPREFIX}/usr"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- )
-}
-
-src_compile() {
- emake -f makefile "${myopts[@]}"
- if use qt4 ; then
- cd src/qt-gui
- eqmake4
- emake
- fi
-}
-
-src_install() {
- emake -f makefile "${myopts[@]}" install
- use qt4 && emake -f makefile "${myopts[@]}" install-gui
-}
diff --git a/app-text/aspell/aspell-0.60.6.1.ebuild b/app-text/aspell/aspell-0.60.6.1.ebuild
index aae0996eaada..ca2567fb2929 100644
--- a/app-text/aspell/aspell-0.60.6.1.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.7 2012/01/31 15:50:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.6 2011/10/23 16:48:31 armin76 Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
# Build PDEPEND from list of language codes provided in the tree.
diff --git a/app-text/barcode/barcode-0.98-r1.ebuild b/app-text/barcode/barcode-0.98-r1.ebuild
index 3820eee67757..0b04227d4982 100644
--- a/app-text/barcode/barcode-0.98-r1.ebuild
+++ b/app-text/barcode/barcode-0.98-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/barcode/barcode-0.98-r1.ebuild,v 1.4 2011/12/18 20:17:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/barcode/barcode-0.98-r1.ebuild,v 1.2 2011/12/16 20:08:10 ago Exp $
EAPI="3"
@@ -12,10 +12,10 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
+DEPEND=""
RDEPEND="app-text/libpaper"
-DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PV}-info.patch
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f559ee60cb2c..7182e7ab4c80 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,2 +1,2 @@
-DIST calibre-0.8.37.tar.xz 23614740 RMD160 c0434de7f0d3bf8cb092993bc17fcc9f21fb238c SHA1 c0f0885ec10a99e680d8f7b44cd7133352bcd435 SHA256 eedde8124f0e688d826de0013dabf2f16ff5fa0621df89f0897fd3848bc8d59d
-DIST calibre-0.8.38.tar.xz 23680916 RMD160 bec45e16d92d26e98dd736ac0a1544d8cb29f10d SHA1 2bdc8327b257535317049d24344af19bd2032a8c SHA256 63176dc5cb14fb2f5a2c45196904b9788106d6b0c6d9976d45b4a7fec10e3b99
+DIST calibre-0.8.30.tar.xz 21494728 RMD160 876590821f978a896df2a575bbb24feb7a4febbf SHA1 6e75b574d0504ca9d53b37128e8256d05aa5eb88 SHA256 02892823b65fc2f027ff8f63ea41450e01eab3e59b626ea2937ac66ebd9a24f1
+DIST calibre-0.8.31.tar.xz 21643692 RMD160 6773d6619e98cff4b0ffe0cc2195c84d904f03b0 SHA1 f33b96be7eb3107f16d3f5dd95dc9a744799e478 SHA256 966dd40ae666c43aba6f66685d048c95819029fcd2c6bcd7f707dd4413c86df2
diff --git a/app-text/calibre/calibre-0.8.30.ebuild b/app-text/calibre/calibre-0.8.30.ebuild
new file mode 100644
index 000000000000..0d76bae625b6
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.30.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.30.ebuild,v 1.1 2011/12/09 17:01:38 zmedico Exp $
+
+EAPI=4
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE="+udisks"
+
+COMMON_DEPEND="
+ >=app-text/podofo-0.8.2
+ >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+ >=dev-libs/chmlib-0.40
+ >=dev-libs/icu-4.4
+ >=dev-python/beautifulsoup-3.0.5:python-2
+ >=dev-python/dnspython-1.6.0
+ >=dev-python/cssutils-0.9.7_alpha3
+ >=dev-python/dbus-python-0.82.2
+ >=dev-python/imaging-1.1.6
+ >=dev-python/lxml-2.2.1
+ >=dev-python/mechanize-0.1.11
+ >=dev-python/python-dateutil-1.4.1
+ >=dev-python/PyQt4-4.8.2[X,svg,webkit]
+ >=media-gfx/imagemagick-6.5.9
+ >=media-libs/libwmf-0.2.8
+ virtual/libusb:0
+ >=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="${COMMON_DEPEND}
+ >=dev-python/reportlab-2.1
+ udisks? ( sys-fs/udisks )"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-python/setuptools-0.6_rc5
+ >=gnome-base/librsvg-2.0.0
+ >=x11-misc/xdg-utils-1.0.2-r2"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ python_set_active_version 2.7
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Fix outdated version constant.
+ #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+ # -i src/calibre/constants.py || \
+ # die "sed failed to patch constants.py"
+
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+ # calls xdg-* (bug #258938).
+ sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
+ -e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+ -e "s:xdg-icon-resource install:\\0 --mode user:" \
+ -e "s:xdg-mime install:\\0 --mode user:" \
+ -i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ distutils_src_prepare
+}
+
+src_install() {
+
+ # Bypass kbuildsycoca and update-mime-database in order to
+ # avoid sandbox violations if xdg-mime tries to call them.
+ cat - > "${T}/kbuildsycoca" <<-EOF
+ #!${BASH}
+ exit 0
+ EOF
+
+ cp "${T}"/{kbuildsycoca,update-mime-database}
+ chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+ # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+ # violation with kbuildsycoca as in bug #287067, comment #13.
+ export -n DISPLAY
+
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANGUAGE
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export XDG_CONFIG_HOME="${HOME}/.config"
+ export XDG_DATA_HOME="${HOME}/.local/share"
+ export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+ mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+ # Bug #334243 - respect LDFLAGS when building calibre-mount-helper
+ export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS"
+ local libdir=$(get_libdir)
+ [[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+ PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ distutils_src_install \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/${libdir}" \
+ --staging-root="${ED}usr" \
+ --staging-libdir="${ED}usr/${libdir}"
+
+ grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+ die "failed to fix harcoded \$D in paths"
+
+ # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
+ # due to bug #389515 (instead, calibre now calls udisks via dbus).
+ rm "${ED}usr/bin/calibre-mount-helper" || die
+
+ find "${ED}"usr/share/calibre/man -type f -print0 | \
+ while read -r -d $'\0' ; do
+ if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
+ newname=${REPLY%calibre.bz2}.bz2
+ mv "${REPLY}" "${newname}"
+ doman "${newname}"
+ rm -f "${newname}" || die "rm failed"
+ fi
+ done
+ rmdir "${ED}"usr/share/calibre/man/* || \
+ die "could not remove redundant man subdir(s)"
+ rmdir "${ED}"usr/share/calibre/man || \
+ die "could not remove redundant man dir"
+
+ # The menu entries end up here due to '--mode user' being added to
+ # xdg-* options in src_prepare.
+ dodir /usr/share/mime/packages
+ chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+ mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+ die "failed to register mime types"
+ dodir /usr/share/icons
+ mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+ die "failed to install icon files"
+
+ domenu "${HOME}"/.local/share/applications/*.desktop ||
+ die "failed to install .desktop menu files"
+
+ dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
+ rm -r "${ED}"usr/etc/bash_completion.d
+ find "${ED}"usr/etc -type d -empty -delete
+
+ python_convert_shebangs -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
diff --git a/app-text/calibre/calibre-0.8.31.ebuild b/app-text/calibre/calibre-0.8.31.ebuild
new file mode 100644
index 000000000000..787662a3fdd6
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.31.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.31.ebuild,v 1.1 2011/12/16 18:08:43 zmedico Exp $
+
+EAPI=4
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE="+udisks"
+
+COMMON_DEPEND="
+ >=app-text/podofo-0.8.2
+ >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+ >=dev-libs/chmlib-0.40
+ >=dev-libs/icu-4.4
+ >=dev-python/beautifulsoup-3.0.5:python-2
+ >=dev-python/dnspython-1.6.0
+ >=dev-python/cssutils-0.9.7_alpha3
+ >=dev-python/dbus-python-0.82.2
+ >=dev-python/imaging-1.1.6
+ >=dev-python/lxml-2.2.1
+ >=dev-python/mechanize-0.1.11
+ >=dev-python/python-dateutil-1.4.1
+ >=dev-python/PyQt4-4.8.2[X,svg,webkit]
+ >=media-gfx/imagemagick-6.5.9
+ >=media-libs/libwmf-0.2.8
+ virtual/libusb:0
+ >=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="${COMMON_DEPEND}
+ >=dev-python/reportlab-2.1
+ udisks? ( sys-fs/udisks )"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-python/setuptools-0.6_rc5
+ >=gnome-base/librsvg-2.0.0
+ >=x11-misc/xdg-utils-1.0.2-r2"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ python_set_active_version 2.7
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Fix outdated version constant.
+ #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+ # -i src/calibre/constants.py || \
+ # die "sed failed to patch constants.py"
+
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+ # calls xdg-* (bug #258938).
+ sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
+ -e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+ -e "s:xdg-icon-resource install:\\0 --mode user:" \
+ -e "s:xdg-mime install:\\0 --mode user:" \
+ -i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ distutils_src_prepare
+}
+
+src_install() {
+
+ # Bypass kbuildsycoca and update-mime-database in order to
+ # avoid sandbox violations if xdg-mime tries to call them.
+ cat - > "${T}/kbuildsycoca" <<-EOF
+ #!${BASH}
+ exit 0
+ EOF
+
+ cp "${T}"/{kbuildsycoca,update-mime-database}
+ chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+ # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+ # violation with kbuildsycoca as in bug #287067, comment #13.
+ export -n DISPLAY
+
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANGUAGE
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export XDG_CONFIG_HOME="${HOME}/.config"
+ export XDG_DATA_HOME="${HOME}/.local/share"
+ export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+ mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+ # Bug #334243 - respect LDFLAGS when building calibre-mount-helper
+ export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS"
+ local libdir=$(get_libdir)
+ [[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+ PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ distutils_src_install \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/${libdir}" \
+ --staging-root="${ED}usr" \
+ --staging-libdir="${ED}usr/${libdir}"
+
+ grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+ die "failed to fix harcoded \$D in paths"
+
+ # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
+ # due to bug #389515 (instead, calibre now calls udisks via dbus).
+ rm "${ED}usr/bin/calibre-mount-helper" || die
+
+ find "${ED}"usr/share/calibre/man -type f -print0 | \
+ while read -r -d $'\0' ; do
+ if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
+ newname=${REPLY%calibre.bz2}.bz2
+ mv "${REPLY}" "${newname}"
+ doman "${newname}"
+ rm -f "${newname}" || die "rm failed"
+ fi
+ done
+ rmdir "${ED}"usr/share/calibre/man/* || \
+ die "could not remove redundant man subdir(s)"
+ rmdir "${ED}"usr/share/calibre/man || \
+ die "could not remove redundant man dir"
+
+ # The menu entries end up here due to '--mode user' being added to
+ # xdg-* options in src_prepare.
+ dodir /usr/share/mime/packages
+ chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+ mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+ die "failed to register mime types"
+ dodir /usr/share/icons
+ mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+ die "failed to install icon files"
+
+ domenu "${HOME}"/.local/share/applications/*.desktop ||
+ die "failed to install .desktop menu files"
+
+ dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
+ rm -r "${ED}"usr/etc/bash_completion.d
+ find "${ED}"usr/etc -type d -empty -delete
+
+ python_convert_shebangs -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
diff --git a/app-text/calibre/calibre-0.8.37.ebuild b/app-text/calibre/calibre-0.8.37.ebuild
deleted file mode 100644
index 13ce9cfc087c..000000000000
--- a/app-text/calibre/calibre-0.8.37.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.37.ebuild,v 1.1 2012/01/28 04:32:27 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH=sqlite
-
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
- >=app-text/podofo-0.8.2
- >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
- >=dev-libs/chmlib-0.40
- >=dev-libs/icu-4.4
- >=dev-python/beautifulsoup-3.0.5:python-2
- dev-python/python-dateutil:python-2
- >=dev-python/dnspython-1.6.0
- >=dev-python/cssutils-0.9.7_alpha3
- >=dev-python/dbus-python-0.82.2
- >=dev-python/imaging-1.1.6
- >=dev-python/lxml-2.2.1
- >=dev-python/mechanize-0.1.11
- >=dev-python/python-dateutil-1.4.1
- >=dev-python/PyQt4-4.8.2[X,svg,webkit]
- >=media-gfx/imagemagick-6.5.9[jpeg]
- >=media-libs/libwmf-0.2.8
- virtual/libusb:0
- >=x11-misc/xdg-utils-1.0.2"
-
-RDEPEND="${COMMON_DEPEND}
- >=dev-python/reportlab-2.1
- udisks? ( sys-fs/udisks )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-0.6_rc5
- >=gnome-base/librsvg-2.0.0
- >=x11-misc/xdg-utils-1.0.2-r2"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- python_set_active_version 2.7
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
- -e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
- -e "s:xdg-icon-resource install:\\0 --mode user:" \
- -e "s:xdg-mime install:\\0 --mode user:" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self\\.check_call(qmc + \\[ext\\.name+'\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/extensions.py || die "sed failed to patch extensions.py"
-
- distutils_src_prepare
-}
-
-src_install() {
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database}
- chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANGUAGE
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
- # Bug #334243 - respect LDFLAGS when building calibre-mount-helper
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- distutils_src_install \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}"
-
- grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
- die "failed to fix harcoded \$D in paths"
-
- # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
- # due to bug #389515 (instead, calibre now calls udisks via dbus).
- rm "${ED}usr/bin/calibre-mount-helper" || die
-
- find "${ED}"usr/share/calibre/man -type f -print0 | \
- while read -r -d $'\0' ; do
- if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
- newname=${REPLY%calibre.bz2}.bz2
- mv "${REPLY}" "${newname}"
- doman "${newname}"
- rm -f "${newname}" || die "rm failed"
- fi
- done
- rmdir "${ED}"usr/share/calibre/man/* || \
- die "could not remove redundant man subdir(s)"
- rmdir "${ED}"usr/share/calibre/man || \
- die "could not remove redundant man dir"
-
- # The menu entries end up here due to '--mode user' being added to
- # xdg-* options in src_prepare.
- dodir /usr/share/mime/packages
- chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
- mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
- die "failed to register mime types"
- dodir /usr/share/icons
- mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
- die "failed to install icon files"
-
- domenu "${HOME}"/.local/share/applications/*.desktop ||
- die "failed to install .desktop menu files"
-
- dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
- rm -r "${ED}"usr/etc/bash_completion.d
- find "${ED}"usr/etc -type d -empty -delete
-
- python_convert_shebangs -r $(python_get_version) "${ED}"
-
- newinitd "${FILESDIR}"/calibre-server.init calibre-server
- newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.8.38.ebuild b/app-text/calibre/calibre-0.8.38.ebuild
deleted file mode 100644
index f662499078b1..000000000000
--- a/app-text/calibre/calibre-0.8.38.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.38.ebuild,v 1.1 2012/02/05 22:46:37 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH=sqlite
-
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
- >=app-text/podofo-0.8.2
- >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
- >=dev-libs/chmlib-0.40
- >=dev-libs/icu-4.4
- >=dev-python/beautifulsoup-3.0.5:python-2
- dev-python/python-dateutil:python-2
- >=dev-python/dnspython-1.6.0
- >=dev-python/cssutils-0.9.7_alpha3
- >=dev-python/dbus-python-0.82.2
- >=dev-python/imaging-1.1.6
- >=dev-python/lxml-2.2.1
- >=dev-python/mechanize-0.1.11
- >=dev-python/python-dateutil-1.4.1
- >=dev-python/PyQt4-4.8.2[X,svg,webkit]
- >=media-gfx/imagemagick-6.5.9[jpeg]
- >=media-libs/libwmf-0.2.8
- virtual/libusb:0
- >=x11-misc/xdg-utils-1.0.2"
-
-RDEPEND="${COMMON_DEPEND}
- >=dev-python/reportlab-2.1
- udisks? ( sys-fs/udisks )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-0.6_rc5
- >=gnome-base/librsvg-2.0.0
- >=x11-misc/xdg-utils-1.0.2-r2"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- python_set_active_version 2.7
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
- -e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
- -e "s:xdg-icon-resource install:\\0 --mode user:" \
- -e "s:xdg-mime install:\\0 --mode user:" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self\\.check_call(qmc + \\[ext\\.name+'\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/extensions.py || die "sed failed to patch extensions.py"
-
- distutils_src_prepare
-}
-
-src_install() {
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database}
- chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANGUAGE
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
- # Bug #334243 - respect LDFLAGS when building calibre-mount-helper
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- distutils_src_install \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}"
-
- grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
- die "failed to fix harcoded \$D in paths"
-
- # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
- # due to bug #389515 (instead, calibre now calls udisks via dbus).
- rm "${ED}usr/bin/calibre-mount-helper" || die
-
- find "${ED}"usr/share/calibre/man -type f -print0 | \
- while read -r -d $'\0' ; do
- if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
- newname=${REPLY%calibre.bz2}.bz2
- mv "${REPLY}" "${newname}"
- doman "${newname}"
- rm -f "${newname}" || die "rm failed"
- fi
- done
- rmdir "${ED}"usr/share/calibre/man/* || \
- die "could not remove redundant man subdir(s)"
- rmdir "${ED}"usr/share/calibre/man || \
- die "could not remove redundant man dir"
-
- # The menu entries end up here due to '--mode user' being added to
- # xdg-* options in src_prepare.
- dodir /usr/share/mime/packages
- chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
- mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
- die "failed to register mime types"
- dodir /usr/share/icons
- mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
- die "failed to install icon files"
-
- domenu "${HOME}"/.local/share/applications/*.desktop ||
- die "failed to install .desktop menu files"
-
- dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
- rm -r "${ED}"usr/etc/bash_completion.d
- find "${ED}"usr/etc -type d -empty -delete
-
- python_convert_shebangs -r $(python_get_version) "${ED}"
-
- newinitd "${FILESDIR}"/calibre-server.init calibre-server
- newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
deleted file mode 100644
index c1bed84289cc..000000000000
--- a/app-text/calibre/files/calibre-server.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/calibre-server
-# Change this to the user you want to run calibre-server as.
-# You may specify a group too, after a colon
-# NOTE: This must be set and not to root!
-CALIBRE_USER=
-
-# Set the path of the library to serve.
-# Defaults to the default location for CALIBRE_USER.
-#CALIBRE_LIBRARY='/Calibre Library'
-
-# Extra options to pass to calibre-server.
-# See the calibre-server man page for more options.
-#CALIBRE_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
deleted file mode 100644
index f17270721bf4..000000000000
--- a/app-text/calibre/files/calibre-server.init
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/files/calibre-server.init,v 1.1 2012/01/14 18:27:01 zmedico Exp $
-
-depend() {
- need net
- need localmount
- after bootmisc
-}
-
-checkconfig() {
- if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
- eerror "Please edit /etc/conf.d/calibre-server"
- eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
- eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
- return 1
- fi
- if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
- eerror "Please edit /etc/conf.d/calibre-server"
- eerror "Your user has to exist!"
- return 1
- fi
- if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
- if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
- eerror "Please edit /etc/conf.d/calibre-server"
- eerror "Your group has to exist too!"
- return 1
- fi
- fi
- if [ "${CALIBRE_LIBRARY}" = "" ] ; then
- CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
- CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
- fi
- if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
- eerror "Please edit /etc/conf.d/calibre-server"
- eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
- eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
- local pidfile=/var/run/calibre-server.pid
- ebegin "Starting calibre-server"
- start-stop-daemon --user "${CALIBRE_USER}" \
- --pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
- -- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping calibre-server"
- start-stop-daemon --stop --user "${CALIBRE_USER}" \
- --pidfile /var/run/calibre-server.pid
- eend $?
-}
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 7189bec4cf12..7e551c8ef9c4 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1,4 @@
DIST cb2bib-1.3.6.tar.gz 607257 RMD160 1f8adfeb43aefd04256d0f329f96433fb2888d07 SHA1 384ace2cf33363d4548e3ba345122b478a553f75 SHA256 b6ebf499fbe8f3e661b55c19b3b8463044f0795f1265d8c8c1bbe6e9fbc332ad
+DIST cb2bib-1.3.7.tar.gz 605472 RMD160 7f62ec2b204dd0e7f1ecde67212a051dd0289370 SHA1 2c3ef07056e677bb887a4123cbb464b2daac49b9 SHA256 d0c5ef8fda586e2cc4cb71fb23cc87c11080e46e579a3a72e8c8eeb255206108
+DIST cb2bib-1.4.0.tar.gz 606847 RMD160 0eb5e56df0e279aa02ac672e8a940fa43ee5cf9e SHA1 dc7d6b365ff2674a5a3aac21b41bd4d79c778b45 SHA256 fdd341891f3464d6dd9a2b969e0bd302a9fda2d0ebbfc21cb4d029ac299c53cf
DIST cb2bib-1.4.2.tar.gz 611524 RMD160 1c45c99d1fc8a5ecd858be30026075bcf033f21d SHA1 010c7683a5bb9da3cf731606b03d63d51721b217 SHA256 802c61c6c439fd2680c3a40d887532629eeb7d6d1cb457b7418cf19c7a198a32
-DIST cb2bib-1.4.7.tar.gz 852983 RMD160 e5b17bed1c851a55b1f74eebc38d5b8d83cdb1b4 SHA1 3f363b4c63d7abee278caf4fb2e051d61983ff30 SHA256 b911a70e83509b8270fe1d9b6b69306a153b891ec2e0db10ce2a2a88b143c927
diff --git a/app-text/cb2bib/cb2bib-1.3.7.ebuild b/app-text/cb2bib/cb2bib-1.3.7.ebuild
new file mode 100644
index 000000000000..3f18b94af6dd
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.3.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.3.7.ebuild,v 1.1 2010/02/22 15:47:35 ayoy Exp $
+
+EAPI="2"
+
+inherit qt4-r2
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="http://www.molspaces.com/cb2bib/"
+SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +lzo +poll"
+
+DEPEND="x11-libs/qt-webkit:4
+ lzo? ( dev-libs/lzo )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ echo "CONFIG += ordered" >> "${PN}.pro" || die "patching project file failed"
+ sed -i 's:\.\./COPYRIGHT \.\.\/LICENSE::' src/src.pro || die "sed src.pro failed"
+}
+
+src_configure() {
+ # Custom configure script has only few options, so call ./configure manually...
+ # We need to unset QTDIR here, else we may end up with qt3 if it is installed.
+ # TODO: remove QTDIR when qt3 goes away
+ QTDIR="" ./configure \
+ $(use_enable lzo) \
+ $(use_enable poll cbpoll) \
+ --disable-qmake-call \
+ --qmakepath /usr/bin/qmake \
+ --prefix /usr \
+ --bindir /usr/bin \
+ --datadir /usr/share \
+ --desktopdatadir /usr/share/applications \
+ --icondir /usr/share/pixmaps \
+ || die "cb2bib-provided configure failed"
+
+ eqmake4 $(cat qmake-additional-args)
+}
+
+pkg_postinst() {
+ elog "For best functionality, emerge the following packages:"
+ elog " app-text/poppler-utils - for data import from PDF files"
+ elog " app-text/dvipdfm - for data import from DVI files"
+ elog " app-text/bibutils - for data import from ISI, endnote format"
+ elog " media-fonts/jsmath - for displaying mathematical notation"
+ elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
+ elog " text strings"
+ elog " virtual/latex-base - to check for BibTeX file correctness and to get"
+ elog " nice printing through the shell script bib2pdf"
+}
diff --git a/app-text/cb2bib/cb2bib-1.4.0.ebuild b/app-text/cb2bib/cb2bib-1.4.0.ebuild
new file mode 100644
index 000000000000..5e11774991af
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.4.0.ebuild,v 1.1 2010/04/29 06:21:51 ayoy Exp $
+
+EAPI="2"
+
+inherit qt4-r2
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="http://www.molspaces.com/cb2bib/"
+SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +lzo +poll"
+
+DEPEND="x11-libs/qt-webkit:4
+ lzo? ( dev-libs/lzo )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ echo "CONFIG += ordered" >> "${PN}.pro" || die "patching project file failed"
+ sed -i 's:\.\./COPYRIGHT \.\.\/LICENSE::' src/src.pro || die "sed src.pro failed"
+}
+
+src_configure() {
+ # Custom configure script has only few options, so call ./configure manually...
+ # We need to unset QTDIR here, else we may end up with qt3 if it is installed.
+ # TODO: remove QTDIR when qt3 goes away
+ QTDIR="" ./configure \
+ $(use_enable lzo) \
+ $(use_enable poll cbpoll) \
+ --disable-qmake-call \
+ --qmakepath /usr/bin/qmake \
+ --prefix /usr \
+ --bindir /usr/bin \
+ --datadir /usr/share \
+ --desktopdatadir /usr/share/applications \
+ --icondir /usr/share/pixmaps \
+ || die "cb2bib-provided configure failed"
+
+ eqmake4 $(cat qmake-additional-args)
+}
+
+pkg_postinst() {
+ elog "For best functionality, emerge the following packages:"
+ elog " app-text/poppler-utils - for data import from PDF files"
+ elog " app-text/dvipdfm - for data import from DVI files"
+ elog " app-text/bibutils - for data import from ISI, endnote format"
+ elog " media-fonts/jsmath - for displaying mathematical notation"
+ elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
+ elog " text strings"
+ elog " virtual/latex-base - to check for BibTeX file correctness and to get"
+ elog " nice printing through the shell script bib2pdf"
+}
diff --git a/app-text/cb2bib/cb2bib-1.4.7.ebuild b/app-text/cb2bib/cb2bib-1.4.7.ebuild
deleted file mode 100644
index 3868688e5137..000000000000
--- a/app-text/cb2bib/cb2bib-1.4.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cb2bib/cb2bib-1.4.7.ebuild,v 1.1 2012/01/19 13:30:58 johu Exp $
-
-EAPI=4
-
-inherit cmake-utils qt4-r2
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="http://www.molspaces.com/cb2bib/"
-SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +lzo +poll"
-
-DEPEND="
- x11-libs/libX11
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-webkit:4
- lzo? ( dev-libs/lzo )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- if use !lzo; then
- mycmakeargs+=( -DC2B_USE_LZO=OFF )
- fi
-
- if use !poll; then
- mycmakeargs+=( -DC2B_USE_POLL=OFF )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm "${D}"/usr/share/${PN}/COPYRIGHT || die "rm COPYRIGHT failed"
- rm "${D}"/usr/share/${PN}/LICENSE || die "rm LICENSE failed"
-}
-
-pkg_postinst() {
- elog "For best functionality, emerge the following packages:"
- elog " app-text/poppler-utils - for data import from PDF files"
- elog " app-text/dvipdfm - for data import from DVI files"
- elog " app-text/bibutils - for data import from ISI, endnote format"
- elog " media-fonts/jsmath - for displaying mathematical notation"
- elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
- elog " text strings"
- elog " virtual/latex-base - to check for BibTeX file correctness and to get"
- elog " nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
index 1e4804c52bad..ccc0ef51dcfb 100644
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@@ -1 +1,2 @@
+DIST cedilla-0.3.tar.gz 128037 RMD160 3cda914230c106fac65cca5a79c01d078ec98ed4 SHA1 1c34537d58bbb71d4443f14a1d6deaeaffd81a07 SHA256 d00fb4e90eb31102092f33a4a9186977cfb4e3a0d6f2f5bb248119ac2afaf6a8
DIST cedilla-0.6.tar.gz 130676 RMD160 96defbd5f212b9d8e6a60ba8658a5d0ab2cf9b32 SHA1 2318e8788837980df9a6a902cde977d9fd93e219 SHA256 c5840c3e125fab29af844540239dfb475b59c6ecd67270736898608de743df43
diff --git a/app-text/cedilla/cedilla-0.3.ebuild b/app-text/cedilla/cedilla-0.3.ebuild
new file mode 100644
index 000000000000..5c414b575f72
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cedilla/cedilla-0.3.ebuild,v 1.7 2005/01/01 16:05:12 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="Utf-8 to postscript converter."
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+KEYWORDS="x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=dev-lisp/clisp-2.29
+ >=sys-apps/sed-4"
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/cedilla-gentoo.patch
+}
+src_compile() {
+ ./compile-cedilla || die "Compile failed"
+}
+
+src_install() {
+ sed -i 's#/var/tmp/portage/cedilla-0.3/image##g' ${S}/cedilla
+ ./install-cedilla || die "Install failed"
+
+ newman cedilla.man cedilla.1
+ dodoc NEWS README
+}
diff --git a/app-text/chasen/chasen-2.4.4-r2.ebuild b/app-text/chasen/chasen-2.4.4-r2.ebuild
deleted file mode 100644
index f7ad6612f5ca..000000000000
--- a/app-text/chasen/chasen-2.4.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/chasen-2.4.4-r2.ebuild,v 1.1 2011/12/18 06:30:57 naota Exp $
-
-EAPI="4"
-inherit perl-module
-
-DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
-HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp//chasen-legacy/32224/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris"
-IUSE="perl static-libs"
-
-DEPEND=">=dev-libs/darts-0.32"
-RDEPEND="${DEPEND}
- perl? ( !dev-perl/Text-ChaSen )"
-PDEPEND=">=app-dicts/ipadic-2.7.0"
-
-src_preapre() {
- epatch "${FILESDIR}"/${P}-cve-2011-4000.patch
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
- if use perl ; then
- cd "${S}"/perl
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- emake || die
- if use perl ; then
- cd "${S}"/perl
- perl-module_src_compile
- fi
-}
-
-src_test() {
- emake check || die
- if use perl ; then
- cd "${S}"/perl
- perl-module_src_test
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die
-
- dodoc AUTHORS ChangeLog NEWS README
-
- if use perl ; then
- cd "${S}"/perl
- perl-module_src_install
- newdoc README README.perl
- fi
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete
- fi
-}
diff --git a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
deleted file mode 100644
index 61480622e40a..000000000000
--- a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/lib/chalib.c b/lib/chalib.c
-index 5d79e13..cddf51b 100644
---- a/lib/chalib.c
-+++ b/lib/chalib.c
-@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
- */
- while (*input) {
- int c = 0, len, cursor;
-- if ((crlf = strpbrk(input, "\r\n")) == NULL)
-+ if ((crlf = strpbrk(input, "\r\n")) == NULL) {
- len = strlen(input);
-- else {
-+ if (len >= CHA_INPUT_SIZE) {
-+ len = CHA_INPUT_SIZE - 1;
-+ crlf = input + CHA_INPUT_SIZE - 2;
-+ c = 0;
-+ }
-+ } else {
- len = crlf - input;
- c = *crlf;
- *crlf = '\0';
diff --git a/app-text/code2html/code2html-0.9.1-r1.ebuild b/app-text/code2html/code2html-0.9.1-r1.ebuild
index 3408fe83c18f..c75f5065d122 100644
--- a/app-text/code2html/code2html-0.9.1-r1.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/code2html-0.9.1-r1.ebuild,v 1.8 2012/02/06 15:20:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/code2html/code2html-0.9.1-r1.ebuild,v 1.6 2010/04/05 22:24:08 abcd Exp $
EAPI="3"
@@ -14,7 +14,7 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
LICENSE="as-is"
SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""
diff --git a/app-text/crm114/crm114-20100106.ebuild b/app-text/crm114/crm114-20100106.ebuild
index 7a469a8fb991..ae0b7a6216eb 100644
--- a/app-text/crm114/crm114-20100106.ebuild
+++ b/app-text/crm114/crm114-20100106.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20100106.ebuild,v 1.4 2012/01/30 21:08:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20100106.ebuild,v 1.3 2011/07/31 20:10:14 steev Exp $
EAPI=2
@@ -14,7 +14,7 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="mew mimencode nls normalizemime static test"
RDEPEND="
diff --git a/app-text/cwtext/cwtext-0.94.ebuild b/app-text/cwtext/cwtext-0.94.ebuild
index 3740ca29a5db..a0be3e6265bb 100644
--- a/app-text/cwtext/cwtext-0.94.ebuild
+++ b/app-text/cwtext/cwtext-0.94.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.94.ebuild,v 1.18 2012/02/05 15:46:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.94.ebuild,v 1.17 2011/02/06 05:47:02 leio Exp $
inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~mips ppc ~ppc64 sparc x86"
IUSE=""
src_unpack() {
diff --git a/app-text/cwtext/cwtext-0.96.ebuild b/app-text/cwtext/cwtext-0.96.ebuild
index 0a7e2677938f..93f4439faaa8 100644
--- a/app-text/cwtext/cwtext-0.96.ebuild
+++ b/app-text/cwtext/cwtext-0.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.96.ebuild,v 1.5 2012/02/05 15:46:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cwtext/cwtext-0.96.ebuild,v 1.4 2011/12/15 11:20:41 ago Exp $
inherit eutils toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_unpack() {
diff --git a/app-text/ding/ding-1.7.ebuild b/app-text/ding/ding-1.7.ebuild
index 35f441e0ff37..3fd66ffdc13f 100644
--- a/app-text/ding/ding-1.7.ebuild
+++ b/app-text/ding/ding-1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ding/ding-1.7.ebuild,v 1.4 2011/12/27 21:12:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ding/ding-1.7.ebuild,v 1.3 2011/03/28 13:35:49 phajdan.jr Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND=">=dev-lang/tk-8.3"
diff --git a/app-text/djview/djview-4.7.ebuild b/app-text/djview/djview-4.7.ebuild
index a701504251b3..defa94c3d349 100644
--- a/app-text/djview/djview-4.7.ebuild
+++ b/app-text/djview/djview-4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.7 2012/01/16 18:42:15 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.6 2011/08/30 16:45:13 jer Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
IUSE="debug nsplugin"
RDEPEND="
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
index 74c3d1b9b382..204a12308b75 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild,v 1.7 2012/02/02 16:15:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild,v 1.6 2011/12/04 17:09:54 hwoarang Exp $
DESCRIPTION="XSL Stylesheets for Docbook"
HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/docbook/docbook-xsl-ns-${PV}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.4"
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
index 1c71f8365559..c81d130c24de 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.7 2012/02/02 16:14:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.6 2011/12/04 17:09:34 hwoarang Exp $
DESCRIPTION="XSL Stylesheets for Docbook"
HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/docbook/docbook-xsl-${PV}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.1"
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
index 86b3e92b5338..7dc27a2fd164 100644
--- a/app-text/docx2txt/Manifest
+++ b/app-text/docx2txt/Manifest
@@ -1,3 +1,2 @@
DIST docx2txt-1.0.tgz 24795 RMD160 fe7743b0d5fd2a9c6394f694ae271591e6c3bdfd SHA1 109ec659769089779c352cb28a89cf400840791c SHA256 f48f69736fa73059d9dde1f2f518c9affa8174515f106ddb39d6a45e2fa233db
DIST docx2txt-1.1.tgz 25391 RMD160 a15b5f6bf8b973f92ffac2bf9dddb127d4452273 SHA1 56af3989d22521fda9ea0c75b775eb296ea0948c SHA256 4e1ec50b47b5e5764a9fc47721eab3caa79e08c1377736eae71c064a450ed242
-DIST docx2txt-1.2.tgz 28483 RMD160 47f551dc8671582999262b8c858a26a34d82eddf SHA1 3e1ed8a63f0c6ec05009720b7109f23cb7afe55c SHA256 33649d1e8c4f86df897d478376cf76bd9f2aed27a952aaa96c615bce976488cf
diff --git a/app-text/docx2txt/docx2txt-1.2.ebuild b/app-text/docx2txt/docx2txt-1.2.ebuild
deleted file mode 100644
index 87d4b61bf7bf..000000000000
--- a/app-text/docx2txt/docx2txt-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docx2txt/docx2txt-1.2.ebuild,v 1.1 2012/01/15 02:53:43 radhermit Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Convert MS Office docx files to plain text"
-HOMEPAGE="http://docx2txt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/unzip
- dev-lang/perl"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
-}
-
-src_compile() { :; }
-
-src_install() {
- newbin docx2txt.pl docx2txt
- dodoc docx2txt.config README ChangeLog ToDo AUTHORS
-}
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 89546bbd1952..7e1af53a8103 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,3 @@
DIST dos2unix-5.2.1.tar.gz 52877 RMD160 0bcce6e16dd94fa85a6cbcb44dc72d5c30db062a SHA1 79e1dbb3753e029d2a5b0d65f3f512d09cbc6f79 SHA256 a0f39f8e7a4f45b55b96c70e452d1c4ae5afbd872a867b7c097cf91bc7e82199
DIST dos2unix-5.3.1.tar.gz 54967 RMD160 2d97a1e57adcc6f2a2d237615f5963a4d4725fcf SHA1 df924653efb1f97f90c1017cb99d66b5e07ffc13 SHA256 21322fd3ab3a542c36ea72072251610b3075ca2ebca7d1500f8e4810f9e0982f
-DIST dos2unix-5.3.2.tar.gz 56719 RMD160 15440229c1a0cf6ff03bedb2066e0cc48f7f2b28 SHA1 0df5fb5fae7758809105a1e6faf454e58d2af681 SHA256 2473f87b20bc9c6827ce2b3be376586d496c28dce35adb676a2129e82acb1c74
+DIST dos2unix-5.3.tar.gz 62325 RMD160 ab963cda802474b0519e18f6f6db10cc350c4bda SHA1 c12d59761ebd7c82f79672ce99465dd924a66628 SHA256 9ac403a207c938e86d9387b82aaf41c27f7e158acbce15a81cddab2cf030c235
diff --git a/app-text/dos2unix/dos2unix-5.3.1.ebuild b/app-text/dos2unix/dos2unix-5.3.1.ebuild
index eb76570dd692..ed55ab23f851 100644
--- a/app-text/dos2unix/dos2unix-5.3.1.ebuild
+++ b/app-text/dos2unix/dos2unix-5.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild,v 1.7 2012/02/05 17:41:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.1.ebuild,v 1.1 2011/08/09 22:12:39 polynomial-c Exp $
-EAPI=4
+EAPI="3"
inherit eutils toolchain-funcs
@@ -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="
@@ -26,8 +26,6 @@ DEPEND="
dev-lang/perl"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-5.3.1-fix_debug_build.patch
-
sed \
-e '/^LDFLAGS/s|=|+=|' \
-e '/^CC/s|=|?=|' \
@@ -46,10 +44,12 @@ lintl() {
src_compile() {
emake prefix="${EPREFIX}/usr" \
- $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
+ $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=") \
+ || die
}
src_install() {
emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- $(use nls || echo "ENABLE_NLS=") install
+ $(use nls || echo "ENABLE_NLS=") install \
+ || die "emake install failed"
}
diff --git a/app-text/dos2unix/dos2unix-5.3.2.ebuild b/app-text/dos2unix/dos2unix-5.3.2.ebuild
deleted file mode 100644
index 65ba7251fc1f..000000000000
--- a/app-text/dos2unix/dos2unix-5.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-5.3.2.ebuild,v 1.1 2012/01/31 06:17:38 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
- http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
- mirror://sourceforge/${PN}/${P}.tar.gz"
-
-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"
-IUSE="debug nls"
-
-RDEPEND="
- !app-text/hd2u
- !app-text/unix2dos
- virtual/libintl"
-DEPEND="
- ${RDEPEND}
- dev-lang/perl"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-5.3.2-fix_debug_build.patch
-
- sed \
- -e '/^LDFLAGS/s|=|+=|' \
- -e '/^CC/s|=|?=|' \
- -e '/CFLAGS_OS \+=/d' \
- -e '/LDFLAGS_EXTRA \+=/d' \
- -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
- -i "${S}"/Makefile || die
- tc-export CC
- use debug && sed "/DEBUG/s:0:1:g" -i Makefile
-}
-
-lintl() {
- # same logic as from virtual/libintl
- use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
- emake prefix="${EPREFIX}/usr" \
- $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- $(use nls || echo "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-5.3.ebuild b/app-text/dos2unix/dos2unix-5.3.ebuild
new file mode 100644
index 000000000000..b29e42b86bcf
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-5.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.3.ebuild,v 1.1 2011/04/26 23:10:48 polynomial-c Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+ http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+ mirror://sourceforge/${PN}/${P}.tar.gz"
+
+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"
+IUSE="debug nls"
+
+RDEPEND="
+ !app-text/hd2u
+ !app-text/unix2dos
+ virtual/libintl"
+DEPEND="
+ ${RDEPEND}
+ dev-lang/perl"
+
+src_prepare() {
+ sed \
+ -e '/^LDFLAGS/s|=|+=|' \
+ -e '/^CC/s|=|?=|' \
+ -e '/CFLAGS_OS \+=/d' \
+ -e '/LDFLAGS_EXTRA \+=/d' \
+ -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+ -i "${S}"/Makefile || die
+ tc-export CC
+ use debug && sed "/DEBUG/s:0:1:g" -i Makefile
+}
+
+lintl() {
+ # same logic as from virtual/libintl
+ use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
+}
+
+src_compile() {
+ emake prefix="${EPREFIX}/usr" \
+ $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=") \
+ || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ $(use nls || echo "ENABLE_NLS=") install \
+ || die "emake install failed"
+}
diff --git a/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch b/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch
deleted file mode 100644
index 32e3caa66a24..000000000000
--- a/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- dos2unix-5.3.1/dos2unix.c
-+++ dos2unix-5.3.1/dos2unix.c
-@@ -60,8 +60,6 @@
- */
-
-
--#define VER_AUTHOR "Erwin Waterlander"
--
- /* #define DEBUG 1 */
-
- #include "common.h"
---- dos2unix-5.3.1/Makefile
-+++ dos2unix-5.3.1/Makefile
-@@ -194,9 +194,14 @@
-
- EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
- -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-+ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \
- -DDEBUG=$(DEBUG) \
- $(CFLAGS_OS)
-
-+ifeq ($(DEBUG), 1)
-+ EXTRA_CFLAGS += -g
-+endif
-+
- ifdef STATIC
- EXTRA_CFLAGS += -static
- endif
---- dos2unix-5.3.1/unix2dos.c
-+++ dos2unix-5.3.1/unix2dos.c
-@@ -50,8 +50,6 @@
- */
-
-
--#define VER_AUTHOR "Erwin Waterlander"
--
- /* #define DEBUG 1 */
-
- #include "common.h"
---- dos2unix-5.3.1/version.mk
-+++ dos2unix-5.3.1/version.mk
-@@ -1,3 +1,4 @@
- DOS2UNIX_VERSION = 5.3.1
- DOS2UNIX_VERSION_SHORT = 531
- DOS2UNIX_DATE = 2011-08-09
-+DOS2UNIX_AUTHOR = 'Erwin Waterlander'
diff --git a/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch b/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch
deleted file mode 100644
index 123bfcc62c2e..000000000000
--- a/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile (revision 349)
-+++ Makefile (working copy)
-@@ -204,9 +204,14 @@
-
- EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
- -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-+ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \
- -DDEBUG=$(DEBUG) \
- $(CFLAGS_OS)
-
-+ifeq ($(DEBUG), 1)
-+ EXTRA_CFLAGS += -g
-+endif
-+
- ifdef STATIC
- EXTRA_CFLAGS += -static
- endif
-Index: dos2unix.c
-===================================================================
---- dos2unix.c (revision 347)
-+++ dos2unix.c (working copy)
-@@ -60,8 +60,6 @@
- */
-
-
--#define VER_AUTHOR "Erwin Waterlander"
--
- /* #define DEBUG 1 */
-
- #include "common.h"
-Index: unix2dos.c
-===================================================================
---- unix2dos.c (revision 347)
-+++ unix2dos.c (working copy)
-@@ -50,8 +50,6 @@
- */
-
-
--#define VER_AUTHOR "Erwin Waterlander"
--
- /* #define DEBUG 1 */
-
- #include "common.h"
-Index: version.mk
-===================================================================
---- version.mk (revision 347)
-+++ version.mk (working copy)
-@@ -1,3 +1,4 @@
- DOS2UNIX_VERSION = 5.3.2
- DOS2UNIX_VERSION_SHORT = 532
- DOS2UNIX_DATE = 2012-01-27
-+DOS2UNIX_AUTHOR = 'Erwin Waterlander'
diff --git a/app-text/dvipdfmx/dvipdfmx-20110311.ebuild b/app-text/dvipdfmx/dvipdfmx-20110311.ebuild
index 02f15c2766e6..cf12a02b52e3 100644
--- a/app-text/dvipdfmx/dvipdfmx-20110311.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20110311.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20110311.ebuild,v 1.6 2012/02/01 10:17:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20110311.ebuild,v 1.3 2011/10/05 23:26:17 aballier Exp $
EAPI=2
inherit autotools eutils texlive-common
@@ -11,11 +11,11 @@ SRC_URI="http://project.ktug.or.kr/${PN}/snapshot/latest/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND="app-text/libpaper
- >=media-libs/libpng-1.2:0
+ media-libs/libpng
sys-libs/zlib
virtual/tex-base
app-text/libpaper"
diff --git a/app-text/dvipng/dvipng-1.14.ebuild b/app-text/dvipng/dvipng-1.14.ebuild
index e82e50d5c845..fc85d842ef6c 100644
--- a/app-text/dvipng/dvipng-1.14.ebuild
+++ b/app-text/dvipng/dvipng-1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.14.ebuild,v 1.9 2012/01/31 14:45:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.14.ebuild,v 1.4 2011/10/05 19:25:23 aballier Exp $
EAPI="2"
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="t1lib truetype test"
RDEPEND="media-libs/gd[jpeg,png]
diff --git a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
index 1bb2a80b1891..796b7d7bf12a 100644
--- a/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
+++ b/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.5 2012/01/29 17:01:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.991_p20110705-r1.ebuild,v 1.1 2011/11/02 21:15:53 aballier Exp $
EAPI=3
@@ -29,7 +29,7 @@ SRC_URI="${SRC_URI} ) "
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 4eb74d77d6c4..dd2ca16819ac 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,3 +1,2 @@
-DIST dvisvgm-1.0.10.tar.gz 572581 RMD160 3f149ccea2298ab179f3d18d23570e4b8d5085f4 SHA1 ffab1e2d7db55674e393950e35a64b450656a6c3 SHA256 54e2cb38c73b5909fcde3dc2e4494d4292307d757db9e9711b4b751da0bc89b1
DIST dvisvgm-1.0.8.tar.gz 569140 RMD160 2c90e25f0967d4a11b52c9669a3c9ac6eb6e98c1 SHA1 e92093d5884e0681ab551f96679a3302aed8edad SHA256 0ebf70d53d10dddca1efa402e7b52c63e1e4250e0a1e74aa5d04224da40f5700
DIST dvisvgm-1.0.9.tar.gz 568673 RMD160 771e1e83388d6fba0a6aadfe26f29c5e2b7e53b3 SHA1 68d76b205b30b2648dc9602c2d7f656d688e7e86 SHA256 c236fa8a0f2a6c6e351ad8beebd6309ad01bd19302c6bf59a86680a5dec75b7e
diff --git a/app-text/dvisvgm/dvisvgm-1.0.10.ebuild b/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
deleted file mode 100644
index 67d49a70426b..000000000000
--- a/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.10.ebuild,v 1.2 2012/01/12 22:10:10 maekke Exp $
-
-EAPI=4
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="http://dvisvgm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
- app-text/ghostscript-gpl
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- test? ( dev-cpp/gtest )"
diff --git a/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild b/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
index e951d2110823..0cfae77e5faf 100644
--- a/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.4 2012/01/12 22:10:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.3 2011/12/09 12:52:53 naota Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
diff --git a/app-text/enscript/enscript-1.6.5.2-r1.ebuild b/app-text/enscript/enscript-1.6.5.2-r1.ebuild
index 50d5d1f60ee8..2dc945226a56 100644
--- a/app-text/enscript/enscript-1.6.5.2-r1.ebuild
+++ b/app-text/enscript/enscript-1.6.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.3 2011/12/21 08:35:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.2 2011/12/16 10:40:13 ago Exp $
EAPI="2"
@@ -10,7 +10,7 @@ DESCRIPTION="powerful text-to-postscript converter"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
SLOT="0"
LICENSE="GPL-3"
IUSE="nls ruby"
diff --git a/app-text/epdfview/Manifest b/app-text/epdfview/Manifest
index 0bca73f8d0d5..5a44217019dd 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -1,2 +1,3 @@
DIST epdfview-0.1.6.tar.bz2 406037 RMD160 69484cd68c1d344dfc38d321abd1e07fd22521e3 SHA1 1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e SHA256 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
+DIST epdfview-0.1.7.tar.bz2 443609 RMD160 485399d1982a3f8128322ee7e13d46225573bae3 SHA1 ff46942c285b8e2c28766a38cdfce1a018b4a015 SHA256 0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
DIST epdfview-0.1.8.tar.bz2 466270 RMD160 f9444fe278863fdbb545543957a8777e1129ffed SHA1 72da8958f58cf7ec55b55541f2e67895b402df3f SHA256 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
diff --git a/app-text/epdfview/epdfview-0.1.7-r2.ebuild b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
new file mode 100644
index 000000000000..88c1d052ad4c
--- /dev/null
+++ b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.4 2011/08/07 12:54:30 billie Exp $
+
+EAPI=2
+inherit autotools eutils gnome2
+
+DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
+HOMEPAGE="http://trac.emma-soft.com/epdfview/"
+SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cups nls test"
+
+RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
+ >=x11-libs/gtk+-2.6:2
+ cups? ( >=net-print/cups-1.1 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/cppunit )
+ userland_GNU? ( >=sys-apps/findutils-4.4 )"
+
+pkg_setup() {
+ G2CONF="--disable-dependency-tracking
+ $(use_enable nls)
+ $(use_with cups)"
+
+ DOCS="AUTHORS NEWS README THANKS"
+}
+
+src_prepare() {
+ sed -i \
+ -e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
+ data/epdfview.desktop || die
+
+ epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch \
+ "${FILESDIR}"/${P}-poppler-changeset_r35{4,7}.patch
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+
+ local res
+ for res in 24 32 48; do
+ insinto /usr/share/icons/hicolor/${res}x${res}/apps
+ newins data/icon_epdfview-${res}.png epdfview.png || die
+ done
+}
diff --git a/app-text/epdfview/epdfview-0.1.8-r1.ebuild b/app-text/epdfview/epdfview-0.1.8-r1.ebuild
deleted file mode 100644
index 9c76a5089ae2..000000000000
--- a/app-text/epdfview/epdfview-0.1.8-r1.ebuild
+++ /dev/null
@@ -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/app-text/epdfview/epdfview-0.1.8-r1.ebuild,v 1.2 2012/01/28 14:52:58 lxnay Exp $
-
-EAPI=4
-inherit eutils fdo-mime
-
-DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
-HOMEPAGE="http://trac.emma-soft.com/epdfview/"
-SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups nls test"
-
-RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
- >=x11-libs/pango-1.28.4
- >=x11-libs/gtk+-2.6:2
- cups? ( >=net-print/cups-1.1 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-util/cppunit )
- userland_GNU? ( >=sys-apps/findutils-4.4 )"
-
-RESTRICT="test"
-
-src_prepare() {
- sed -i \
- -e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
- data/epdfview.desktop || die
- epatch "${FILESDIR}/${P}-swap-blue-red-channels.patch"
-}
-
-src_configure() {
- econf $(use_with cups) \
- $(use_enable nls)
-}
-
-src_install() {
- default
-
- local res
- for res in 24 32 48; do
- insinto /usr/share/icons/hicolor/${res}x${res}/apps
- newins data/icon_epdfview-${res}.png epdfview.png || die
- done
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/app-text/epdfview/epdfview-0.1.8.ebuild b/app-text/epdfview/epdfview-0.1.8.ebuild
index d426a70dc286..eb72d6cd6295 100644
--- a/app-text/epdfview/epdfview-0.1.8.ebuild
+++ b/app-text/epdfview/epdfview-0.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.7 2012/02/01 17:03:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.2 2011/08/07 17:04:16 billie Exp $
EAPI=4
inherit fdo-mime
@@ -11,7 +11,7 @@ SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="cups nls test"
RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
diff --git a/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
new file mode 100644
index 000000000000..8a41b975f001
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
@@ -0,0 +1,60 @@
+Index: /trunk/src/gtk/MainView.cxx
+===================================================================
+--- /trunk/src/gtk/MainView.cxx (revision 325)
++++ /trunk/src/gtk/MainView.cxx (revision 329)
+@@ -78,5 +78,5 @@
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+
+ #if defined (HAVE_CUPS)
+@@ -1480,5 +1480,5 @@
+ }
+
+-void
++gboolean
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+@@ -1487,10 +1487,17 @@
+ MainPter *pter = (MainPter *)data;
+ // Only zoom when the CTRL-Button is down...
+- if ( !(event->state & GDK_CONTROL_MASK) ) return;
+- if ( event->direction == GDK_SCROLL_UP ) {
+- pter->zoomInActivated ();
+- } else if ( event->direction == GDK_SCROLL_DOWN ) {
+- pter->zoomOutActivated ();
+- }
+-}
+-
++ if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
++ {
++ if ( event->direction == GDK_SCROLL_UP )
++ {
++ pter->zoomInActivated ();
++ }
++ else if ( event->direction == GDK_SCROLL_DOWN )
++ {
++ pter->zoomOutActivated ();
++ }
++ return TRUE;
++ }
++ return FALSE;
++}
++
+Index: /trunk/src/gtk/PageView.cxx
+===================================================================
+--- /trunk/src/gtk/PageView.cxx (revision 325)
++++ /trunk/src/gtk/PageView.cxx (revision 329)
+@@ -528,11 +528,4 @@
+ g_assert ( NULL != data && "The data parameter is NULL.");
+
+- // don't scroll when the CRTL-Button is down, because then the page should
+- // actually be zoomed and not scrolled. Zooming is handelt by the MainView
+- // class.
+- if ( event->state & GDK_CONTROL_MASK )
+- {
+- return FALSE;
+- }
+ PagePter *pter = (PagePter *)data;
+ GtkAdjustment *adjustment =
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
new file mode 100644
index 000000000000..a2d42b964599
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
@@ -0,0 +1,58 @@
+Index: /trunk/src/PDFDocument.cxx
+===================================================================
+--- /trunk/src/PDFDocument.cxx (revision 351)
++++ /trunk/src/PDFDocument.cxx (revision 354)
+@@ -682,4 +682,10 @@
+ poppler_page_get_size(page, &pageWidth, &pageHeight);
+
++#if defined (HAVE_POPPLER_0_15_0)
++ PopplerRectangle textRect = { rect->getX1() / getZoom(),
++ rect->getY1() / getZoom(),
++ rect->getX2() / getZoom(),
++ rect->getY2() / getZoom()};
++#else // !HAVE_POPPLER_0_15_0
+ //for get text we must exchange y coordinate, don't ask me where logic here.
+ PopplerRectangle textRect = { rect->getX1() / getZoom(),
+@@ -687,7 +693,11 @@
+ rect->getX2() / getZoom(),
+ (pageHeight - rect->getY1() / getZoom())};
++#endif // HAVE_POPPLER_0_15_0
+ repairEmpty(textRect);
+
+-#if defined (HAVE_POPPLER_0_6_0)
++#if defined (HAVE_POPPLER_0_15_0)
++ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
++ &textRect);
++#elif defined (HAVE_POPPLER_0_6_0)
+ gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
+ &textRect);
+Index: /trunk/configure.ac
+===================================================================
+--- /trunk/configure.ac (revision 344)
++++ /trunk/configure.ac (revision 354)
+@@ -42,15 +42,19 @@
+ AC_SUBST([POPPLER_LIBS])
+ dnl Check if we have poppler version 0.5.2 or higher.
+-PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
+-if test "x$have_poppler_052" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
++if test "x$have_poppler_0_5_2" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
+ fi
+-PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
+-if test "x$have_poppler_060" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
++if test "x$have_poppler_0_6_0" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
+ fi
+-PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
+-if test "x$have_poppler_080" = "xyes"; then
++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
++if test "x$have_poppler_0_8_0" = "xyes"; then
+ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
++fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
++if test "x$have_poppler_0_15_0" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+ fi
+
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
new file mode 100644
index 000000000000..e6795ec14165
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
@@ -0,0 +1,93 @@
+Index: /trunk/src/IDocument.cxx
+===================================================================
+--- /trunk/src/IDocument.cxx (revision 338)
++++ /trunk/src/IDocument.cxx (revision 357)
+@@ -750,4 +750,8 @@
+ IDocument::getLinearized ()
+ {
++#if defined (HAVE_POPPLER_0_15_1)
++ if ( m_Linearized ) return "Yes";
++ else return "No";
++#else
+ if ( NULL == m_Linearized )
+ {
+@@ -755,4 +759,5 @@
+ }
+ return m_Linearized;
++#endif
+ }
+
+@@ -763,6 +768,13 @@
+ /// otherwise. IDocument will free it.
+ ///
+-void
+-IDocument::setLinearized (gchar *linearized)
++#if defined (HAVE_POPPLER_0_15_1)
++void
++IDocument::setLinearized (gboolean *linearized)
++{
++ m_Linearized = linearized;
++}
++#else
++void
++ IDocument::setLinearized (gchar *linearized)
+ {
+ g_free (m_Linearized);
+@@ -770,4 +782,5 @@
+ g_free (linearized);
+ }
++#endif
+
+ ///
+Index: /trunk/src/PDFDocument.cxx
+===================================================================
+--- /trunk/src/PDFDocument.cxx (revision 356)
++++ /trunk/src/PDFDocument.cxx (revision 357)
+@@ -328,5 +328,9 @@
+ gchar *keywords = NULL;
+ PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
++#if defined (HAVE_POPPLER_0_15_1)
++ gboolean *linearized = NULL;
++#else
+ gchar *linearized = NULL;
++#endif
+ GTime modDate;
+ PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
+Index: /trunk/src/IDocument.h
+===================================================================
+--- /trunk/src/IDocument.h (revision 340)
++++ /trunk/src/IDocument.h (revision 357)
+@@ -307,5 +307,9 @@
+ void setFormat (gchar *format);
+ const gchar *getLinearized (void);
++#if defined (HAVE_POPPLER_0_15_1)
++ void setLinearized (gboolean *linearized);
++#else
+ void setLinearized (gchar *linearized);
++#endif
+ const gchar *getCreationDate (void);
+ void setCreationDate (gchar *date);
+@@ -383,5 +387,9 @@
+ gchar *m_Keywords;
+ /// Tells if the document is linearized or not.
++#if defined (HAVE_POPPLER_0_15_1)
++ gboolean *m_Linearized;
++#else
+ gchar *m_Linearized;
++#endif
+ /// The document's modification date and time.
+ gchar *m_ModifiedDate;
+Index: /trunk/configure.ac
+===================================================================
+--- /trunk/configure.ac (revision 354)
++++ /trunk/configure.ac (revision 357)
+@@ -58,4 +58,9 @@
+ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+ fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
++if test "x$have_poppler_0_15_1" = "xyes"; then
++ AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
++fi
++
+
+ AC_MSG_CHECKING([for native Win32])
diff --git a/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch b/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
deleted file mode 100644
index c57a5eff923a..000000000000
--- a/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: /trunk/src/PDFDocument.cxx
-===================================================================
---- /trunk/src/PDFDocument.cxx (revision 361)
-+++ /trunk/src/PDFDocument.cxx (revision 367)
-@@ -21,4 +21,5 @@
- #include
- #include
-+#include
- #include "epdfview.h"
-
-@@ -33,4 +34,22 @@
- static PageMode convertPageMode (gint pageMode);
- static gchar *getAbsoluteFileName (const gchar *fileName);
-+
-+namespace
-+{
-+ void
-+ convert_bgra_to_rgba (guint8 *data, int width, int height)
-+ {
-+ using std::swap;
-+
-+ for (int y = 0; y < height; y++)
-+ {
-+ for (int x = 0; x < width; x++)
-+ {
-+ swap(data[0], data[2]);
-+ data += 4;
-+ }
-+ }
-+ }
-+}
-
- ///
-@@ -651,4 +670,5 @@
- cairo_destroy(context);
- cairo_surface_destroy (surface);
-+ convert_bgra_to_rgba(renderedPage->getData (), width, height);
- #else // !HAVE_POPPLER_0_17_0
- // Create the pixbuf from the data and render to it.
diff --git a/app-text/evince/evince-2.32.0-r4.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild
index 17f7a352c069..fae710548d16 100644
--- a/app-text/evince/evince-2.32.0-r4.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.3 2012/01/30 11:33:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.2 2011/12/17 16:29:29 mr_bones_ Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="dbus debug djvu dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
+IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
# not mature enough
@@ -48,7 +48,8 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
sys-devel/gettext
>=dev-util/intltool-0.35
- >=dev-util/gtk-doc-am-1.13"
+ >=dev-util/gtk-doc-am-1.13
+ doc? ( >=dev-util/gtk-doc-1.13 )"
ELTCONF="--portage"
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index 4d519dc540ec..fbccd47f80a7 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,2 +1,3 @@
DIST flpsed-0.5.1.tar.gz 100647 RMD160 b31b7f6a9655c9df367d5f777917059d24f86b72 SHA1 b2a99b8dbcf8483e047051055ad0b5a101b75383 SHA256 7ab9d72f50e6b42fa09dd0ae3ade315b8fb8f8dc2c479aef3ad005d03a973a2d
+DIST flpsed-0.6.1.tar.gz 102349 RMD160 9a59aa94f14d61d87de88e0f2c741c5063af6667 SHA1 bccf832a0275e3a6905531f2eacb90fb64c5835f SHA256 f5ff37f8d87ccdcd8c019047c84a29bc38eec78883feccf60f8fd892616def01
DIST flpsed-0.7.0.tar.gz 119159 RMD160 912122b0be1c7a60ff9270cde55535287f1c2097 SHA1 7966fd3b6fb3aa2a376386533ed4421ebb66ad62 SHA256 aedb5c96dfdcbe260d133f9b674a98d9948a1614d76ce623acb57503f2850b38
diff --git a/app-text/flpsed/flpsed-0.6.1.ebuild b/app-text/flpsed/flpsed-0.6.1.ebuild
new file mode 100644
index 000000000000..6d18e4eb8928
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.6.1.ebuild,v 1.3 2010/06/12 16:52:40 aballier Exp $
+
+EAPI=2
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://www.ecademix.com/JohannesHofmann/"
+SRC_URI="http://www.ecademix.com/JohannesHofmann/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/fltk:2
+ app-text/ghostscript-gpl[X]"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+ dodoc README ChangeLog NEWS AUTHORS
+}
diff --git a/app-text/flpsed/flpsed-0.7.0.ebuild b/app-text/flpsed/flpsed-0.7.0.ebuild
index e26fdc239f0f..6d4ed4f5ec31 100644
--- a/app-text/flpsed/flpsed-0.7.0.ebuild
+++ b/app-text/flpsed/flpsed-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.7.0.ebuild,v 1.3 2012/02/05 09:59:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/flpsed/flpsed-0.7.0.ebuild,v 1.2 2011/10/03 03:18:22 radhermit Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://www.ecademix.com/JohannesHofmann/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/app-text/focuswriter/Manifest b/app-text/focuswriter/Manifest
index 9c6b5bda3fc2..48c4cbcd7a4b 100644
--- a/app-text/focuswriter/Manifest
+++ b/app-text/focuswriter/Manifest
@@ -1,3 +1,2 @@
DIST focuswriter-1.2.0-src.tar.bz2 512716 RMD160 402bbce285ccb71a7a701180792b70a8b5c6e097 SHA1 0ce703100f358b2e5876249d973d2d06c67323f4 SHA256 d0ef02b0d9469e9940cc2f1ca76b368a396024f4a8ff0cbe2907766acda6dc6d
DIST focuswriter-1.3.3-src.tar.bz2 7351725 RMD160 48dd4e66f868c4244e83bd283aaa993288d7e82c SHA1 5a75863032b449ab2bf25e8d76e809d7beeaddb8 SHA256 38b14f89dff0d4650437b4a56b7c347eedb028e433f6e5f8c021518e0362d2b5
-DIST focuswriter-1.3.5.2-src.tar.bz2 11387235 RMD160 130c1d8989845c261485cace97c73c1d35199d2e SHA1 19d80e1f1d9ba9ad4f86ddfa14416b41f8cb0817 SHA256 fa452056d219643e52826d5f09cf8e58aeeb38929a14cbc1ec9dab9c58f197db
diff --git a/app-text/focuswriter/focuswriter-1.3.5.2.ebuild b/app-text/focuswriter/focuswriter-1.3.5.2.ebuild
deleted file mode 100644
index 821270ceca4e..000000000000
--- a/app-text/focuswriter/focuswriter-1.3.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/focuswriter/focuswriter-1.3.5.2.ebuild,v 1.2 2012/01/19 11:45:17 ssuominen Exp $
-
-EAPI=4
-
-#does nothing useful, LANGS="cs de el en es_MX es fi fr hu it nl pl pt_BR pt ru sv uk"
-inherit qt4-r2
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="http://gottcode.org/focuswriter/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- app-text/hunspell
- dev-libs/libzip
- x11-libs/qt-gui:4
- media-libs/sdl-mixer[wav]
- "
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- sed -i -e '/PREFIX/s:/usr/local:/usr:' ${PN}.pro || die
- qt4-r2_src_prepare
-}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 95ee70a97613..cc2669d929dc 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,3 @@
DIST ghostscript-9.04.tar.bz2 29869900 RMD160 916bcacac247241fcf6ba02e90dc7e28040ba65e SHA1 df9c9e1924038da071d0ffbaddf42a75ecbc1e83 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4
DIST ghostscript-gpl-9.04-patchset-3.tar.bz2 7760 RMD160 43a38afd1e8de506db70a58d0fa3168dba3c3a6e SHA1 03b27dad2e4cbec045f2264885bf366526e2db00 SHA256 b3c20adc111b8ddf3bc7d60a01fa1b31eadb9d6d9eb8ac474d9aa1604bd51b6f
-DIST ghostscript-gpl-9.04-patchset-4.tar.bz2 10850 RMD160 6e5b7bfd791c075bed15efa5255fbcf943d07837 SHA1 a0688d44141f5a3b174ebf4773f967c48919bbfe SHA256 7e0e89b7f87fc6b5f082a073115d36a7d5632ddbb91fa01d5beea15689800441
DIST gsdjvu-1.5.tar.gz 207583 RMD160 010be2cd791d5e2814c1f6554150bfd7c34222c0 SHA1 c7d0677dae5fe644cf3d714c04b3c2c343906342 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild
index 610cb3fea721..f03170fbfa6b 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild,v 1.5 2012/01/14 22:43:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild,v 1.4 2011/11/12 10:23:33 jlec Exp $
EAPI=3
@@ -48,10 +48,7 @@ RDEPEND="${COMMON_DEPEND}
linguas_ja? ( media-fonts/kochi-substitute )
linguas_ko? ( media-fonts/baekmuk-fonts )
linguas_zh_CN? ( media-fonts/arphicfonts )
- linguas_zh_TW? ( media-fonts/arphicfonts )
- !!media-fonts/gnu-gs-fonts-std
- !!media-fonts/gnu-gs-fonts-other
-"
+ linguas_zh_TW? ( media-fonts/arphicfonts )"
S="${WORKDIR}/${MY_P}"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild
deleted file mode 100644
index 2918cabbd197..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild,v 1.2 2012/01/14 22:43:33 dilfridge Exp $
-
-EAPI=3
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
- mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
- mirror://gentoo/${P}-patchset-4.tar.bz2
- !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
-
-COMMON_DEPEND="
- app-text/libpaper
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:0
- media-libs/libpng:0
- media-libs/tiff:0
- >=sys-libs/zlib-1.2.3
- virtual/jpeg
- !bindist? ( djvu? ( app-text/djvu ) )
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( x11-libs/gtk+:2 )
- idn? ( net-dns/libidn )
- jpeg2k? ( media-libs/jasper )
- X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
- >=app-text/poppler-data-0.4.4
- >=media-fonts/urw-fonts-2.4.9
- linguas_ja? ( media-fonts/kochi-substitute )
- linguas_ko? ( media-fonts/baekmuk-fonts )
- linguas_zh_CN? ( media-fonts/arphicfonts )
- linguas_zh_TW? ( media-fonts/arphicfonts )
- !!media-fonts/gnu-gs-fonts-std
- !!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
- if use bindist && use djvu; then
- ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
- ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
- fi
-}
-
-src_prepare() {
- # remove internal copies of various libraries
- rm -rf "${S}"/expat
- rm -rf "${S}"/freetype
- rm -rf "${S}"/jasper
- rm -rf "${S}"/jpeg
- rm -rf "${S}"/lcms{,2}
- rm -rf "${S}"/libpng
- rm -rf "${S}"/tiff
- rm -rf "${S}"/zlib
- # remove internal urw-fonts
- rm -rf "${S}"/Resource/Font
- # remove internal CMaps (CMaps from poppler-data are used instead)
- rm -rf "${S}"/Resource/CMap
-
- # apply various patches, many borrowed from Fedora
- # http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
- EPATCH_SOURCE="${WORKDIR}/patches/"
- epatch
-
- if ! use bindist && use djvu ; then
- unpack gsdjvu-${GSDJVU_PV}.tar.gz
- cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
- cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
- epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
- cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
- cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu"
- grep -q djvusep "${S}/base/contrib.mak" || \
- cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
- # install ps2utf8.ps, bug #197818
- sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
- || die "sed failed"
- fi
-
- if ! use gtk ; then
- sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
- sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
- fi
-
- # search path fix
- sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
- -e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
- -e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
- -e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
- -e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
- base/Makefile.in base/*.mak || die "sed failed"
-
- cd "${S}"
- eautoreconf
-
- cd "${S}/ijs"
- eautoreconf
-}
-
-src_configure() {
- local FONTPATH
- for path in \
- /usr/share/fonts/urw-fonts \
- /usr/share/fonts/Type1 \
- /usr/share/fonts \
- /usr/share/poppler/cMap/Adobe-CNS1 \
- /usr/share/poppler/cMap/Adobe-GB1 \
- /usr/share/poppler/cMap/Adobe-Japan1 \
- /usr/share/poppler/cMap/Adobe-Japan2 \
- /usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}$path"
- done
-
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- --disable-compile-inits \
- --with-drivers=ALL \
- --with-fontpath="$FONTPATH" \
- --with-ijs \
- --with-jbig2dec \
- --with-libpaper \
- --with-system-libtiff \
- --without-luratech \
- $(use_enable cups) \
- $(use_enable dbus) \
- $(use_enable gtk) \
- $(use_with cups install-cups) \
- $(use_with cups pdftoraster) \
- $(use_with idn libidn) \
- $(use_with jpeg2k jasper) \
- $(use_with X x)
-
- if ! use bindist && use djvu ; then
- sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
- fi
-
- cd "${S}/ijs"
- econf \
- --enable-shared \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake -j1 so all || die "emake failed"
-
- cd "${S}/ijs"
- emake || die "ijs emake failed"
-}
-
-src_install() {
- # -j1 -> see bug #356303
- emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
- # some printer drivers still require pstoraster, bug #383831
- use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-
- if ! use bindist && use djvu ; then
- dobin gsdjvu || die "dobin gsdjvu install failed"
- fi
-
- # remove gsc in favor of gambit, bug #253064
- rm -rf "${D}/usr/bin/gsc"
-
- rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
- dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
-
- cd "${S}/ijs"
- emake DESTDIR="${D}" install || die "emake ijs install failed"
-
- # rename the original cidfmap to cidfmap.GS
- mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
- # install our own cidfmap to handle CJK fonts
- insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
- doins "${WORKDIR}/fontmaps/CIDFnmap" || die "doins CIDFnmap failed"
- doins "${WORKDIR}/fontmaps/cidfmap" || die "doins cidfmap failed"
- for X in ${LANGS} ; do
- if use linguas_${X} ; then
- doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
- fi
- done
-
- use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild
deleted file mode 100644
index 951bdb628938..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild,v 1.1 2012/02/01 21:15:56 dilfridge Exp $
-
-EAPI=3
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
- mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
- mirror://gentoo/${P}-patchset-4.tar.bz2
- !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
-
-COMMON_DEPEND="
- app-text/libpaper
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/jbig2dec
- media-libs/lcms:0
- media-libs/libpng:0
- media-libs/tiff:0
- >=sys-libs/zlib-1.2.3
- virtual/jpeg
- !bindist? ( djvu? ( app-text/djvu ) )
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( x11-libs/gtk+:2 )
- idn? ( net-dns/libidn )
- jpeg2k? ( media-libs/jasper )
- X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
- >=app-text/poppler-data-0.4.4
- >=media-fonts/urw-fonts-2.4.9
- linguas_ja? ( media-fonts/kochi-substitute )
- linguas_ko? ( media-fonts/baekmuk-fonts )
- linguas_zh_CN? ( media-fonts/arphicfonts )
- linguas_zh_TW? ( media-fonts/arphicfonts )
- !!media-fonts/gnu-gs-fonts-std
- !!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
- if use bindist && use djvu; then
- ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
- ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
- fi
-}
-
-src_prepare() {
- # remove internal copies of various libraries
- rm -rf "${S}"/expat
- rm -rf "${S}"/freetype
- rm -rf "${S}"/jasper
- rm -rf "${S}"/jpeg
- rm -rf "${S}"/lcms{,2}
- rm -rf "${S}"/libpng
- rm -rf "${S}"/tiff
- rm -rf "${S}"/zlib
-
- rm -rf "${S}"/jbig2dec
- rm -f "${WORKDIR}"/patches/ghostscript-gpl-8.71-jbig2dec-nullderef.patch
-
- # remove internal urw-fonts
- rm -rf "${S}"/Resource/Font
- # remove internal CMaps (CMaps from poppler-data are used instead)
- rm -rf "${S}"/Resource/CMap
-
- # apply various patches, many borrowed from Fedora
- # http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
- EPATCH_SOURCE="${WORKDIR}/patches/"
- epatch
-
- if ! use bindist && use djvu ; then
- unpack gsdjvu-${GSDJVU_PV}.tar.gz
- cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
- cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
- epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
- cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
- cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu"
- grep -q djvusep "${S}/base/contrib.mak" || \
- cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
-
- # install ps2utf8.ps, bug #197818
- sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
- || die "sed failed"
- fi
-
- if ! use gtk ; then
- sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
- sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
- fi
-
- # search path fix
- sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
- -e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
- -e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
- -e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
- -e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
- base/Makefile.in base/*.mak || die "sed failed"
-
- cd "${S}"
- eautoreconf
-
- cd "${S}/ijs"
- eautoreconf
-}
-
-src_configure() {
- local FONTPATH
- for path in \
- /usr/share/fonts/urw-fonts \
- /usr/share/fonts/Type1 \
- /usr/share/fonts \
- /usr/share/poppler/cMap/Adobe-CNS1 \
- /usr/share/poppler/cMap/Adobe-GB1 \
- /usr/share/poppler/cMap/Adobe-Japan1 \
- /usr/share/poppler/cMap/Adobe-Japan2 \
- /usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}$path"
- done
-
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- --disable-compile-inits \
- --with-drivers=ALL \
- --with-fontpath="$FONTPATH" \
- --with-ijs \
- --with-jbig2dec \
- --with-libpaper \
- --with-system-libtiff \
- --without-luratech \
- $(use_enable cups) \
- $(use_enable dbus) \
- $(use_enable gtk) \
- $(use_with cups install-cups) \
- $(use_with cups pdftoraster) \
- $(use_with idn libidn) \
- $(use_with jpeg2k jasper) \
- $(use_with X x)
-
- if ! use bindist && use djvu ; then
- sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
- fi
-
- cd "${S}/ijs"
- econf \
- --enable-shared \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake -j1 so all || die "emake failed"
-
- cd "${S}/ijs"
- emake || die "ijs emake failed"
-}
-
-src_install() {
- # -j1 -> see bug #356303
- emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
- # some printer drivers still require pstoraster, bug #383831
- use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-
- if ! use bindist && use djvu ; then
- dobin gsdjvu || die "dobin gsdjvu install failed"
- fi
-
- # remove gsc in favor of gambit, bug #253064
- rm -rf "${D}/usr/bin/gsc"
-
- rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
- dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
-
- cd "${S}/ijs"
- emake DESTDIR="${D}" install || die "emake ijs install failed"
-
- # rename the original cidfmap to cidfmap.GS
- mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
- # install our own cidfmap to handle CJK fonts
- insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
- doins "${WORKDIR}/fontmaps/CIDFnmap" || die "doins CIDFnmap failed"
- doins "${WORKDIR}/fontmaps/cidfmap" || die "doins cidfmap failed"
- for X in ${LANGS} ; do
- if use linguas_${X} ; then
- doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
- fi
- done
-
- use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index 9961f1c9be86..d9a65fbc3eea 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,5 +1,4 @@
DIST Grutatxt-2.0.11.tar.gz 27845 RMD160 dc9cf9eaa9d2a12bd75069eed2561ddec87f4f3a SHA1 7b85e7098a342dc02fee9cb68048a950ec112d26 SHA256 4309a8ac76c3abf2611d67932a21daabe2e2958af71adeeb737953c0371eaab6
DIST Grutatxt-2.0.13.tar.gz 29885 RMD160 37dc4d77d3a6326b5f50b97579ca0c2bd5bf7e95 SHA1 9fb750a0bb2b394daabc8807903c94edabebd7a8 SHA256 9a9e8daeb30fadd8a761275f3d827e7efd252adf47eff9858529926bfb2e92dc
DIST Grutatxt-2.0.14.tar.gz 27001 RMD160 cff3f15004e7a903cf29c415a786f655ef57c3c6 SHA1 7033604105efcf6d949137a5c69edd317c8fed37 SHA256 983b85f2a180dcc46e609efbfa35e3277d287d7a0d0abadc67d48f5d26b86148
-DIST Grutatxt-2.0.16.tar.gz 29929 RMD160 5dcb00b0885b11462964fab23c5be0590ab8a429 SHA1 cb836ca1090bbeaa33e06b4b598b038a2197d6a5 SHA256 38c6c78e269ea8a6cbf384af812026216005d43f683e26c5bb1af47eb24d5960
DIST Grutatxt-2.0.5.tar.gz 22077 RMD160 1085b92f4994b3cb2be5be718178cb601f48c117 SHA1 b3c584f6b452e343d9e1c9693001ab88ce374236 SHA256 9937a9766a2f2a0d5d5b0246436446064490290063c28f4d2cceb0f615069504
diff --git a/app-text/grutatxt/grutatxt-2.0.16.ebuild b/app-text/grutatxt/grutatxt-2.0.16.ebuild
deleted file mode 100644
index 0bf725c60484..000000000000
--- a/app-text/grutatxt/grutatxt-2.0.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/grutatxt/grutatxt-2.0.16.ebuild,v 1.1 2012/01/21 06:15:05 radhermit Exp $
-
-EAPI=4
-
-inherit perl-app
-
-MY_PN="Grutatxt"
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A converter from plain text to HTML and other markup languages"
-HOMEPAGE="http://triptico.com/software/grutatxt.html"
-SRC_URI="http://www.triptico.com/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# set the script path to /usr/bin, rather than /usr/local/bin
-myconf="INSTALLSCRIPT=/usr/bin"
diff --git a/app-text/gsview/files/gsview-4.9-libdl.patch b/app-text/gsview/files/gsview-4.9-libdl.patch
deleted file mode 100644
index 1ffd74d8def4..000000000000
--- a/app-text/gsview/files/gsview-4.9-libdl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gsview-4.9.orig/srcunx/unx.mak gsview-4.9/srcunx/unx.mak
---- gsview-4.9.orig/srcunx/unx.mak 2004-11-27 16:51:26.000000000 +0100
-+++ gsview-4.9/srcunx/unx.mak 2012-01-31 00:36:50.000000000 +0100
-@@ -80,7 +80,7 @@
- CFLAGS=-O -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -fno-builtin -fno-common -Wcast-qual -Wwrite-strings $(CDEBUG) -DX11 -DUNIX -DNONAG $(RPM_OPT_FLAGS) `gtk-config --cflags` $(XINCLUDE) $(PFLAGS)
-
- # Linker flags
--LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs`
-+LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs` -ldl
-
- COMP=$(CC) $(CFLAGS) -I. -I$(SRCDIR) -I$(SRCUNXDIR) -I$(OBJDIR)
- CCAUX=$(CC) $(CFLAGS) -I$(SRCDIR)
diff --git a/app-text/gsview/gsview-4.9.ebuild b/app-text/gsview/gsview-4.9.ebuild
index 4c28390beab5..49b555d6d7fd 100644
--- a/app-text/gsview/gsview-4.9.ebuild
+++ b/app-text/gsview/gsview-4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.6 2012/02/06 19:49:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.3 2011/03/27 12:20:51 nirbheek Exp $
EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsv${MY_PV}src.zip"
IUSE="doc"
SLOT="0"
LICENSE="Aladdin"
-KEYWORDS="amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="x11-libs/gtk+:1
app-text/epstool
@@ -26,16 +26,15 @@ DEPEND="app-arch/unzip
src_prepare() {
epatch "${FILESDIR}"/${PV}-gentoo.patch
- epatch "${FILESDIR}"/${P}-libdl.patch
tc-export CC
}
src_compile() {
- ln -sf srcunx/unx.mak Makefile || die
+ ln -sf srcunx/unx.mak Makefile
## respect CFLAGS
- sed -i -e "s:^CFLAGS=-O :CFLAGS=${CFLAGS} :g" Makefile || die
- sed -i -e "s:GSVIEW_DOCPATH:\"${EPREFIX}/usr/share/doc/${PF}/html/\":" srcunx/gvx.c || die
+ sed -i -e "s:^CFLAGS=-O :CFLAGS=${CFLAGS} :g" Makefile
+ sed -i -e "s:GSVIEW_DOCPATH:\"${EPREFIX}/usr/share/doc/${PF}/html/\":" srcunx/gvx.c
## run Makefile
# bug #283165
@@ -43,20 +42,20 @@ src_compile() {
}
src_install() {
- dobin bin/gsview || die
+ dobin bin/gsview
- doman srcunx/gsview.1 || die
+ doman srcunx/gsview.1
- dodoc gsview.css cdorder.txt regorder.txt || die
+ dodoc gsview.css cdorder.txt regorder.txt
if use doc
then
- dobin "${FILESDIR}"/gsview-help || die
- dohtml *.htm bin/*.htm || die
+ dobin "${FILESDIR}"/gsview-help
+ dohtml *.htm bin/*.htm
fi
insinto /etc/gsview
- doins src/printer.ini || die
+ doins src/printer.ini
make_desktop_entry gsview Gsview "" "Office" ||
die "Couldn't make gsview desktop entry"
diff --git a/app-text/gtranslator/gtranslator-1.9.13.ebuild b/app-text/gtranslator/gtranslator-1.9.13.ebuild
index d74b7b5af9fb..540d822c46d3 100644
--- a/app-text/gtranslator/gtranslator-1.9.13.ebuild
+++ b/app-text/gtranslator/gtranslator-1.9.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.10 2011/12/18 17:35:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.9 2011/10/27 07:18:26 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://gtranslator.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE="doc http gnome spell"
RDEPEND="
diff --git a/app-text/gtranslator/gtranslator-2.90.7.ebuild b/app-text/gtranslator/gtranslator-2.90.7.ebuild
index 00a61cc7c1f0..cf1030f2b487 100644
--- a/app-text/gtranslator/gtranslator-2.90.7.ebuild
+++ b/app-text/gtranslator/gtranslator-2.90.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.7.ebuild,v 1.2 2012/01/01 00:20:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.7.ebuild,v 1.1 2011/10/27 07:18:26 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -65,7 +65,7 @@ src_prepare() {
gnome2_src_prepare
# disable pyc compiling
- echo '#!/bin/sh' > py-compile
+ ln -sfn $(type -P true) py-compile
if ! use gnome; then
# don't install charmap plugin, it requires gnome-extra/gucharmap
sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index e93a16412036..d08a00739f10 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,2 +1,2 @@
DIST gv-3.7.1.tar.gz 747166 RMD160 ddeef03ff83442379cd02d8ac4491a43c57eeddc SHA1 05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1 SHA256 da87e10a4f3c4e9209077eab019ec71ad1bcfc8f19146146207cef4ee5b88114
-DIST gv-3.7.3.tar.gz 754282 RMD160 d3e7f3137f0aff521a667606ea05507c0dfc5784 SHA1 75a3d90f0e2aa7542443a16122424159bda29713 SHA256 ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b
+DIST gv-3.7.2.tar.gz 753018 RMD160 89635afe684c3f4795f658f1b8210d53f03568c5 SHA1 d9573e17f5d88d150fccb257ce205dbceab83e8a SHA256 62c28de2ececf94728dee50e18ae3908366a39a5e293aef21c14e87e561e40b2
diff --git a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch b/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
deleted file mode 100644
index 76c88b158b27..000000000000
--- a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
-
-http://bugs.gentoo.org/399753
-
---- src/Scrollbar.c
-+++ src/Scrollbar.c
-@@ -1006,7 +1006,7 @@
- TOPLOC = newtop;
- SHOWNLENGTH = newbot-newtop+1;
-
-- (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
-+ (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
-
- ENDMESSAGE(Redisplay)
- }
diff --git a/app-text/gv/gv-3.7.1-r1.ebuild b/app-text/gv/gv-3.7.1-r1.ebuild
index 08227c093aa5..e2ffb2e3ec70 100644
--- a/app-text/gv/gv-3.7.1-r1.ebuild
+++ b/app-text/gv/gv-3.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1-r1.ebuild,v 1.8 2012/01/23 16:38:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1-r1.ebuild,v 1.7 2011/10/06 17:48:47 jer Exp $
EAPI=2
inherit autotools eutils
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
IUSE="xinerama"
-RDEPEND="x11-libs/libX11
+DEPEND="x11-libs/libX11
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
@@ -24,7 +24,6 @@ RDEPEND="x11-libs/libX11
x11-libs/libXaw3d
app-text/ghostscript-gpl
xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/gv-3.6.1-a0.patch
diff --git a/app-text/gv/gv-3.7.1.ebuild b/app-text/gv/gv-3.7.1.ebuild
new file mode 100644
index 000000000000..2a86c508fb2e
--- /dev/null
+++ b/app-text/gv/gv-3.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1.ebuild,v 1.7 2011/08/02 05:44:53 mattst88 Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="gv is used to view PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://www.gnu.org/software/gv/"
+SRC_URI="mirror://gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="xinerama"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXaw3d
+ app-text/ghostscript-gpl
+ xinerama? ( x11-libs/libXinerama )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/gv-3.6.1-a0.patch
+
+ if ! use xinerama; then
+ sed -i -e 's:Xinerama:dIsAbLe&:' configure.ac || die
+ fi
+
+ sed -i \
+ -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
+ src/Makefile.am || die #135354
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --enable-scrollbar-code
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README
+
+ doicon "${FILESDIR}"/gv_icon.xpm
+ make_desktop_entry gv GhostView gv_icon "Graphics;Viewer"
+}
diff --git a/app-text/gv/gv-3.7.2.ebuild b/app-text/gv/gv-3.7.2.ebuild
new file mode 100644
index 000000000000..a10bef2c74da
--- /dev/null
+++ b/app-text/gv/gv-3.7.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.2.ebuild,v 1.3 2011/08/02 05:44:53 mattst88 Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://www.gnu.org/software/gv/"
+SRC_URI="mirror://gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXaw3d
+ app-text/ghostscript-gpl
+ xinerama? ( x11-libs/libXinerama )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/gv-3.6.1-a0.patch
+
+ if ! use xinerama; then
+ sed -i -e 's:Xinerama:dIsAbLe&:' configure.ac || die
+ fi
+
+ sed -i \
+ -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" \
+ src/Makefile.am || die #135354
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --enable-scrollbar-code
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README
+
+ doicon "${FILESDIR}"/gv_icon.xpm
+ make_desktop_entry gv GhostView gv_icon "Graphics;Viewer"
+}
diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild
deleted file mode 100644
index 8ad9f7c3fd62..000000000000
--- a/app-text/gv/gv-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.3-r1.ebuild,v 1.4 2012/01/24 19:19:58 ssuominen Exp $
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="unicode xinerama"
-
-RDEPEND="app-text/ghostscript-gpl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXaw3d-1.6-r1[unicode?]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.7.3-libXaw3d-1.6.patch
-}
-
-src_configure() {
- # Grab -DXAW_INTERNATIONALIZATION if needed
- append-cppflags "$($(tc-getPKG_CONFIG) --cflags xaw3d)"
-
- export ac_cv_lib_Xinerama_main=$(usex xinerama)
-
- econf \
- --enable-scrollbar-code \
- $(use_enable unicode international)
-}
-
-src_install() {
- default
-
- doicon "${FILESDIR}"/gv_icon.xpm
- make_desktop_entry gv GhostView gv_icon "Graphics;Viewer"
-}
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
index d3b323c9553b..7e0b039e4960 100644
--- a/app-text/hd2u/Manifest
+++ b/app-text/hd2u/Manifest
@@ -1 +1,2 @@
+DIST hd2u-1.0.0.tgz 54461 RMD160 7df603d51e65f6846b9f4b61245e1616274138af SHA1 34ed30a907e359df87dc1ed9a8c8ad6a0236ae1e SHA256 8bd8fa17600399fc9c684c644946c8699fb7235a030bfd1e8e0a8ecd31bc3ca7
DIST hd2u-1.0.3.tgz 60024 RMD160 dea437831f5ba11cc8e51ec52fc1689cc4daf999 SHA1 1c52754c3d144ddd943c1810637eda7606e5c849 SHA256 3c9269e4aa188ddfb1ccadbb9a1906d87f6cbb60b8a2ce71cc6c9f2082ccc890
diff --git a/app-text/hd2u/hd2u-1.0.0.ebuild b/app-text/hd2u/hd2u-1.0.0.ebuild
new file mode 100644
index 000000000000..48e5798af31c
--- /dev/null
+++ b/app-text/hd2u/hd2u-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hd2u/hd2u-1.0.0.ebuild,v 1.11 2011/01/05 18:12:00 jlec Exp $
+
+inherit eutils
+
+DESCRIPTION="Dos2Unix like text file converter"
+HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
+SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
+
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="
+ dev-libs/popt"
+RDEPEND="${DEPEND}
+ !app-text/dos2unix"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "make install failed"
+ dodoc AUTHORS CREDITS ChangeLog INSTALL NEWS README TODO || die
+}
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index a1383935f044..31d38ec4383d 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hd2u/hd2u-1.0.3.ebuild,v 1.7 2012/02/01 09:10:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hd2u/hd2u-1.0.3.ebuild,v 1.1 2011/01/05 18:24:20 jlec Exp $
-EAPI=4
+EAPI="3"
inherit eutils
@@ -10,7 +10,7 @@ DESCRIPTION="Dos2Unix like text file converter"
HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
@@ -23,3 +23,8 @@ RDEPEND="${DEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "make install failed"
+ dodoc AUTHORS CREDITS ChangeLog INSTALL NEWS README TODO || die
+}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 2264ffbf7ea2..47e4194605dd 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,2 +1,4 @@
+DIST highlight-2.9.tar.bz2 378746 RMD160 b058772aaeb2cc844cb0ae620c2866d02884b59b SHA1 6ab40a5af8b5564d90e8eba1c58b03486e8e4471 SHA256 520549886428c00af97667c4587a13aaf99cc8a5a69f8e850ab4c52940dae41d
DIST highlight-3.3.tar.bz2 740651 RMD160 9a020443e70c0c19215a3bfa14ea78493df98a24 SHA1 338fdecc1b30002a8d6624ace76fe2daba05ced4 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87
-DIST highlight-3.7.tar.bz2 653672 RMD160 dbccbd576494cd2c91e28b20cdfd675f4c8e731e SHA1 d25dbf22577f8c340b92bb5c511898138f7cd6e5 SHA256 8828930af8058723cafe04b07c5aa5cc9a36e4174f6d7c2c9403700ac00bb5bd
+DIST highlight-3.5.tar.bz2 756541 RMD160 257ed4992311e8a95096cd4ac29ee7b400f086ad SHA1 0e57b45103b6f471a96f987f98dc5e09fed138b5 SHA256 485c1ad40ba7ade4f42ff14055c13317e3ea361e0556f95f5eb558ee446bf14a
+DIST highlight-3.6.tar.bz2 650790 RMD160 0b4e7a9253ebba9b0f2c84754227f7f8c5f1a12a SHA1 ff3d5f5d17edfed4881d34ef847e63bf800a33e2 SHA256 c79d95234d1fd32a998a7414d0563df5fcb5776a1f92ed38893894ede57fa8bd
diff --git a/app-text/highlight/highlight-2.9.ebuild b/app-text/highlight/highlight-2.9.ebuild
new file mode 100644
index 000000000000..fff87017459e
--- /dev/null
+++ b/app-text/highlight/highlight-2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-2.9.ebuild,v 1.10 2011/06/25 17:17:58 armin76 Exp $
+
+EAPI=3
+inherit eutils toolchain-funcs
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="qt4"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4
+ x11-libs/qt-core:4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -i -e 's:-O2::' -e 's:CFLAGS:CXXFLAGS:g' \
+ -e 's:qmake-qt4:${EPREFIX}/usr/bin/qmake:' \
+ src/makefile || die "sed failed"
+}
+
+src_compile() {
+ emake -f makefile PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" \
+ || die "emake failed"
+
+ if use qt4; then
+ emake -j1 -f makefile PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ CXX="$(tc-getCXX)" gui \
+ || die "emake gui failed"
+ fi
+}
+
+src_install() {
+ dodir /usr/bin
+
+ emake -f makefile DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ \
+ install || die "emake install failed"
+
+ if use qt4; then
+ emake -f makefile DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" conf_dir="${EPREFIX}"/etc/highlight/ \
+ install-gui || die "emake install-gui failed"
+ doicon src/gui-qt/${PN}.xpm
+ domenu ${PN}.desktop
+ fi
+}
diff --git a/app-text/highlight/highlight-3.3.ebuild b/app-text/highlight/highlight-3.3.ebuild
index 5e6508ba3a2d..a2ac910aa04b 100644
--- a/app-text/highlight/highlight-3.3.ebuild
+++ b/app-text/highlight/highlight-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.8 2012/01/22 15:30:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.7 2011/06/25 17:17:58 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt4"
DEPEND="dev-lang/lua
diff --git a/app-text/highlight/highlight-3.5.ebuild b/app-text/highlight/highlight-3.5.ebuild
new file mode 100644
index 000000000000..995335443ad8
--- /dev/null
+++ b/app-text/highlight/highlight-3.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.5.ebuild,v 1.4 2011/08/30 02:22:29 naota Exp $
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+DEPEND="dev-lang/lua
+ dev-libs/boost
+ qt4? ( x11-libs/qt-gui:4
+ x11-libs/qt-core:4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ myhlopts=(
+ "CXX=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "CFLAGS=${CXXFLAGS}"
+ "DESTDIR=${D}"
+ "PREFIX=${EPREFIX}/usr"
+ "LUA_CFLAGS="
+ "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+ "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+ "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+ "conf_dir=${EPREFIX}/etc/highlight/"
+ )
+}
+
+src_prepare() {
+ sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ src/core/datadir.cpp || die
+}
+
+src_compile() {
+ emake -f makefile "${myhlopts[@]}"
+ if use qt4 ; then
+ cd src/gui-qt
+ eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ emake
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+ use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/app-text/highlight/highlight-3.6.ebuild b/app-text/highlight/highlight-3.6.ebuild
new file mode 100644
index 000000000000..549a05a14fe6
--- /dev/null
+++ b/app-text/highlight/highlight-3.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.6.ebuild,v 1.1 2011/10/12 02:06:40 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs qt4-r2
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+DEPEND="dev-lang/lua
+ dev-libs/boost
+ qt4? ( x11-libs/qt-gui:4
+ x11-libs/qt-core:4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ myhlopts=(
+ "CXX=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "CFLAGS=${CXXFLAGS}"
+ "DESTDIR=${D}"
+ "PREFIX=${EPREFIX}/usr"
+ "LUA_CFLAGS="
+ "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+ "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+ "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+ "conf_dir=${EPREFIX}/etc/highlight/"
+ )
+}
+
+src_prepare() {
+ sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ src/core/datadir.cpp || die
+}
+
+src_compile() {
+ emake -f makefile "${myhlopts[@]}"
+ if use qt4 ; then
+ cd src/gui-qt
+ eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ emake
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+ use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/app-text/highlight/highlight-3.7.ebuild b/app-text/highlight/highlight-3.7.ebuild
deleted file mode 100644
index da4ade3fb378..000000000000
--- a/app-text/highlight/highlight-3.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.7.ebuild,v 1.3 2012/01/28 05:07:37 ssuominen Exp $
-
-EAPI=4
-
-inherit toolchain-funcs qt4-r2
-
-DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt4"
-
-DEPEND="dev-lang/lua
- dev-libs/boost
- qt4? ( x11-libs/qt-gui:4
- x11-libs/qt-core:4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS}"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "LUA_CFLAGS="
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
- )
-}
-
-src_prepare() {
- sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
- src/core/datadir.cpp || die
-}
-
-src_compile() {
- emake -f makefile "${myhlopts[@]}"
- if use qt4 ; then
- cd src/gui-qt
- eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
- emake
- fi
-}
-
-src_install() {
- emake -f makefile "${myhlopts[@]}" install
- use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/examples
- fi
-}
diff --git a/app-text/htag/Manifest b/app-text/htag/Manifest
index 09a53c80783a..a0c2ca600bf4 100644
--- a/app-text/htag/Manifest
+++ b/app-text/htag/Manifest
@@ -1 +1,2 @@
+DIST htag-0.0.23.tar.gz 33757 RMD160 34d08d141c82991a105ec6d128f332a41cee7700 SHA1 36afd4f70990c0f756d70e2a231f63a668ceffe4 SHA256 ff0177d649b7357041da77082737b3267bf309fa1aa8b5d7bfb5a3c41439d6fa
DIST htag-0.0.24.tar.gz 33602 RMD160 931f1f7554713b9db1933f39c49384558924e835 SHA1 0c7c4b3f53596800a27dc7d9bcc306a6ff8a3cd4 SHA256 445ee5732d37755d4fa0b8baf3f3d9a2770288b60e703c7ee169fb96fa772b50
diff --git a/app-text/htag/htag-0.0.23.ebuild b/app-text/htag/htag-0.0.23.ebuild
new file mode 100644
index 000000000000..34ca1737e7dc
--- /dev/null
+++ b/app-text/htag/htag-0.0.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htag/htag-0.0.23.ebuild,v 1.8 2011/01/07 23:31:18 ranger Exp $
+
+inherit perl-app
+
+DESCRIPTION="random signature maker"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/htag.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ newbin htag.pl htag || die "newbin failed"
+
+ dodir /usr/share/doc/${PF}/
+ mv docs/sample-config "${D}"/usr/share/doc/${PF}/
+ dodoc docs/* || die
+ docinto example-scripts
+ dodoc example-scripts/* || die
+ prepalldocs
+
+ insinto /usr/share/htag/plugins
+ doins plugins/* || die "failed to install plugins"
+
+ insinto "${VENDOR_LIB}"
+ doins HtagPlugin/HtagPlugin.pm || die "failed to install perl module"
+}
diff --git a/app-text/htag/htag-0.0.24.ebuild b/app-text/htag/htag-0.0.24.ebuild
index 9580029fa925..9b88cd61e53e 100644
--- a/app-text/htag/htag-0.0.24.ebuild
+++ b/app-text/htag/htag-0.0.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htag/htag-0.0.24.ebuild,v 1.6 2012/02/02 07:23:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htag/htag-0.0.24.ebuild,v 1.2 2011/01/05 18:30:13 jlec Exp $
inherit perl-app
@@ -10,7 +10,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
IUSE=""
RDEPEND="dev-lang/perl"
@@ -24,6 +24,7 @@ src_install() {
dodoc docs/* || die
docinto example-scripts
dodoc example-scripts/* || die
+ prepalldocs
insinto /usr/share/htag/plugins
doins plugins/* || die "failed to install plugins"
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 67f9ab3c14ba..77d08f501aa7 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,4 +1,3 @@
DIST html-xml-utils-2.8.tar.gz 193198 RMD160 38596222bd890278b902546f8c43a8eb6407ff24 SHA1 1b7f6a9186758eec9f115b8e6e30ed7d1f42f306 SHA256 41d5407a3baf4f82c6f6673f6590d835efe59f3a2c684a98ea620161e61608e4
DIST html-xml-utils-5.3.tar.gz 233248 RMD160 1dc6e949e68392be78140a62a1b0f42fcbab82dd SHA1 97976bf56d9d8fd3835325b14490d190751f31a7 SHA256 8b2735f048895148be42693e9bbba6d23262ef638e01f9ccbb373c37e5c4a4e0
DIST html-xml-utils-5.5.tar.gz 303827 RMD160 a0a5fc13237fd3d4366f7a6bcf37efd9c1f08389 SHA1 ec1e6d52825a6aa9e9aff0a34679621de5e419ba SHA256 2d381e5bfd7ace166ae5515e5eced3196eb84d3b7199c60896d573b18d6ba754
-DIST html-xml-utils-6.0.tar.gz 267172 RMD160 50273cd1cdc9d3459c8a0b0b09e1c2c7660fb6d6 SHA1 74f57eb8f1abec30fbc3dbbe37caa20ce6a72e48 SHA256 a3c5e562302c47030622f89a1893226f2fe3de4127c343618ba1e229a1b6e15a
diff --git a/app-text/html-xml-utils/html-xml-utils-6.0.ebuild b/app-text/html-xml-utils/html-xml-utils-6.0.ebuild
deleted file mode 100644
index 522cc36604e7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-6.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.0.ebuild,v 1.1 2012/01/25 10:09:36 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files."
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
diff --git a/app-text/hunspell/hunspell-1.3.2-r3.ebuild b/app-text/hunspell/hunspell-1.3.2-r3.ebuild
index 8619de7f649e..b55cdc823762 100644
--- a/app-text/hunspell/hunspell-1.3.2-r3.ebuild
+++ b/app-text/hunspell/hunspell-1.3.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.2-r3.ebuild,v 1.8 2012/01/14 19:27:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.2-r3.ebuild,v 1.3 2011/12/17 16:18:09 ago Exp $
EAPI=4
inherit eutils multilib autotools flag-o-matic versionator
@@ -14,7 +14,7 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
SLOT="0"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="ncurses nls readline static-libs"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ncurses? ( sys-libs/ncurses )
diff --git a/app-text/iso-codes/iso-codes-3.30.ebuild b/app-text/iso-codes/iso-codes-3.30.ebuild
index ae4794d9e7c8..02b6ceddbe37 100644
--- a/app-text/iso-codes/iso-codes-3.30.ebuild
+++ b/app-text/iso-codes/iso-codes-3.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.30.ebuild,v 1.5 2012/01/18 19:57:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/iso-codes/iso-codes-3.30.ebuild,v 1.1 2011/11/19 13:54:34 eva Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 01bb64968d26..fac40a1f5b63 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,3 +1,2 @@
DIST kchmviewer-5.2.tar.gz 283874 RMD160 596ecd96c94f1a33c180869ec91b5e774e1f5e12 SHA1 bba7c5ff141e224cbbcc306f8c07d08708ec386f SHA256 4b5054baa7dc7a5969c64eb7dec860c335f0e3603bf96688f3b121908a20c947
DIST kchmviewer-5.3.tar.gz 317201 RMD160 a7654c14c25054ddf1a839b43744e929b79f6777 SHA1 86d2fac3b2cb37965f68f0b8aa306d797d160dc5 SHA256 a8666e63358d20d6ead6b9f309434bdfcbd7b869ed7fb425ca8e0a2f7166af22
-DIST kchmviewer-6.0.tar.gz 310642 RMD160 2ec456783c054de9258dfd558a9a67434e5f948c SHA1 91657ba4b95bf0457c7a5d1ec3c9939a1a5a2669 SHA256 81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979
diff --git a/app-text/kchmviewer/kchmviewer-6.0.ebuild b/app-text/kchmviewer/kchmviewer-6.0.ebuild
deleted file mode 100644
index 88bd2836ba00..000000000000
--- a/app-text/kchmviewer/kchmviewer-6.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0.ebuild,v 1.1 2011/12/25 10:55:10 patrick Exp $
-
-EAPI=3
-KDE_REQUIRED="never"
-inherit fdo-mime qt4-r2 kde4-base
-
-DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="kde"
-
-RDEPEND="
- dev-libs/chmlib
- >=x11-libs/qt-dbus-4.5:4
- >=x11-libs/qt-webkit-4.5:4
- !kde? ( >=x11-libs/qt-gui-4.5:4 )
- kde? (
- $(add_kdebase_dep kdelibs)
- !kde-base/okular[chm]
- )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- use kde && kde4-base_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
- sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \
- -i lib/kio-msits/CMakeLists.txt
- sed -e "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" \
- -e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
- -i packages/CMakeLists.txt
- sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
- -i src/CMakeLists.txt
- echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
-}
-
-src_configure() {
- if use kde; then
- kde4-base_src_configure
- else
- eqmake4
- fi
-}
-
-src_compile() {
- if use kde; then
- kde4-base_src_compile
- else
- emake || die
- fi
-}
-
-src_test() {
- einfo "No tests exist."
-}
-
-src_install() {
- if use kde; then
- kde4-base_src_install
- else
- dobin bin/kchmviewer || die "dobin kchmviewer failed"
- domenu packages/kchmviewer.desktop || die
- dodoc ChangeLog README || die
- fi
- insinto /usr/share/pixmaps/
- doins packages/kchmviewer.png || die
- dodoc DBUS-bindings FAQ || die
-}
-
-pkg_postinst() {
- use kde && kde4-base_pkg_postinst
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- use kde && kde4-base_pkg_postrm
- fdo-mime_desktop_database_update
-}
diff --git a/app-text/kpaste/Manifest b/app-text/kpaste/Manifest
deleted file mode 100644
index 5c85e3d7e923..000000000000
--- a/app-text/kpaste/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kpaste-0.1.tar.gz 21031 RMD160 80deb10e0f9be27c6446b3c4f07583e01287c618 SHA1 7d3defab504c4f7c632ad738c4cdc53ac402e9ee SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed
diff --git a/app-text/kpaste/kpaste-0.1.ebuild b/app-text/kpaste/kpaste-0.1.ebuild
deleted file mode 100644
index 114ee73d7309..000000000000
--- a/app-text/kpaste/kpaste-0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kpaste/kpaste-0.1.ebuild,v 1.1 2011/12/31 04:57:04 floppym Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-
-inherit python
-
-DESCRIPTION="Command-line tool to paste to paste.kde.org"
-HOMEPAGE="http://quickgit.kde.org/?p=kpaste.git"
-SRC_URI="http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
- :
-}
-
-src_install() {
- dobin kpaste
- dodoc README
-}
diff --git a/app-text/kpaste/metadata.xml b/app-text/kpaste/metadata.xml
deleted file mode 100644
index 09ddbff14dbf..000000000000
--- a/app-text/kpaste/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- floppym@gentoo.org
- Mike Gilbert
-
-
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index c8c00f352dce..43fbca3d5b56 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,3 +1,2 @@
DIST lcdf-typetools-2.85.tar.gz 569184 RMD160 726f2eed3ec1de26527916752007904cfffc833e SHA1 ca0a178a46a06aab4945cdbc6b42c0e4e5864053 SHA256 5e279a7cd65842309c580130f6c31494d4685c5948132a19b8db81d2ef6781e4
DIST lcdf-typetools-2.91.tar.gz 614362 RMD160 b8e5866e645e4e5beb5542e8e741ff13104c6b99 SHA1 efc9e3b37d9280c315afbd9260616e1344628044 SHA256 5b8fd4bec23c6e584c2d5289ff5b84c859f5b9836aac9704da8b33eec6a35aa1
-DIST lcdf-typetools-2.92.tar.gz 588653 RMD160 301fd383904359deb07711a58e7a3eb49a7e7035 SHA1 ac7efb68d3379d9052fa6103035c3f4c95b55854 SHA256 a7a9eeab572f4f392870f6e70e291235af18633b30ac179342efb5e99b426860
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
index 527c42f84d70..b9d464b247a9 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.7 2012/01/22 15:17:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.2 2011/07/07 06:03:41 aballier Exp $
EAPI=2
DESCRIPTION="Font utilities for eg manipulating OTF"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild
deleted file mode 100644
index 888ea466aa2d..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.92.ebuild,v 1.1 2012/01/09 15:47:21 aballier Exp $
-
-EAPI=2
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-DEPEND="kpathsea? ( virtual/tex-base )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf $(use_with kpathsea)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc NEWS README ONEWS
-}
diff --git a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
index 06ee5121516d..5697bdd19472 100644
--- a/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.3 2012/01/18 20:03:28 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libexttextcat/libexttextcat-3.2.0.ebuild,v 1.1 2011/11/14 09:05:54 scarabeus Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=""
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 3ddab2924c1f..fd0ca71eda6c 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,3 +1,2 @@
DIST libgxps-0.1.0.tar.xz 259168 RMD160 6513e82c624cb55251a42e22cef1e80e91999fe0 SHA1 f1d4ba87c070e0ef57de988154142330d9171cf4 SHA256 10d25905a0f5318e47e2d0471606ce8e5318cf7d7f93fb60218a716078d3548e
DIST libgxps-0.2.0.tar.xz 299908 RMD160 0efdd608e68dc5a17936b0c2a7520e1bb218675a SHA1 e847f672c19c7ef3461d2ea0c737d9e159688ad6 SHA256 6c6958b3bd19e02abf4dfa99a2cdaec09be46bf89707ece5b45851bc518e46e6
-DIST libgxps-0.2.1.tar.xz 301012 RMD160 0ff5e4e4767fdd69c448795631c3b1f25e4bdc57 SHA1 10c97366e6bb31a0cd5f3c3cb0df14dd2efc9999 SHA256 b4eb55db83d1268ae81b932cc468ff52b38b0a8d36d7f4c458763585fbad9781
diff --git a/app-text/libgxps/libgxps-0.2.1.ebuild b/app-text/libgxps/libgxps-0.2.1.ebuild
deleted file mode 100644
index d7652b0fc5b2..000000000000
--- a/app-text/libgxps/libgxps-0.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libgxps/libgxps-0.2.1.ebuild,v 1.1 2012/01/21 12:00:01 pacho Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="http://live.gnome.org/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +introspection jpeg lcms static-libs tiff"
-
-RDEPEND=">=app-arch/libarchive-2.8
- >=dev-libs/glib-2.24:2
- media-libs/freetype:2
- media-libs/libpng:0
- >=x11-libs/cairo-1.10[svg]
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
- jpeg? ( virtual/jpeg )
- lcms? ( media-libs/lcms:2 )
- tiff? ( media-libs/tiff[zlib] )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/pkgconfig
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.14 )"
-
-# eautoreconf requires: dev-util/gtk-doc-am
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --enable-man
- --disable-test
- $(use_enable debug)
- $(use_enable introspection)
- $(use_with jpeg libjpeg)
- $(use_with lcms liblcms2)
- $(use_enable static-libs static)
- $(use_with tiff libtiff)"
- DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
diff --git a/app-text/libpaper/libpaper-1.1.24-r1.ebuild b/app-text/libpaper/libpaper-1.1.24-r1.ebuild
index 99122664471d..2f0ce52b80c3 100644
--- a/app-text/libpaper/libpaper-1.1.24-r1.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.24-r1.ebuild,v 1.3 2012/02/06 19:44:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.24-r1.ebuild,v 1.1 2011/09/09 16:41:52 scarabeus Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libwpd/libwpd-0.9.4.ebuild b/app-text/libwpd/libwpd-0.9.4.ebuild
index 6ef0ab8b3246..fc9aeb4f3537 100644
--- a/app-text/libwpd/libwpd-0.9.4.ebuild
+++ b/app-text/libwpd/libwpd-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.4.ebuild,v 1.5 2012/01/18 20:11:41 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.4.ebuild,v 1.1 2011/11/29 11:57:00 scarabeus Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test +tools"
RDEPEND=""
diff --git a/app-text/libwps/libwps-0.2.3.ebuild b/app-text/libwps/libwps-0.2.3.ebuild
index 5cd456622e0f..e7f01d899696 100644
--- a/app-text/libwps/libwps-0.2.3.ebuild
+++ b/app-text/libwps/libwps-0.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.3.ebuild,v 1.4 2011/12/18 20:45:39 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.3.ebuild,v 1.3 2011/10/26 15:30:48 chainsaw Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc debug static-libs"
RDEPEND="app-text/libwpd:0.9"
diff --git a/app-text/libwps/libwps-0.2.4.ebuild b/app-text/libwps/libwps-0.2.4.ebuild
index 7fa2c59bc18c..3205d356fbc1 100644
--- a/app-text/libwps/libwps-0.2.4.ebuild
+++ b/app-text/libwps/libwps-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.4.ebuild,v 1.3 2012/01/14 16:10:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.4.ebuild,v 1.1 2011/11/29 10:06:35 scarabeus Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc debug static-libs"
RDEPEND="app-text/libwpd:0.9"
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index eed73472b424..33a2a2af7dac 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.10 2012/01/28 23:27:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.8 2011/10/04 22:46:00 xmw Exp $
EAPI=3
EGIT_REPO_URI="git://repo.or.cz/llpp.git"
-inherit eutils git-2 toolchain-funcs
+inherit git-2 toolchain-funcs
DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
HOMEPAGE="http://repo.or.cz/w/llpp.git"
@@ -15,9 +15,9 @@ SRC_URI=""
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE=""
+IUSE="vanilla"
-RDEPEND="=app-text/mupdf-9999
+RDEPEND=">=app-text/mupdf-0.8.165
dev-ml/lablgl[glut]
dev-lang/ocaml[ocamlopt]
media-libs/jbig2dec
@@ -26,10 +26,7 @@ RDEPEND="=app-text/mupdf-9999
DEPEND="${RDEPEND}"
src_prepare() {
- sed -e s/pdf_xref/pdf_document/ \
- -e s/pdf_open_xref/pdf_open_document/ \
- -e s/pdf_free_xref/pdf_close_document/ \
- -i link.c || die
+ use vanilla || epatch "${FILESDIR}"/${PN}-WM_CLASS.patch
}
src_compile() {
@@ -39,7 +36,7 @@ src_compile() {
local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype"
#if use ocamlopt ; then
- mycclib="${mycclib} -lpthread"
+ myccopt="${myccopt} -lpthread"
ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die
ocamlopt -c -o help.cmx help.ml || die
ocamlopt -c -o parser.cmx parser.ml || die
diff --git a/app-text/lout/lout-3.38-r1.ebuild b/app-text/lout/lout-3.38-r1.ebuild
index 07f122784372..d1f15a9456e8 100644
--- a/app-text/lout/lout-3.38-r1.ebuild
+++ b/app-text/lout/lout-3.38-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.38-r1.ebuild,v 1.6 2012/01/05 12:58:28 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.38-r1.ebuild,v 1.5 2011/12/07 07:53:59 phajdan.jr Exp $
EAPI=3
@@ -72,6 +72,9 @@ src_install() {
mv ${docdir}/README{,.docs}
dodoc README READMEPDF blurb blurb.short whatsnew
+ # stupid build system
+ fperms 755 /usr/share/doc/${PF}/doc/{design,expert,slides,user}
+
if use doc ; then
einfo "building postscript documentation (may take a while)"
cd doc/user
diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
index 6b33542f5a5a..c74d97fd1ef8 100644
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.4 2012/02/03 22:38:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.2 2011/08/13 12:44:44 hattya Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="sys-libs/ncurses
diff --git a/app-text/lyx2html/Manifest b/app-text/lyx2html/Manifest
new file mode 100644
index 000000000000..3e10ed14e169
--- /dev/null
+++ b/app-text/lyx2html/Manifest
@@ -0,0 +1 @@
+DIST lyx2html-0.2.tar.gz 19083 RMD160 994a023de5f954553136a2a4372845e76398866f SHA1 f5cad3fbe7c841baffea9c8e7a8070984105af24 SHA256 5cd61b856c4aa0dc6b386d2e2dccaecf2bea5fa2708d8d86ccb05534b771b3fd
diff --git a/app-text/lyx2html/files/lyx2html-0.2-alloc.patch b/app-text/lyx2html/files/lyx2html-0.2-alloc.patch
new file mode 100644
index 000000000000..0145d2af1925
--- /dev/null
+++ b/app-text/lyx2html/files/lyx2html-0.2-alloc.patch
@@ -0,0 +1,80 @@
+Index: lyx2html-0.2/document.c
+===================================================================
+--- lyx2html-0.2.orig/document.c
++++ lyx2html-0.2/document.c
+@@ -70,7 +70,7 @@ void documentParseSubSubSection(LYXDOCUM
+
+ if (start)
+ {
+- if(!fgets(theline, filesize, read))
++ if(!fgets(theline, sizeof(theline), read))
+ {
+ break;
+ }
+@@ -114,7 +114,7 @@ void documentParseSubSubSection(LYXDOCUM
+ documentParseSection(doc, read, filename);
+ return;
+ }
+- } while (fgets(theline,filesize,read));
++ } while (fgets(theline,sizeof(theline),read));
+ }
+
+ void documentParseSubSection(LYXDOCUMENT *doc, FILE *read, char * filename)
+@@ -131,7 +131,7 @@ void documentParseSubSection(LYXDOCUMENT
+
+ if (start)
+ {
+- if(!fgets(theline, filesize, read))
++ if(!fgets(theline, sizeof(theline), read))
+ {
+ break;
+ }
+@@ -173,7 +173,7 @@ void documentParseSubSection(LYXDOCUMENT
+ subsubsec++;
+ documentParseSubSubSection(doc, read, filename);
+ }
+- } while (fgets(theline,filesize,read));
++ } while (fgets(theline,sizeof(theline),read));
+ }
+
+ int documentSubSection(LYXDOCUMENT *doc, char * line)
+@@ -212,7 +212,7 @@ void documentParseSection (LYXDOCUMENT *
+
+ if (start)
+ {
+- if(!fgets(theline, filesize, read))
++ if(!fgets(theline, sizeof(theline), read))
+ {
+ break;
+ }
+@@ -242,7 +242,7 @@ void documentParseSection (LYXDOCUMENT *
+ subsubsec = 0;
+ documentParseSubSection(doc, read, filename);
+ }
+- } while (fgets(theline,filesize,read));
++ } while (fgets(theline,sizeof(theline),read));
+ }
+
+ struct LYXDOCUMENT * initNewDoc()
+@@ -288,7 +288,7 @@ struct LYXDOCUMENT * newDoc(char *create
+ int abstract = 0;
+ int start = 0;
+
+- while (fgets(theline,filesize,read))
++ while (fgets(theline,sizeof(theline),read))
+ {
+ linenum++;
+
+Index: lyx2html-0.2/section.c
+===================================================================
+--- lyx2html-0.2.orig/section.c
++++ lyx2html-0.2/section.c
+@@ -34,7 +34,7 @@ struct SECTION * newSection(SECTYPE type
+ {
+ struct SECTION *init;
+
+- init = malloc(filesize);
++ init = malloc(sizeof(struct SECTION));
+
+ /* limit for the name of section is hardcoded */
+ init->name = malloc(240);
diff --git a/app-text/lyx2html/files/lyx2html-0.2-ldflags.patch b/app-text/lyx2html/files/lyx2html-0.2-ldflags.patch
new file mode 100644
index 000000000000..a23897af40c8
--- /dev/null
+++ b/app-text/lyx2html/files/lyx2html-0.2-ldflags.patch
@@ -0,0 +1,13 @@
+Index: lyx2html-0.2/Makefile
+===================================================================
+--- lyx2html-0.2.orig/Makefile
++++ lyx2html-0.2/Makefile
+@@ -10,7 +10,7 @@ COPTS = -O3 -Wall
+ ############################################
+
+ all: $(OFILES)
+- $(CC) $(OFILES) -o lyx2html
++ $(CC) $(LDFLAGS) $(OFILES) -o lyx2html
+
+ document.o: document.h
+ main.o: main.h
diff --git a/app-text/lyx2html/lyx2html-0.2-r1.ebuild b/app-text/lyx2html/lyx2html-0.2-r1.ebuild
new file mode 100644
index 000000000000..8543faa5e34a
--- /dev/null
+++ b/app-text/lyx2html/lyx2html-0.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lyx2html/lyx2html-0.2-r1.ebuild,v 1.1 2009/08/06 11:58:13 aballier Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A very simple Lyx to HTML command line converter"
+SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
+HOMEPAGE="http://www.netmeister.org/apps/lyx2html/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-alloc.patch"
+ epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) COPTS="${CFLAGS}" || die
+}
+
+src_test() {
+ cd test
+ ../lyx2html README.lyx || die
+}
+src_install() {
+ dobin lyx2html || die "Installation failed"
+ dodoc CHANGES README
+ doman lyx2html.1
+}
diff --git a/app-text/lyx2html/metadata.xml b/app-text/lyx2html/metadata.xml
new file mode 100644
index 000000000000..ba6a8a8800d5
--- /dev/null
+++ b/app-text/lyx2html/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+tex
+
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 4933e850b47c..45fd85348532 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,3 +1,2 @@
DIST mecab-0.97.tar.gz 1364214 RMD160 a20d86c2993e1febd98eb6969125981c759389f5 SHA1 43ceea0e7acbb760c1022abe94709bd95f1035a0 SHA256 4b7ca277e9e41532a180c07c8ce9178c02468470749437c33d4fd641b90f72dd
DIST mecab-0.98.tar.gz 1424588 RMD160 d63f396b2fc1b979f98213ba1b0b86a3a5c77cbd SHA1 8977d7760638ec65132e1f9bfc66655ac761f964 SHA256 751d431422539d714a812eba9fbb8468db412221ab03feeb5e4ebd3bbb4e34a2
-DIST mecab-0.991.tar.gz 1388507 RMD160 afd313efc2d9167be780640eccf1dbe0727a198a SHA1 066f5e9369a66fb057b0b9906586df0365b15231 SHA256 eb8afb5cd48a21ef94f9768c44f6672dda9c3088ecde109e829155e3ce4f8d38
diff --git a/app-text/mecab/mecab-0.98.ebuild b/app-text/mecab/mecab-0.98.ebuild
index 71b19fa653c4..e05c3e1ee184 100644
--- a/app-text/mecab/mecab-0.98.ebuild
+++ b/app-text/mecab/mecab-0.98.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.98.ebuild,v 1.5 2012/02/03 17:06:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.98.ebuild,v 1.3 2010/05/02 11:01:57 aballier Exp $
EAPI="2"
inherit autotools eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://mecab.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
SLOT="0"
IUSE="unicode"
diff --git a/app-text/mecab/mecab-0.991.ebuild b/app-text/mecab/mecab-0.991.ebuild
deleted file mode 100644
index 0bc37a0fe334..000000000000
--- a/app-text/mecab/mecab-0.991.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.991.ebuild,v 1.1 2012/01/21 02:57:45 matsuu Exp $
-
-EAPI="4"
-inherit autotools eutils
-
-DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="http://mecab.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE="static-libs unicode"
-
-DEPEND="dev-lang/perl
- virtual/libiconv"
-RDEPEND=""
-PDEPEND="|| (
- >=app-dicts/mecab-ipadic-2.7.0.20070610[unicode=]
- app-dicts/mecab-naist-jdic[unicode=]
- )"
-
-src_prepare() {
- sed -i \
- -e "/CFLAGS/s/-O3/${CFLAGS}/" \
- -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
- configure.in || die
- epatch "${FILESDIR}/${PN}-0.98-iconv.patch"
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- use unicode && myconf="${myconf} --with-charset=utf8"
-
- econf \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_install() {
- default
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete
- fi
-
- dodoc AUTHORS README
- dohtml -r doc/*
-}
diff --git a/app-text/mftrace/mftrace-1.2.17.ebuild b/app-text/mftrace/mftrace-1.2.17.ebuild
index 8ee54f9323b5..fae2eb85c36d 100644
--- a/app-text/mftrace/mftrace-1.2.17.ebuild
+++ b/app-text/mftrace/mftrace-1.2.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.9 2012/01/06 16:52:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.17.ebuild,v 1.8 2011/12/09 12:04:34 naota Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -11,7 +11,7 @@ DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
HOMEPAGE="http://lilypond.org/mftrace/"
SRC_URI="http://lilypond.org/download/sources/mftrace/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~x86-fbsd"
# SLOT 1 was used in pktrace ebuild
SLOT="1"
IUSE="test truetype"
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 7cb1a375f6a9..adca276b4f08 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,3 @@
DIST multitail-5.2.6.tgz 164839 RMD160 f95bf81e3ddc25a7d441f0ef284cbc49e05f23ea SHA1 29a93f4db584daf06fe1eb389b5770f4aa6b4e33 SHA256 cdbefcf64fecd82f74091608855c819dda63f5e0639af60d42844e3393fdc31f
DIST multitail-5.2.7.tgz 164997 RMD160 fcb32d4dfb9ae8c0756e3d1a0c160b171bb79eee SHA1 f64d4630b71de8fa22b71edb157f359cade4adb1 SHA256 ff9164e745c144948d94a4c83da6e49e68b6173e1195a6d003d09e96bb0fda39
DIST multitail-5.2.8.tgz 165019 RMD160 8d16eb52383eb47322a7c1f78b6355e692300472 SHA1 2ad2a765f202be28cdf6bf770c6d1c00981a25a9 SHA256 6217aacd1f34ecddb2e78a6d7f2f41bf50fba291d52ed74d5ff05ccd871bf1e6
-DIST multitail-5.2.9.tgz 165013 RMD160 62aed976733316f941d4dde316f9e543ed833471 SHA1 66b2d603ca8f053b43419046a3cbbba8e470c24b SHA256 b90c65e061d4fe5a8c36dd478d3e618eba42ae4abb5570dde063e9d66e9397f3
diff --git a/app-text/multitail/multitail-5.2.9.ebuild b/app-text/multitail/multitail-5.2.9.ebuild
deleted file mode 100644
index a93ca955aa52..000000000000
--- a/app-text/multitail/multitail-5.2.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.9.ebuild,v 1.3 2012/01/28 19:52:06 armin76 Exp $
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/index.html"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/5.2.2-as-needed.patch \
- "${FILESDIR}"/5.2.6-buffer-overflow.patch
-
- use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-}
-
-src_configure() {
- tc-export CC
- use debug && append-flags "-D_DEBUG"
- use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
-}
-
-src_install () {
- dobin multitail
-
- insinto /etc
- doins multitail.conf
-
- dodoc Changes readme.txt thanks.txt
- doman multitail.1
-
- if use examples; then
- docinto examples
- dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
- fi
-
- if use doc; then
- dohtml manual.html
- fi
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 314db5f9af5d..d2eb47786601 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +1,2 @@
+DIST mupdf-0.8.165-source.tar.gz 3775041 RMD160 2fb4c6ad4e9a4dd00cc60fd635377c353823e569 SHA1 17222ebc80a482ef7cdb190d015cefd4821028dd SHA256 cfa00870ef857def5de1a8d20e5a20b21d72a5d31ce4746953539d2299cbc59e
DIST mupdf-0.9-source.tar.gz 3917075 RMD160 9ba1df205f9f95c7ff4b0a3be224786ad5a65d99 SHA1 3a3ba42d19e3211199110e7c782263241cdea8a0 SHA256 abed825cb1d73e0e28f0a7ee72b5d7a451ba41d21b0c55837ed2a212f3b16b2d
diff --git a/app-text/mupdf/files/mupdf-9999-scroll.patch b/app-text/mupdf/files/mupdf-9999-scroll.patch
deleted file mode 100644
index d74839185606..000000000000
--- a/app-text/mupdf/files/mupdf-9999-scroll.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From http://aur.archlinux.org/packages.php?ID=52333
-
---- mupdf-0.9/apps/pdfapp.c
-+++ mupdf-0.9/apps/pdfapp.c
-@@ -817,11 +817,15 @@
- break;
-
- case 'j':
-+ if (app->pany + app->image->h <= app->winh)
-+ goto pagedown;
- app->pany -= app->image->h / 10;
- pdfapp_showpage(app, 0, 0, 1);
- break;
-
- case 'k':
-+ if (app->pany >= 0)
-+ goto pageup;
- app->pany += app->image->h / 10;
- pdfapp_showpage(app, 0, 0, 1);
- break;
-@@ -885,6 +889,7 @@
- */
-
- case ',':
-+ pageup:
- panto = PAN_TO_BOTTOM;
- if (app->numberlen > 0)
- app->pageno -= atoi(app->number);
-@@ -893,6 +898,7 @@
- break;
-
- case '.':
-+ pagedown:
- panto = PAN_TO_TOP;
- if (app->numberlen > 0)
- app->pageno += atoi(app->number);
-@@ -902,7 +908,7 @@
- case 'b':
- case '\b': //backspace
-- panto = DONT_PAN;
-+ panto = PAN_TO_TOP;
- if (app->numberlen > 0)
- app->pageno -= atoi(app->number);
- else
-
-@ -1067,7 +1073,12 @@
- int isx = (modifiers & (1<<0));
- int xstep = isx ? 20 * dir : 0;
- int ystep = !isx ? 20 * dir : 0;
-- pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
-+ if (!isx && dir < 0 && app->pany + app->image->h <= app->winh)
-+ pdfapp_onkey(app, 'j');
-+ else if (!isx && dir > 0 && app->pany >= 0)
-+ pdfapp_onkey(app, 'k');
-+ else
-+ pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
- }
- }
- }
diff --git a/app-text/mupdf/files/mupdf-9999-zoom.patch b/app-text/mupdf/files/mupdf-9999-zoom.patch
deleted file mode 100644
index 9db6aa3dffd4..000000000000
--- a/app-text/mupdf/files/mupdf-9999-zoom.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- mupdf-0.8.165/apps/man/mupdf.1
-+++ mupdf-0.8.165/apps/man/mupdf.1
-@@ -37,6 +37,15 @@
- .B \+, \-
- Zoom in or out.
- .TP
-+.B _
-+Reset zoom to default (72dpi).
-+.TP
-+.B z
-+Zoom page size to fit into the window frame.
-+.TP
-+.B Z
-+Zoom page size to fill the window frame.
-+.TP
- .B w
- Shrinkwrap window to fit the page.
- .TP
---- mupdf-0.8.165/apps/pdfapp.c
-+++ mupdf-0.8.165/apps/pdfapp.c
-@@ -736,6 +736,20 @@
- pdfapp_showpage(app, 0, 1, 1);
- break;
-
-+ case '_': // zoom to default resolution
-+ app->resolution = 72;
-+ pdfapp_showpage(app, 0, 1, 1);
-+ break;
-+
-+ case 'z': // zoom to fit window
-+ case 'Z': // zoom to fill window
-+ if ( ( c == 'Z' ) ^ ( app->image->w * app->winh > app->winw * app->image->h ) )
-+ app->resolution = ( app->resolution * app->winw ) / app->image->w;
-+ else
-+ app->resolution = ( app->resolution * app->winh ) / app->image->h;
-+ pdfapp_showpage(app, 0, 1, 1);
-+ break;
-+
- case 'L':
- app->rotate -= 90;
- pdfapp_showpage(app, 0, 1, 1);
-@@ -859,6 +873,7 @@
- break;
-
- case 'b':
-+ case '\b': //backspace
- panto = DONT_PAN;
- if (app->numberlen > 0)
- app->pageno -= atoi(app->number);
-@@ -867,6 +882,7 @@
- break;
-
- case ' ':
-+ case 'F':
- panto = DONT_PAN;
- if (app->numberlen > 0)
- app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/mupdf-0.8.165.ebuild b/app-text/mupdf/mupdf-0.8.165.ebuild
new file mode 100644
index 000000000000..12e5b216943a
--- /dev/null
+++ b/app-text/mupdf/mupdf-0.8.165.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.8.165.ebuild,v 1.4 2011/08/23 23:07:36 xmw Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://mupdf.com/download/${P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="X vanilla"
+
+RDEPEND="media-libs/freetype:2
+ media-libs/jbig2dec
+ virtual/jpeg
+ media-libs/openjpeg
+ X? ( x11-libs/libX11
+ x11-libs/libXext )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+ use vanilla || epatch "${FILESDIR}"/${P}-zoom.patch
+}
+
+src_compile() {
+ local my_pdfexe=
+ use X || my_nox11="NOX11=yes MUPDF= "
+
+ emake CC="$(tc-getCC)" \
+ build=debug verbose=true ${my_nox11} -j1 || die
+}
+
+src_install() {
+ emake prefix="${D}usr" LIBDIR="${D}usr/$(get_libdir)" \
+ build=debug verbose=true ${my_nox11} install || die
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins debian/mupdf.pc || die
+
+ if use X ; then
+ domenu debian/mupdf.desktop || die
+ doicon debian/mupdf.xpm || die
+ doman apps/man/mupdf.1 || die
+ fi
+ doman apps/man/pdf{clean,draw,show}.1 || die
+ dodoc README || die
+
+ # avoid collision with app-text/poppler-utils
+ mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
+}
+
+pkg_postinst() {
+ elog "pdfinfo was renamed to mupdf_pdfinfo"
+}
diff --git a/app-text/mupdf/mupdf-0.9.ebuild b/app-text/mupdf/mupdf-0.9.ebuild
index 74a4ee41f1f8..4879bb24ff73 100644
--- a/app-text/mupdf/mupdf-0.9.ebuild
+++ b/app-text/mupdf/mupdf-0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.9.ebuild,v 1.4 2011/12/18 22:23:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.9.ebuild,v 1.3 2011/11/13 14:57:57 maekke Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="http://mupdf.com/download/${P}-source.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="X vanilla"
RDEPEND="media-libs/freetype:2
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 2c91757be447..96dd54ed96e2 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.7 2012/01/28 22:28:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.5 2011/08/13 02:53:50 xmw Exp $
-EAPI=4
+EAPI=2
-EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
+EGIT_REPO_URI="http://mupdf.com/repos/mupdf.git"
inherit eutils flag-o-matic git-2 multilib toolchain-funcs
@@ -29,10 +29,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
- if ! use vanilla ; then
- epatch "${FILESDIR}"/${PN}-9999-zoom.patch
- epatch "${FILESDIR}"/${PN}-9999-scroll.patch
- fi
+ use vanilla || epatch "${FILESDIR}"/${PN}-0.8.165-zoom.patch
}
src_compile() {
@@ -48,16 +45,20 @@ src_install() {
build=debug verbose=true ${my_nox11} install || die
insinto /usr/$(get_libdir)/pkgconfig
- doins debian/mupdf.pc
-
- insinto /usr/include
- doins fitz/memento.h
+ doins debian/mupdf.pc || die
if use X ; then
- domenu debian/mupdf.desktop
- doicon debian/mupdf.xpm
- doman apps/man/mupdf.1
+ domenu debian/mupdf.desktop || die
+ doicon debian/mupdf.xpm || die
+ doman apps/man/mupdf.1 || die
fi
- doman apps/man/mupdf{clean,draw,show}.1
- dodoc README
+ doman apps/man/pdf{clean,draw,show}.1 || die
+ dodoc README || die
+
+ # avoid collision with app-text/poppler-utils
+ mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
+}
+
+pkg_postinst() {
+ elog "pdfinfo was renamed to mupdf_pdfinfo"
}
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index 2f836d758e73..5768d9c3248b 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1,2 +1 @@
DIST mythes-1.2.1.tar.gz 4894265 RMD160 2bf9ebad5b407b158bf9d37f4e92e6aa5347bc96 SHA1 ad4f0e626af272d714d7eb9b3aa2f4c86a06b382 SHA256 4b8b4e494b9dff1416270e044c20a5f5a16229f3da7029a5a6d16ffaf4de79e9
-DIST mythes-1.2.2.tar.gz 4906938 RMD160 70f41b52d843616c4d52d2c1c6ae0037b4282953 SHA1 a1657eb4a7d237c2d10b0686a23573bc36865b27 SHA256 1a1bec56d05b52a9fcc94ce7c53eb3c85defcb6b7770448d79b8be0a62e85677
diff --git a/app-text/mythes/mythes-1.2.1.ebuild b/app-text/mythes/mythes-1.2.1.ebuild
index 3ae965e24348..467cf47ad1f5 100644
--- a/app-text/mythes/mythes-1.2.1.ebuild
+++ b/app-text/mythes/mythes-1.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.1.ebuild,v 1.6 2011/12/18 20:44:56 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.1.ebuild,v 1.5 2011/12/11 21:53:50 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="app-text/hunspell"
diff --git a/app-text/mythes/mythes-1.2.2.ebuild b/app-text/mythes/mythes-1.2.2.ebuild
deleted file mode 100644
index 6fee16af3723..000000000000
--- a/app-text/mythes/mythes-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mythes/mythes-1.2.2.ebuild,v 1.2 2012/01/16 11:55:01 ago Exp $
-
-EAPI=4
-
-DESCRIPTION="A simple thesaurus for Libreoffice"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-text/hunspell"
-DEPEND="${DEPEND}
- dev-util/pkgconfig"
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/noweb/files/50noweb-gentoo.el b/app-text/noweb/files/50noweb-gentoo.el
index 90b971d74635..62b50cfa1732 100644
--- a/app-text/noweb/files/50noweb-gentoo.el
+++ b/app-text/noweb/files/50noweb-gentoo.el
@@ -1,3 +1,6 @@
+
+;;; noweb site-lisp configuration
+
(add-to-list 'load-path "@SITELISP@")
(autoload 'noweb-mode "noweb-mode"
"Minor meta mode for editing noweb files." t)
diff --git a/app-text/noweb/noweb-2.11b-r1.ebuild b/app-text/noweb/noweb-2.11b-r1.ebuild
index 8a5b311d5e1f..a61b299bc33d 100644
--- a/app-text/noweb/noweb-2.11b-r1.ebuild
+++ b/app-text/noweb/noweb-2.11b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r1.ebuild,v 1.7 2012/01/08 22:43:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r1.ebuild,v 1.6 2010/01/06 20:35:30 ranger Exp $
inherit eutils toolchain-funcs elisp-common
@@ -8,7 +8,7 @@ DESCRIPTION="a literate programming tool, lighter than web"
HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
-LICENSE="noweb emacs? ( GPL-2 )"
+LICENSE="freedist emacs? ( GPL-2 )"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="emacs examples"
diff --git a/app-text/noweb/noweb-2.11b-r2.ebuild b/app-text/noweb/noweb-2.11b-r2.ebuild
index a48415963fc4..55cd99d009c1 100644
--- a/app-text/noweb/noweb-2.11b-r2.ebuild
+++ b/app-text/noweb/noweb-2.11b-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r2.ebuild,v 1.3 2012/02/03 14:43:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r2.ebuild,v 1.1 2010/10/30 22:23:22 aballier Exp $
inherit eutils toolchain-funcs elisp-common
@@ -8,9 +8,9 @@ DESCRIPTION="a literate programming tool, lighter than web"
HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
-LICENSE="noweb emacs? ( GPL-2 )"
+LICENSE="freedist emacs? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="emacs examples"
DEPEND="virtual/tex-base
diff --git a/app-text/pastebin/pastebin-0.6.2-r1.ebuild b/app-text/pastebin/pastebin-0.6.2-r1.ebuild
index 72bf49b43b35..c2a941b8e38e 100644
--- a/app-text/pastebin/pastebin-0.6.2-r1.ebuild
+++ b/app-text/pastebin/pastebin-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pastebin/pastebin-0.6.2-r1.ebuild,v 1.6 2012/02/02 10:25:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pastebin/pastebin-0.6.2-r1.ebuild,v 1.1 2011/10/07 15:13:41 jlec Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://pastebin-cli.googlecode.com/files/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-text/pastebin/pastebin-0.6.2.ebuild b/app-text/pastebin/pastebin-0.6.2.ebuild
new file mode 100644
index 000000000000..4e9686efc3ab
--- /dev/null
+++ b/app-text/pastebin/pastebin-0.6.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pastebin/pastebin-0.6.2.ebuild,v 1.4 2011/01/11 22:28:52 maekke Exp $
+
+DESCRIPTION="CLI to pastebin.com"
+HOMEPAGE="http://code.google.com/p/pastebin-cli/"
+SRC_URI="http://pastebin-cli.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-perl/libwww-perl"
+
+src_install() {
+ dobin ${PN} || die
+}
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index ffae8091ac2c..b0543978d9e1 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1 +1,2 @@
-DIST pdf2djvu_0.7.12.tar.gz 301651 RMD160 9b7cb988ce08b18b6d3167757a56526ba6f6de04 SHA1 b12449be1bbb4eb131abfc6bd0b7062a8e814d1b SHA256 d54f6b4414cf6557ed63754f105b708d9d12b3583e8fb2fcfd7d97d94860e5f1
+DIST pdf2djvu_0.7.10.tar.gz 301025 RMD160 0a339ca05cf4911d608f54dc7aac342be273878c SHA1 87dbd85123df729497dcfbdca8b2c62f507e0b5b SHA256 11e4132e9a07fd78755f290c0bd7a4209dc0e871e4408f15592fc0e138d1ad68
+DIST pdf2djvu_0.7.11.tar.gz 292966 RMD160 9f7e1541fe817610e35aeaa2bcc3e8ce0efa7db3 SHA1 f828446478fbb4c0f29557bf8c53a0a6c50a2492 SHA256 f8ad5cc88aaca4a37a73c31674942cb0be0bf44440d22d46c85e0a404f63fa01
diff --git a/app-text/pdf2djvu/pdf2djvu-0.7.10.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.10.ebuild
new file mode 100644
index 000000000000..705517f2f8ee
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.7.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.10.ebuild,v 1.1 2011/08/31 04:18:49 radhermit Exp $
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="convert PDF files to DjVu ones"
+HOMEPAGE="http://code.google.com/p/pdf2djvu/"
+SRC_URI="http://pdf2djvu.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphicsmagick nls openmp"
+
+RDEPEND=">=app-text/djvu-3.5.21
+ >=app-text/poppler-0.12.3-r3[xpdf-headers]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ graphicsmagick? ( media-gfx/graphicsmagick )"
+DEPEND="${RDEPEND}
+ dev-cpp/pstreams
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_configure() {
+ local openmp=disable
+ use openmp && tc-has-openmp && openmp=enable
+
+ econf \
+ --${openmp}-openmp \
+ $(use_enable nls) \
+ $(use_with graphicsmagick)
+}
+
+src_test() {
+ if use graphicsmagick; then
+ emake test
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc doc/{changelog,*.txt}
+}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.7.11.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.11.ebuild
new file mode 100644
index 000000000000..a25e7d022fb9
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.7.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.11.ebuild,v 1.1 2011/10/19 16:00:02 ssuominen Exp $
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="convert PDF files to DjVu ones"
+HOMEPAGE="http://code.google.com/p/pdf2djvu/"
+SRC_URI="http://pdf2djvu.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphicsmagick nls openmp"
+
+RDEPEND=">=app-text/djvu-3.5.21
+ >=app-text/poppler-0.16.7[xpdf-headers]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ graphicsmagick? ( media-gfx/graphicsmagick )"
+DEPEND="${RDEPEND}
+ dev-cpp/pstreams
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+src_configure() {
+ local openmp=disable
+ use openmp && tc-has-openmp && openmp=enable
+
+ econf \
+ --${openmp}-openmp \
+ $(use_enable nls) \
+ $(use_with graphicsmagick)
+}
+
+src_test() {
+ use graphicsmagick && emake test
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc doc/{changelog,*.txt}
+}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.7.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.12.ebuild
deleted file mode 100644
index 8d03b2975488..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.7.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.12.ebuild,v 1.1 2012/01/23 07:25:14 ssuominen Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://code.google.com/p/pdf2djvu/"
-SRC_URI="http://pdf2djvu.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp"
-
-RDEPEND=">=app-text/djvu-3.5.21
- >=app-text/poppler-0.16.7[xpdf-headers]
- dev-libs/libxml2
- dev-libs/libxslt
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_configure() {
- local openmp=disable
- use openmp && tc-has-openmp && openmp=enable
-
- econf \
- --${openmp}-openmp \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
-
-src_test() {
- use graphicsmagick && emake test
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
-}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 7052483cc408..153c19696c8c 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1 +1,3 @@
+DIST pdftk-1.41-makefile.patch 851 RMD160 32ce2174bb5fedd416b8b6864b60437004c44b89 SHA1 b0483a1645c745271814503e07c3214e5c60a71c SHA256 a5f1c4bee06b9202f8b5da79debb858f8338c3cda78bd209106aa305d154dfeb
+DIST pdftk-1.41.tar.gz 1011368 RMD160 09394a3d772556fa2c053bcef843b1e593feab1d SHA1 256583800c213419a845b28fe9ad5baccceddf80 SHA256 6b0ff22297b50600083bb8f6b4c507c68144b2d70738d31e0e19ab4091df5164
DIST pdftk-1.44-src.zip 1137086 RMD160 cacd286759005f002f5a46c0af28d3a1aaad73eb SHA1 7cb137dcba885caff32ff96b7e11c9dc4ce2cba7 SHA256 d70cb3faf2af849c2bee6c35e4e829277a5090cbb595321f04b59c94d784aa24
diff --git a/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch b/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch
new file mode 100644
index 000000000000..be46b0dcbc63
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch
@@ -0,0 +1,203 @@
+# posted to bug #251796 by from Debian patches
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile 2008-12-23 00:04:52.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile pdftk-1.41/java_libs/com/lowagie/text/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/Makefile 2008-12-22 23:58:52.000000000 +0200
+@@ -25,13 +25,12 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+
+-all : $(library) $(headers)
++all : $(library) $(headers) $(classes)
+
+ $(library) : $(objects)
+ $(AR) $(ARFLAGS) $(library) $(objects);
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile 2008-12-23 00:04:28.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile 2008-12-23 00:04:11.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-12-23 00:03:05.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-12-23 00:03:29.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-12-23 00:01:33.000000000 +0200
+@@ -34,8 +34,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile 2008-12-23 00:00:25.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-12-22 23:46:21.000000000 +0200
+@@ -50,7 +50,7 @@
+
+ package com.lowagie.text.pdf;
+
+-import java_local.security.MessageDigest; // ssteward
++import java.security.MessageDigest;
+ import com.lowagie.text.ExceptionConverter;
+
+ /**
+diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile 2008-12-22 23:59:42.000000000 +0200
+@@ -25,8 +25,7 @@
+ # the "$*" automatic variable, here
+ #
+ %.h : %.class
+- $(GCJH) --classpath="." $*;
+- $(RM) $<
++ $(GCJH) --classpath="$(java_libs_root):." $*;
+
+ ##
+ # targets
+diff -u -r pdftk-1.41.orig/java_libs/Makefile pdftk-1.41/java_libs/Makefile
+--- pdftk-1.41.orig/java_libs/Makefile 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/java_libs/Makefile 2008-12-22 23:47:10.000000000 +0200
+@@ -13,13 +13,7 @@
+ # append gcj flags
+ export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
+
+-all : libgcj_local itext
+-
+-libgcj_local :
+- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security";
+- $(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider";
+- $(MAKE) -C "$(java_libs_root)/gnu/gcj/convert";
+- $(MAKE) -C "$(java_libs_root)/java_local/security";
++all : itext
+
+ itext :
+ $(MAKE) -C "$(java_libs_root)/com/lowagie/text";
+@@ -35,13 +29,7 @@
+ $(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
+ $(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
+
+-clean : libgcj_local_clean itext_clean
+-
+-libgcj_local_clean :
+- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean;
+- $(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean;
+- $(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean;
+- $(MAKE) -iC "$(java_libs_root)/java_local/security" clean;
++clean : itext_clean
+
+ itext_clean :
+ $(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean;
+diff -u -r pdftk-1.41.orig/pdftk/Makefile.Base pdftk-1.41/pdftk/Makefile.Base
+--- pdftk-1.41.orig/pdftk/Makefile.Base 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/pdftk/Makefile.Base 2008-12-22 23:44:33.000000000 +0200
+@@ -31,18 +31,6 @@
+ afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
+ afm_objects= $(patsubst %.afm, %.o, $(afms))
+
+-# older versions of libgcj might not have the MD5 algorithm,
+-# so I added it here; these *_local java files were grabbed from
+-# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1
+-#
+-# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1
+-#
+-libgcj_local_libs = \
+-$(java_libs_root)/java_local/security/security.a \
+-$(java_libs_root)/gnu_local/java/security/provider/provider.a \
+-$(java_libs_root)/gnu_local/java/security/security.a \
+-$(java_libs_root)/gnu/gcj/convert/convert.a
+-
+ # this must already be set according to your platform Makefile;
+ # we're just appending to it, here
+ #
+diff -u -r pdftk-1.41.orig/pdftk/Makefile.Generic pdftk-1.41/pdftk/Makefile.Generic
+--- pdftk-1.41.orig/pdftk/Makefile.Generic 2008-12-22 23:43:29.000000000 +0200
++++ pdftk-1.41/pdftk/Makefile.Generic 2008-12-23 00:06:24.000000000 +0200
+@@ -28,7 +28,7 @@
+
+ # itext compiler flags
+ # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
+-export GCJFLAGS= -O2
++export GCJFLAGS= -O2 -w
+
+ #
+ export ARFLAGS= rs
diff --git a/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch b/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch
new file mode 100644
index 000000000000..e3efbe0f23f2
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch
@@ -0,0 +1,16 @@
+diff -NrU5 pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java
+--- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:49:13.000000000 -0600
++++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java 2009-05-18 20:51:36.000000000 -0600
+@@ -74,11 +74,11 @@
+ public class PdfDate extends PdfString {
+
+ // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would
+ // omit this class because of its reference by reflection;
+ // this treatment ensures that ld will include it
+- private static Class c1= gnu.java.locale.Calendar.class;
++ private static Class c1= java.util.Calendar.class;
+
+ private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,
+ Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};
+
+ // constructors
diff --git a/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch b/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch
new file mode 100644
index 000000000000..402382557ab0
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch
@@ -0,0 +1,11 @@
+--- pdftk-1.41/pdftk/Makefile.Base.orig 2006-10-25 01:44:06.000000000 +0200
++++ pdftk-1.41/pdftk/Makefile.Base 2008-08-15 17:21:18.073275624 +0200
+@@ -63,7 +63,7 @@
+ $(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c
+
+ pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects)
+- $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk
++ $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o pdftk
+
+ install:
+ /usr/bin/install pdftk /usr/local/bin
diff --git a/app-text/pdftk/pdftk-1.41-r1.ebuild b/app-text/pdftk/pdftk-1.41-r1.ebuild
new file mode 100644
index 000000000000..aefb09051c7b
--- /dev/null
+++ b/app-text/pdftk/pdftk-1.41-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r1.ebuild,v 1.8 2010/10/05 22:48:26 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nodrm"
+
+DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_unpack() {
+ unpack ${A}
+
+ #bug #225709 and #251796
+ epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+ #bug #269312
+ epatch "${FILESDIR}/${P}-gcc-4.4.patch"
+ #bug #209802
+ epatch "${FILESDIR}/${P}-honor-ldflags.patch"
+ # force usage of custom CFLAGS.
+ sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
+ # nodrm patch, bug 296455
+ if use nodrm; then
+ sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
+ fi
+}
+
+src_compile() {
+ # java-config settings break compilation by gcj.
+ unset CLASSPATH
+ unset JAVA_HOME
+ # parallel make fails
+ emake -j1 -f Makefile.Generic || die "Compilation failed."
+}
+
+src_install() {
+ dobin pdftk
+ newman ../debian/pdftk.1 pdftk.1
+ dohtml ../pdftk.1.html
+}
diff --git a/app-text/pdftk/pdftk-1.41-r2.ebuild b/app-text/pdftk/pdftk-1.41-r2.ebuild
new file mode 100644
index 000000000000..3a2a09dcfb9b
--- /dev/null
+++ b/app-text/pdftk/pdftk-1.41-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r2.ebuild,v 1.1 2010/11/27 22:16:39 xmw Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz
+ http://aur.archlinux.org/packages/pdftk/pdftk/makefile.patch -> ${P}-makefile.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nodrm"
+
+DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+
+ #bug #225709 and #251796
+ epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+
+ #bug #269312
+ epatch "${FILESDIR}/${P}-gcc-4.4.patch"
+
+ #bug #209802
+ epatch "${FILESDIR}/${P}-honor-ldflags.patch"
+
+ cd "${S}"/.. || die
+ #bug 339345
+ epatch "${DISTDIR}/${P}-makefile.patch"
+
+ # force usage of custom CFLAGS.
+ sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
+ # nodrm patch, bug 296455
+ if use nodrm; then
+ sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
+ fi
+
+ sed -e '/^export GCJ=/d' -e '/^export GCJH=/d' \
+ -i "${WORKDIR}"/${P}/${PN}/Makefile.Generic || die
+}
+
+src_compile() {
+ # java-config settings break compilation by gcj.
+ unset CLASSPATH
+ unset JAVA_HOME
+
+ tc-export GCJ
+ export GCJH="${GCJ}"h
+
+ # parallel make fails
+ emake -j1 -f Makefile.Generic || die "Compilation failed."
+}
+
+src_install() {
+ dobin pdftk || die
+ newman ../debian/pdftk.1 pdftk.1 || die
+ dohtml ../pdftk.1.html || die
+}
diff --git a/app-text/pdftk/pdftk-1.44.ebuild b/app-text/pdftk/pdftk-1.44.ebuild
index beabfbbedc14..4f078add4661 100644
--- a/app-text/pdftk/pdftk-1.44.ebuild
+++ b/app-text/pdftk/pdftk-1.44.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.44.ebuild,v 1.4 2012/01/07 00:41:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.44.ebuild,v 1.3 2011/06/08 18:46:19 maekke Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
RDEPEND="${DEPEND}"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index cc2cea7b0d3f..1906cb9bf24e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,2 +1,3 @@
DIST poppler-0.16.7.tar.gz 1952179 RMD160 279330e6feaf97a207f3396eab1af836d3d1f16c SHA1 26c735f863688f62b57d5159863fdad4272be89f SHA256 fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd
-DIST poppler-0.18.3.tar.gz 1985256 RMD160 d6d88ca2aa9e79da6ed0828ebc18ee9cd11c181b SHA1 a57fbf63e0a4b611931caf8e47f1f96714acce8c SHA256 d9019c403a36ee029bd90fee94a0793e63917646d7253ce24637de5194133462
+DIST poppler-0.18.1.tar.gz 1949210 RMD160 62c9461b3455937c6abd07690233dbc2ab29db0b SHA1 0224907e3ec52cdc25c95dcc45a09f020218077e SHA256 d024540a5ffe3862351a0aca4a5304c14fdf3b071d3ac384245023a215faa8a3
+DIST poppler-0.18.2.tar.gz 1982853 RMD160 5fb322f79fd9934108818b4488cc6f9803ba862c SHA1 7ef4eec20e849024c0cdd7a49c428d20eb3de875 SHA256 b15f6b461fd2ba59cf98e64751ba26edc4a9976f896fb2019d8b3b1aa8c95b52
diff --git a/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch b/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch
new file mode 100644
index 000000000000..5cbdd5a7ee60
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch
@@ -0,0 +1,60 @@
+From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
+From: Rex Dieter
+Date: Tue, 01 Nov 2011 08:40:53 +0000
+Subject: Fix pkg-config files
+
+We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+---
+diff --git a/configure.ac b/configure.ac
+index 3a120ca..c4f5b92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+
+ GLIB_REQUIRED=2.18
++ AC_SUBST(GLIB_REQUIRED)
+ AC_ARG_ENABLE(poppler-glib,
+ AC_HELP_STRING([--disable-poppler-glib],
+ [Don't compile poppler glib wrapper.]),
+diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
+index 55a2278..5fcb6f2 100644
+--- a/poppler-glib-uninstalled.pc.in
++++ b/poppler-glib-uninstalled.pc.in
+@@ -1,7 +1,7 @@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler - uninstalled
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+
+ Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
+diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
+index 3264ed6..e15e669 100644
+--- a/poppler-glib.pc.cmake
++++ b/poppler-glib.pc.cmake
+@@ -6,7 +6,7 @@ includedir=${prefix}/include
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @POPPLER_VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+
+ Libs: -L${libdir} -lpoppler-glib
+diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
+index 04d9bb9..9ba8978 100644
+--- a/poppler-glib.pc.in
++++ b/poppler-glib.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+
+ Libs: -L${libdir} -lpoppler-glib
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-text/poppler/poppler-0.18.1.ebuild b/app-text/poppler/poppler-0.18.1.ebuild
new file mode 100644
index 000000000000..b2e8e8a87085
--- /dev/null
+++ b/app-text/poppler/poppler-0.18.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.1.ebuild,v 1.2 2011/11/16 10:07:39 jlec Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.6.0
+ >=media-libs/freetype-2.3.9
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ >=x11-libs/cairo-1.10.0
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/openjpeg )
+ lcms? ( =media-libs/lcms-1* )
+ png? ( >=media-libs/libpng-1.4:0 )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-libs/poppler
+ !dev-libs/poppler-glib
+ !dev-libs/poppler-qt3
+ !dev-libs/poppler-qt4
+ !app-text/poppler-utils
+ cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
+src_configure() {
+ mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT4_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DENABLE_SPLASH=ON
+ -DENABLE_ZLIB=ON
+ $(cmake-utils_use_enable curl LIBCURL)
+ $(cmake-utils_use_enable cxx CPP)
+ $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+ $(cmake-utils_use_enable lcms)
+ $(cmake-utils_use_enable utils)
+ $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
+ $(cmake-utils_use_with cairo)
+ $(cmake-utils_use_with introspection GObjectIntrospection)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4)
+ $(cmake-utils_use_with tiff)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use cairo && use doc; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+ fi
+}
+
+pkg_postinst() {
+ ewarn "After upgrading app-text/poppler you may need to reinstall packages"
+ ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
+ ewarn "to run revdep-rebuild"
+}
diff --git a/app-text/poppler/poppler-0.18.2.ebuild b/app-text/poppler/poppler-0.18.2.ebuild
new file mode 100644
index 000000000000..79098d269858
--- /dev/null
+++ b/app-text/poppler/poppler-0.18.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.2.ebuild,v 1.1 2011/12/09 18:49:44 reavertm Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.6.0
+ >=media-libs/freetype-2.3.9
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ >=x11-libs/cairo-1.10.0
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/openjpeg )
+ lcms? ( =media-libs/lcms-1* )
+ png? ( >=media-libs/libpng-1.4:0 )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-libs/poppler
+ !dev-libs/poppler-glib
+ !dev-libs/poppler-qt3
+ !dev-libs/poppler-qt4
+ !app-text/poppler-utils
+ cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
+src_configure() {
+ mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT4_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DENABLE_SPLASH=ON
+ -DENABLE_ZLIB=ON
+ $(cmake-utils_use_enable curl LIBCURL)
+ $(cmake-utils_use_enable cxx CPP)
+ $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+ $(cmake-utils_use_enable lcms)
+ $(cmake-utils_use_enable utils)
+ $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
+ $(cmake-utils_use_with cairo)
+ $(cmake-utils_use_with introspection GObjectIntrospection)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4)
+ $(cmake-utils_use_with tiff)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use cairo && use doc; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+ fi
+}
+
+pkg_postinst() {
+ ewarn "After upgrading app-text/poppler you may need to reinstall packages"
+ ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
+ ewarn "to run revdep-rebuild"
+}
diff --git a/app-text/poppler/poppler-0.18.3.ebuild b/app-text/poppler/poppler-0.18.3.ebuild
deleted file mode 100644
index 853e3588ef3f..000000000000
--- a/app-text/poppler/poppler-0.18.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.3.ebuild,v 1.1 2012/01/28 00:13:12 reavertm Exp $
-
-EAPI="4"
-
-inherit cmake-utils
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=media-libs/fontconfig-2.6.0
- >=media-libs/freetype-2.3.9
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- >=x11-libs/cairo-1.10.0
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/openjpeg )
- lcms? ( =media-libs/lcms-1* )
- png? ( >=media-libs/libpng-1.4:0 )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-libs/poppler
- !dev-libs/poppler-glib
- !dev-libs/poppler-qt3
- !dev-libs/poppler-qt4
- !app-text/poppler-utils
- cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
-
-src_configure() {
- mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT4_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- $(cmake-utils_use_enable curl LIBCURL)
- $(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
- $(cmake-utils_use_enable lcms)
- $(cmake-utils_use_enable utils)
- $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
- $(cmake-utils_use_with cairo)
- $(cmake-utils_use_with introspection GObjectIntrospection)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
- $(cmake-utils_use_with tiff)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use cairo && use doc; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
- fi
-}
-
-pkg_postinst() {
- ewarn "After upgrading app-text/poppler you may need to reinstall packages"
- ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
- ewarn "to run revdep-rebuild"
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
index 5f8f4908b1de..34adf8b69364 100644
--- a/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.5 2012/01/29 16:56:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ps2pkm/ps2pkm-1.5_p20110705.ebuild,v 1.1 2011/07/27 13:57:42 aballier Exp $
EAPI=3
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-libs/kpathsea-6.0.1_p20110627"
diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild
index 286e8fe0fe65..625e1eeb57c8 100644
--- a/app-text/pspdftool/pspdftool-0.03.ebuild
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
+inherit autotools-utils ${EXTRA_ECLASS}
unset EXTRA_ECLASS
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild
index cd75b5c24246..e4ca65965542 100644
--- a/app-text/pspdftool/pspdftool-9999.ebuild
+++ b/app-text/pspdftool/pspdftool-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
EAPI=4
@@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
ESVN_PROJECT="pspdftool"
[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
+inherit autotools-utils ${EXTRA_ECLASS}
unset EXTRA_ECLASS
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
diff --git a/app-text/pstotext/pstotext-1.9-r3.ebuild b/app-text/pstotext/pstotext-1.9-r3.ebuild
index a5559bd1889d..7df444deb9c6 100644
--- a/app-text/pstotext/pstotext-1.9-r3.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.9-r3.ebuild,v 1.2 2012/02/03 14:44:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.9-r3.ebuild,v 1.1 2010/10/03 14:15:17 jlec Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
LICENSE="PSTT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="app-arch/ncompress"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
deleted file mode 100644
index 6329e4db0de5..000000000000
--- a/app-text/qpdf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qpdf-2.3.1.tar.gz 4725246 RMD160 e348f5507a917db007f3f86c6bada76f8cc58d48 SHA1 043cceeb74a702d4e6a6a83b0211d99f28383655 SHA256 e1e687bbc0137e296c702daa5e2d804efce37c4edb48f2c27ae0dd0b43f99a40
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
deleted file mode 100644
index 157326a7e891..000000000000
--- a/app-text/qpdf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- radhermit@gentoo.org
- Tim Harder
-
-
diff --git a/app-text/qpdf/qpdf-2.3.1.ebuild b/app-text/qpdf/qpdf-2.3.1.ebuild
deleted file mode 100644
index 0e7c6b32fa4f..000000000000
--- a/app-text/qpdf/qpdf-2.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-2.3.1.ebuild,v 1.1 2011/12/31 07:07:25 radhermit Exp $
-
-EAPI="4"
-
-DESCRIPTION="A command-line program that does structural, content-preserving transformations on PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs test"
-
-RDEPEND="dev-libs/libpcre
- sys-libs/zlib
- >=dev-lang/perl-5.8"
-DEPEND="${RDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl
- )"
-
-DOCS=( ChangeLog README TODO )
-
-src_prepare() {
- # Manually install docs
- sed -i -e "/docdir/d" make/libtool.mk || die
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/lib*/libqpdf.a
-
- if use doc ; then
- dodoc doc/qpdf-manual.pdf
- dohtml doc/*
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-}
diff --git a/app-text/rhyme/rhyme-0.9-r1.ebuild b/app-text/rhyme/rhyme-0.9-r1.ebuild
index 283082444cd1..a4d36994e055 100644
--- a/app-text/rhyme/rhyme-0.9-r1.ebuild
+++ b/app-text/rhyme/rhyme-0.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rhyme/rhyme-0.9-r1.ebuild,v 1.3 2011/12/26 12:40:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rhyme/rhyme-0.9-r1.ebuild,v 1.2 2011/12/16 12:19:57 ago Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/rhyme/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha amd64 ~x86"
IUSE=""
DEPEND=">=sys-libs/readline-4.3
diff --git a/app-text/ronn/ronn-0.7.3-r1.ebuild b/app-text/ronn/ronn-0.7.3-r1.ebuild
deleted file mode 100644
index 004b809f4eac..000000000000
--- a/app-text/ronn/ronn-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ronn/ronn-0.7.3-r1.ebuild,v 1.2 2012/01/16 19:21:53 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ronn converts simple, human readable textfiles to roff for terminal display, and also to HTML."
-HOMEPAGE="http://github.com/rtomayko/ronn/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/hpricot-0.8.2
- >=dev-ruby/mustache-0.7.0
- >=dev-ruby/rdiscount-1.5.8"
-
-all_ruby_prepare() {
- # Avoid test failing due to changes in hash handling in ruby 1.8.7:
- # https://github.com/rtomayko/ronn/issues/56
- sed -i -e '81 s:^:#:' test/test_ronn.rb || die
-}
-
-each_ruby_prepare() {
- # Make sure that we always use the right interpreter during tests.
- sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
-all_ruby_compile() {
- PATH="${S}/bin:${PATH}" rake man || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/ronn.1 man/ronn-format.7
-}
diff --git a/app-text/ronn/ronn-0.7.3.ebuild b/app-text/ronn/ronn-0.7.3.ebuild
index 803f10c375c7..cb1a8f6dd970 100644
--- a/app-text/ronn/ronn-0.7.3.ebuild
+++ b/app-text/ronn/ronn-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ronn/ronn-0.7.3.ebuild,v 1.9 2012/01/17 13:55:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ronn/ronn-0.7.3.ebuild,v 1.5 2011/08/07 19:00:11 armin76 Exp $
EAPI=2
USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/rtomayko/ronn/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
@@ -24,17 +24,6 @@ ruby_add_rdepend "
>=dev-ruby/mustache-0.7.0
>=dev-ruby/rdiscount-1.5.8"
-all_ruby_prepare() {
- # Avoid test failing due to changes in hash handling in ruby 1.8.7:
- # https://github.com/rtomayko/ronn/issues/56
- sed -i -e '81 s:^:#:' test/test_ronn.rb || die
-}
-
-each_ruby_prepare() {
- # Make sure that we always use the right interpreter during tests.
- sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
all_ruby_compile() {
PATH="${S}/bin:${PATH}" rake man || die
}
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
index fa05c0c9a9c5..f1d6ee89b649 100644
--- a/app-text/sgrep/Manifest
+++ b/app-text/sgrep/Manifest
@@ -1,2 +1 @@
DIST sgrep-1.92a.tar.gz 148306 RMD160 1bdd4692b82e16ad30b586f4e7128dba38bd385a SHA1 0a51843822e9d986f08ad9e4c5d0e7b260508956 SHA256 f5dabbd9c5cd35823c8e1e50fb313af9772f0d33280b08484ca29d6540979702
-DIST sgrep-1.94a.tar.gz 193267 RMD160 d75f644fc4ba9b0eb916f8097bf58ebe4b73154c SHA1 4f6815d212ac6e1ed4eb2720f9b28963d1d0e99d SHA256 d5b16478e3ab44735e24283d2d895d2c9c80139c95228df3bdb2ac446395faf9
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
deleted file mode 100644
index 2cb81109b6a4..000000000000
--- a/app-text/sgrep/sgrep-1.94a.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgrep/sgrep-1.94a.ebuild,v 1.1 2012/01/21 06:39:05 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="Structured grep: tool for searching and indexing text, SGML,XML and HTML files and filtering text streams using structural criteria."
-SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
-HOMEPAGE="http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
- sed -i -e "s:/usr/lib:/etc:g" sgrep.1
-}
-
-src_configure() {
- econf --datadir="${EPREFIX}"/etc
-}
-
-src_install() {
- dobin sgrep
- doman sgrep.1
- dodoc AUTHORS ChangeLog NEWS README sample.sgreprc
- insinto /etc
- newins sample.sgreprc sgreprc
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
deleted file mode 100644
index 1d8cd402e9f7..000000000000
--- a/app-text/sigil/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sigil-0.4.2-Code.zip 10104606 RMD160 c0834a04cdc67f8d066e4a66c43973a6013866e0 SHA1 67464f521c1b11641812b6959549a842546b4f8d SHA256 78490b43e071e840e191c3553b7d2041798b37b6aacc068b8334f9a851b2f65a
-DIST Sigil-0.4.905-Code.zip 12336033 RMD160 3c8f475a57027c5d2dfeb9f0f348a54246f93f70 SHA1 db9ef0abf4f0dff94cf882515f7aa59541de756c SHA256 55055550050074ddc36f95a0c1efc00fbad19eba1b13d528be134476087c09cd
-DIST Sigil-0.5.0-Code.zip 12396113 RMD160 737f34b95b165a7af6c72b44daf08103d47b6b26 SHA1 4139602b0c39db72f6317f39c13b35cd0f86238d SHA256 e91c48df313540e08d651b73f48d3a78685976916beb794caba1f96f5a61d9de
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
deleted file mode 100644
index a6f184ccfd77..000000000000
--- a/app-text/sigil/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- no-herd
-
- sbriesen@gentoo.org
- Stefan Briesenick
-
-
- Sigil is a multi-platform WYSIWYG ebook editor.
- It is designed to edit books in ePub format.
-
-
diff --git a/app-text/sigil/sigil-0.4.2.ebuild b/app-text/sigil/sigil-0.4.2.ebuild
deleted file mode 100644
index b475436ebcff..000000000000
--- a/app-text/sigil/sigil-0.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sigil/sigil-0.4.2.ebuild,v 1.1 2012/01/10 03:11:52 sbriesen Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE="Release"
-
-inherit eutils cmake-utils
-
-MY_P="Sigil-${PV}-Code"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format."
-HOMEPAGE="http://code.google.com/p/sigil/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=x11-libs/qt-xmlpatterns-4.7.2
- >=x11-libs/qt-webkit-4.7.2
- >=x11-libs/qt-svg-4.7.2
- >=x11-libs/qt-gui-4.7.2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- # use standard naming
- mv -f README.txt README
- mv -f ChangeLog.txt ChangeLog
- edos2unix ChangeLog README
-}
diff --git a/app-text/sigil/sigil-0.4.905_beta1.ebuild b/app-text/sigil/sigil-0.4.905_beta1.ebuild
deleted file mode 100644
index ef4f9a808357..000000000000
--- a/app-text/sigil/sigil-0.4.905_beta1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sigil/sigil-0.4.905_beta1.ebuild,v 1.1 2012/01/10 03:11:52 sbriesen Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE="Release"
-
-inherit eutils cmake-utils
-
-MY_P="Sigil-${PV/_beta1}-Code"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format."
-HOMEPAGE="http://code.google.com/p/sigil/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=x11-libs/qt-xmlpatterns-4.7.2
- >=x11-libs/qt-webkit-4.7.2
- >=x11-libs/qt-svg-4.7.2
- >=x11-libs/qt-gui-4.7.2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- # use standard naming
- mv -f README.txt README
- mv -f ChangeLog.txt ChangeLog
- edos2unix ChangeLog README
-}
diff --git a/app-text/sigil/sigil-0.5.0.ebuild b/app-text/sigil/sigil-0.5.0.ebuild
deleted file mode 100644
index 3ffbe73a1373..000000000000
--- a/app-text/sigil/sigil-0.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sigil/sigil-0.5.0.ebuild,v 1.1 2012/01/26 23:04:46 sbriesen Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE="Release"
-
-inherit eutils cmake-utils
-
-MY_P="Sigil-${PV}-Code"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format."
-HOMEPAGE="http://code.google.com/p/sigil/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=x11-libs/qt-xmlpatterns-4.7.2
- >=x11-libs/qt-webkit-4.7.2
- >=x11-libs/qt-svg-4.7.2
- >=x11-libs/qt-gui-4.7.2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
- # use standard naming
- mv -f README.txt README
- mv -f ChangeLog.txt ChangeLog
- edos2unix ChangeLog README
-}
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index dcde30abf407..202e9f68c2fc 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -1,4 +1,3 @@
DIST QQWry.Dat.bz2 4114875 RMD160 646916f7ac234a95526f9e43cfca674c2b4b7bd1 SHA1 de7ff7208da0f889ec08911119948780d7ee4738 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83
DIST WyabdcRealPeopleTTS.tar.bz2 84329208 RMD160 9c9bd37cf85aaed8d5b090b2014c3122e98ba8e4 SHA1 056609ec9743bda105ff6db956b321436ae50b90 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870
DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f
-DIST stardict-3.0.3.tar.bz2 9147947 RMD160 4c63f3cf439a7c34829b371e75c16db97fb35fd1 SHA1 5043c0918963cd4d40e6d6289353f295766ec74f SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73
diff --git a/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch b/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
new file mode 100644
index 000000000000..630da35e83ff
--- /dev/null
+++ b/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
@@ -0,0 +1,20 @@
+--- trunk/src/mainwin.h 2006/08/08 12:44:42 1
++++ trunk/src/mainwin.h 2006/08/09 19:00:35 2
+@@ -68,8 +68,6 @@
+ static void on_main_menu_about_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
+ static void on_main_menu_quit_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
+
+- static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
+-
+ void LoadHistory(void);
+ void SaveHistory(void);
+ public:
+@@ -97,7 +95,7 @@
+ bool HasFocus() {
+ return GTK_WIDGET_HAS_FOCUS(GTK_COMBO(WordCombo)->entry);
+ }
+-
++ static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
+ };
+
+ class ListWin
diff --git a/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch b/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch
new file mode 100644
index 000000000000..44f92ee9884a
--- /dev/null
+++ b/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch
@@ -0,0 +1,13 @@
+Index: stardict-2.4.8/src/floatwin.cpp
+===================================================================
+--- stardict-2.4.8.orig/src/floatwin.cpp
++++ stardict-2.4.8/src/floatwin.cpp
+@@ -788,7 +788,7 @@ gboolean FloatWin::vButtonReleaseCallbac
+
+ gboolean FloatWin::vMotionNotifyCallback (GtkWidget * widget, GdkEventMotion * event , FloatWin *oFloatWin)
+ {
+- if (event->window == oFloatWin->FloatWindow->window || (event->state & GDK_BUTTON1_MASK))
++ if (event->state & GDK_BUTTON1_MASK)
+ {
+ gint x,y;
+ x = oFloatWin->press_window_x + (gint)(event->x_root) - oFloatWin->press_x_root;
diff --git a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch b/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch
deleted file mode 100644
index 86825555d9cb..000000000000
--- a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch is from OpenSUSE .src.rpm for the following crash on startup:
-
-ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
-
---- dict/src/lib/compositelookup.cpp
-+++ dict/src/lib/compositelookup.cpp
-@@ -50,8 +50,10 @@
- void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
- {
- NetDictRequest request(dict_id, key);
-- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
-- NetDictRequests.push_back(request);
-+ if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request))
-+ {
-+ NetDictRequests.push_back(request);
-+ }
- }
-
- /* returns true if got expected response */
diff --git a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch b/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch
deleted file mode 100644
index fd89243938eb..000000000000
--- a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/396219
-
---- dict/src/tomboykeybinder.h
-+++ dict/src/tomboykeybinder.h
-@@ -21,7 +21,7 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
-
--#include
-+#include
-
- G_BEGIN_DECLS
-
diff --git a/app-text/stardict/files/stardict-3.0.3-entry.patch b/app-text/stardict/files/stardict-3.0.3-entry.patch
deleted file mode 100644
index 38182b0c8e0b..000000000000
--- a/app-text/stardict/files/stardict-3.0.3-entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-warning: key "Encoding" in group "Desktop Entry" is deprecated
-error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension
-error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools
-
---- dict/data/stardict.desktop.in
-+++ dict/data/stardict.desktop.in
-@@ -1,11 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=StarDict
- _Comment=Lookup words
- Exec=stardict
- Terminal=false
- Type=Application
--Icon=stardict.png
-+Icon=stardict
- StartupNotify=true
--Categories=Utility;Dictionary;
-+Categories=Utility;Office;TextTools;Dictionary;
- X-GNOME-DocPath=stardict/stardict.xml
diff --git a/app-text/stardict/files/stardict-3.0.3-gcc46.patch b/app-text/stardict/files/stardict-3.0.3-gcc46.patch
deleted file mode 100644
index d85bc0de5ce0..000000000000
--- a/app-text/stardict/files/stardict-3.0.3-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/362299
-
---- dict/stardict-plugins/stardict-wordnet-plugin/scene.h
-+++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h
-@@ -25,6 +25,8 @@
- #ifndef __PHYSICS_H__
- #define __PHYSICS_H__
-
-+#include
-+
- #include "partic.h"
- #include "spring.h"
-
diff --git a/app-text/stardict/files/stardict-3.0.3-overflow.patch b/app-text/stardict/files/stardict-3.0.3-overflow.patch
deleted file mode 100644
index 482490105704..000000000000
--- a/app-text/stardict/files/stardict-3.0.3-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for:
-
-warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default]
-
---- tools/src/myspell2dic.c
-+++ tools/src/myspell2dic.c
-@@ -132,7 +132,7 @@ if (argc<3)
-
- fprintf(stderr, "Enter grammar language [Spanish]: ");
- fflush(stderr);
--fgets(lang, 100, stdin);
-+fgets(lang, 50, stdin);
- if ((p=strchr(lang, '\n'))!=NULL) *p=0;
- if (*lang==0) strcpy(lang, "Spanish");
-
---- tools/src/ooo2dict.c
-+++ tools/src/ooo2dict.c
-@@ -71,7 +71,7 @@ current2=malloc(10000);
-
- fprintf(stderr, "Enter thesaurus language [WordNet_English]: ");
- fflush(stderr);
--fgets(lang, 100, stdin);
-+fgets(lang, 50, stdin);
- if ((p=strchr(lang, '\n'))!=NULL) *p=0;
- if (*lang==0) strcpy(lang, "WordNet_English");
- F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt");
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index d698589231a4..ccb068646e6f 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -9,7 +9,6 @@
as Full-text translation, Net Dict.
- Build and install the stardict-editor utility
Enable text to speech synthesizer using espeak
engine
Enable text to speech synthesizer using festival
@@ -20,6 +19,5 @@
Enable QQWry plugin, which provides information (in
Chinese language) about geographical positions, owner, etc. for IP
addresses
- Build and install the extra stardict tools
diff --git a/app-text/stardict/stardict-3.0.1-r2.ebuild b/app-text/stardict/stardict-3.0.1-r2.ebuild
index f94aab035b16..fbf8c41f1703 100644
--- a/app-text/stardict/stardict-3.0.1-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.6 2012/01/13 17:20:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.5 2011/03/27 12:23:55 nirbheek Exp $
EAPI="2"
-inherit gnome2 eutils autotools toolchain-funcs
+inherit gnome2 eutils autotools
# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
# their indexes seem to be in a different format. So we'll keep them
@@ -59,7 +59,7 @@ src_prepare() {
}
src_configure() {
- tc-export PKG_CONFIG
+ export PKG_CONFIG=$(type -P pkg-config)
# Festival plugin crashes, bug 188684. Disable for now.
G2CONF="$(use_enable gnome gnome-support)
$(use_enable spell)
diff --git a/app-text/stardict/stardict-3.0.1-r3.ebuild b/app-text/stardict/stardict-3.0.1-r3.ebuild
index 8b32c179e653..87102d8f3226 100644
--- a/app-text/stardict/stardict-3.0.1-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.5 2012/01/13 17:20:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.4 2011/09/21 23:55:12 dirtyepic Exp $
EAPI="2"
-inherit gnome2 eutils autotools toolchain-funcs
+inherit gnome2 eutils autotools
# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
# their indexes seem to be in a different format. So we'll keep them
@@ -61,7 +61,7 @@ src_prepare() {
}
src_configure() {
- tc-export PKG_CONFIG
+ export PKG_CONFIG=$(type -P pkg-config)
# Festival plugin crashes, bug 188684. Disable for now.
G2CONF="$(use_enable gnome gnome-support)
$(use_enable spell)
diff --git a/app-text/stardict/stardict-3.0.3-r1.ebuild b/app-text/stardict/stardict-3.0.3-r1.ebuild
deleted file mode 100644
index 4ecc6e78880c..000000000000
--- a/app-text/stardict/stardict-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r1.ebuild,v 1.4 2012/01/28 16:05:34 ssuominen Exp $
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-EAPI=4
-
-GNOME2_LA_PUNT=yes
-GCONF_DEBUG=no
-
-inherit eutils gnome2
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://code.google.com/p/stardict-3/"
-SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
- pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="editor espeak gnome gucharmap qqwry pronounce spell"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
- dev-libs/libsigc++:2
- sys-libs/zlib
- >=x11-libs/gtk+-2.20:2
- editor? (
- dev-libs/libpcre
- dev-libs/libxml2
- virtual/mysql
- )
- gnome? (
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- >=gnome-base/gconf-2
- >=gnome-base/orbit-2
- )
- gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
- spell? ( >=app-text/enchant-1.2 )"
-RDEPEND="${COMMON_DEPEND}
- espeak? ( >=app-accessibility/espeak-1.29 )"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-RESTRICT="test"
-
-pkg_setup() {
- G2CONF="$(use_enable editor tools)
- --disable-scrollkeeper
- $(use_enable spell)
- $(use_enable gucharmap)
- --disable-festival
- $(use_enable espeak)
- $(use_enable qqwry)
- --disable-updateinfo
- $(use_enable gnome gnome-support)
- --disable-gpe-support
- --disable-schemas-install"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-correct-glib-include.patch \
- "${FILESDIR}"/${P}-entry.patch \
- "${FILESDIR}"/${P}-gcc46.patch \
- "${FILESDIR}"/${P}-compositelookup_cpp.patch \
- "${FILESDIR}"/${P}-overflow.patch
-
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
-
- if use qqwry; then
- insinto /usr/share/stardict/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-}
-
-pkg_postinst() {
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install stardict dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog
- elog " emerge -s stardict-"
-
- gnome2_pkg_postinst
-}
diff --git a/app-text/stardict/stardict-3.0.3-r2.ebuild b/app-text/stardict/stardict-3.0.3-r2.ebuild
deleted file mode 100644
index c97fc5c40ebb..000000000000
--- a/app-text/stardict/stardict-3.0.3-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.1 2012/01/22 22:50:25 ssuominen Exp $
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-# NOTE: Festival plugin crashes, bug 188684. Disable for now.
-
-EAPI=4
-
-GNOME2_LA_PUNT=yes
-GCONF_DEBUG=no
-
-inherit eutils gnome2
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://code.google.com/p/stardict-3/"
-SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
- pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
- dev-libs/libsigc++:2
- sys-libs/zlib
- >=x11-libs/gtk+-2.20:2
- gnome? (
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- >=gnome-base/gconf-2
- >=gnome-base/orbit-2
- )
- gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
- spell? ( >=app-text/enchant-1.2 )
- tools? (
- dev-libs/libpcre
- dev-libs/libxml2
- virtual/mysql
- )"
-RDEPEND="${COMMON_DEPEND}
- espeak? ( >=app-accessibility/espeak-1.29 )"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-RESTRICT="test"
-
-pkg_setup() {
- G2CONF="$(use_enable tools)
- --disable-scrollkeeper
- $(use_enable spell)
- $(use_enable gucharmap)
- --disable-festival
- $(use_enable espeak)
- $(use_enable qqwry)
- --disable-updateinfo
- $(use_enable gnome gnome-support)
- --disable-gpe-support
- --disable-schemas-install"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-correct-glib-include.patch \
- "${FILESDIR}"/${P}-entry.patch \
- "${FILESDIR}"/${P}-gcc46.patch \
- "${FILESDIR}"/${P}-compositelookup_cpp.patch \
- "${FILESDIR}"/${P}-overflow.patch
-
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
-
- if use qqwry; then
- insinto /usr/share/stardict/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-
- # noinst_PROGRAMS with stardict_ prefix from tools/src/Makefile.am wrt #292773
- if use tools; then
- local app
- local apps="pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic
- wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
- xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
- tabfile cedict edict duden stardict-dict-update degb2utf frgb2utf
- jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
- stardict2txt stardict-verify fest2dict i2e2dict downloadwiki
- ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
- xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
- resdatabase2dir dir2resdatabase stardict-index stardict-text2bin
- stardict-bin2text stardict-repair"
-
- for app in ${apps}; do
- newbin tools/src/${app} ${PN}_${app}
- done
- fi
-}
-
-pkg_postinst() {
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install stardict dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog
- elog " emerge -s stardict-"
-
- gnome2_pkg_postinst
-}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index bf07e5fc670b..8d0a6423b844 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,2 +1 @@
DIST t1utils-1.36.tar.gz 164812 RMD160 77ef2611a2fdd039e7972df2586bc3072d4beb09 SHA1 474143e828eed4755fd51bbcbde1cb906114cadb SHA256 9fd5338f5fef7a1d82a449b1bc9ce9570ba2aac11e858af312e93e37d18034f3
-DIST t1utils-1.37.tar.gz 169956 RMD160 da4a88c0d1b06b1d334525c56750c4743b5d678c SHA1 6d06a0e739d94eea6cd4a31e9a87f773c4054a3f SHA256 42bdce77aaf12b33ca6d193e01a2d2c0012f755435a6d25921f94733ee61cec3
diff --git a/app-text/t1utils/t1utils-1.37.ebuild b/app-text/t1utils/t1utils-1.37.ebuild
deleted file mode 100644
index 1225b9ec0e59..000000000000
--- a/app-text/t1utils/t1utils-1.37.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.37.ebuild,v 1.1 2012/01/09 15:48:59 aballier Exp $
-
-IUSE=""
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- !
-
-
-
- blueness@gentoo.org
- Anthony G. Basile
-
-
- bugs@bergstroem.nu
- Johan Bergström
-
-
diff --git a/app-text/xapian-omega/xapian-omega-1.2.8.ebuild b/app-text/xapian-omega/xapian-omega-1.2.8.ebuild
deleted file mode 100644
index 399c86989072..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.8.ebuild,v 1.3 2012/02/05 11:39:29 blueness Exp $
-
-EAPI="4"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend."
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.gz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/xapian-${PV}
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-text/xml2/Manifest b/app-text/xml2/Manifest
index b413e095a1f4..7e3788387c67 100644
--- a/app-text/xml2/Manifest
+++ b/app-text/xml2/Manifest
@@ -1,2 +1 @@
DIST xml2-0.4.tar.gz 83449 RMD160 06f9c2eed54ad51f0f938ebceee60fa5a3cb878f SHA1 735e7f6c336bd88dd1ab12bdea84e7cf1df5a36d SHA256 b0817ee453ca4a28e170a1f5ef8d52e43a905a946b77ed2a01ac0d48419e5367
-DIST xml2-0.5.tar.gz 86318 RMD160 bb4e7d93703f4724b0ea812a21bfa96e082eab51 SHA1 e954311383d053747ae0c224b12dfddb8a1c0e74 SHA256 e3203a5d3e5d4c634374e229acdbbe03fea41e8ccdef6a594a3ea50a50d29705
diff --git a/app-text/xml2/xml2-0.5.ebuild b/app-text/xml2/xml2-0.5.ebuild
deleted file mode 100644
index 1b0114ff5652..000000000000
--- a/app-text/xml2/xml2-0.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/xml2-0.5.ebuild,v 1.1 2012/01/21 06:48:03 radhermit Exp $
-
-EAPI=4
-
-DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format."
-HOMEPAGE="http://dan.egnor.name/xml2"
-SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
diff --git a/app-text/xmldiff/xmldiff-0.6.10.ebuild b/app-text/xmldiff/xmldiff-0.6.10.ebuild
index 4fcb3ec13fa5..0387615b05eb 100644
--- a/app-text/xmldiff/xmldiff-0.6.10.ebuild
+++ b/app-text/xmldiff/xmldiff-0.6.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/xmldiff-0.6.10.ebuild,v 1.7 2011/12/18 22:11:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmldiff/xmldiff-0.6.10.ebuild,v 1.6 2011/10/23 17:23:31 armin76 Exp $
EAPI="3"
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86 ~x86-linux"
IUSE=""
DEPEND="dev-python/pyxml"
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 7c29edfbdfac..dd526ff80b43 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -6,4 +6,3 @@ DIST xmlstarlet-1.0.6.tar.gz 378860 RMD160 c9334ea7d56bd8acd442637eecd6346159652
DIST xmlstarlet-1.2.0.tar.gz 382893 RMD160 1b371ed1fdf8a42c9fc1d9a02116c9fa69bbceb2 SHA1 6016d4b2dee8805044c3522c65f7cf3449825cf5 SHA256 4d24c042e5ba2ce526e0a0213490ea652590da57926828b418ae0d30a35248ef
DIST xmlstarlet-1.2.1.tar.gz 383678 RMD160 ae5560dcd473aea151d5124a939030b5a848eded SHA1 04f534bed18fa45200822f073c2aad1ff02d0efe SHA256 ac63b75c6175d37f1097d1d9b257adffb7e004e3de536e47ce6478559bc07fe0
DIST xmlstarlet-1.3.0.tar.gz 385520 RMD160 d9f6a458af7b8d6e8c6d964b8260f96fcf70bb9c SHA1 781d3c067b8e182da77865802af44b37ca586e39 SHA256 81ebdcd81cd44f908d85fc5fb3acf9dd174eb48ef866f826fbd6afbf25f31343
-DIST xmlstarlet-1.3.1.tar.gz 385752 RMD160 6fc83601a28a1cfe78048b42edb79aeb222e030b SHA1 e78fe51bd2a420cd5ddcecf989d369745a8473d8 SHA256 effe9aba3f8003d1da2b07aa54af4f3b5956bd09f061c499442415278425885b
diff --git a/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild
deleted file mode 100644
index f7d1241819e5..000000000000
--- a/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild,v 1.1 2012/01/14 22:05:38 sping Exp $
-
-EAPI="4"
-
-DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.27
- >=dev-libs/libxslt-1.1.9
- dev-libs/libgcrypt
- virtual/libiconv"
-
-DEPEND="${RDEPEND}
- sys-apps/sed"
-
-src_configure() {
- econf --disable-static-libs
-}
-
-src_install() {
- default
-
- dosym xml /usr/bin/xmlstarlet
- dohtml -r doc/*
-}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index b4ea8e81507f..560d068b20d3 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,3 +1,4 @@
+DIST xmlto-0.0.22.tar.bz2 103939 RMD160 7e2bf68d114473a6ca5162c2d88eaf46ed3a5f46 SHA1 dfe5a5a80bfd814d9e048be55cf8e3d176ad2d0a SHA256 afccc4712f22e0b1773d45803187d7998319662766b10a963f5452d83c0324aa
+DIST xmlto-0.0.23.tar.bz2 105201 RMD160 bbf1e1ee8674a7faeb10643f74a6025d4421d66e SHA1 69aab42d941089db3edb32987299290e2472f675 SHA256 a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4
DIST xmlto-0.0.24-mans.tar.bz2 4575 RMD160 6687bf4d59b823f416b37b179a24ed6d9a315227 SHA1 e5c44ec88dd3e473d0be5151008b00d5fe190dc1 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b
DIST xmlto-0.0.24.tar.bz2 111860 RMD160 c3aa05569571aa7c2acbe0cc93c136a0d77a7d80 SHA1 68b1664e9ba4d76c37c373f2f0082d62c41506c8 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13
-DIST xmlto-0.0.25.tar.bz2 116496 RMD160 cba4f99be538cd08b73e9b1a6956c318f132284f SHA1 5d1aecd59d519066f94b4591722767c4e41bdc0f SHA256 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536
diff --git a/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
new file mode 100644
index 000000000000..eec3d6d7210f
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
@@ -0,0 +1,19 @@
+Index: xmlto-0.0.22/Makefile.am
+===================================================================
+--- xmlto-0.0.22.orig/Makefile.am
++++ xmlto-0.0.22/Makefile.am
+@@ -67,11 +67,9 @@ EXTRA_DIST = xmlto.spec \
+ doc/xmlif.xml \
+ xmlto.mak
+
+-$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
+- for xml in xmlif.xml xmlto.xml; do \
+- FORMAT_DIR=$(top_srcdir)/format \
+- $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
+- done || ( RC=$$?; exit $$RC )
++man/man1/%.1: doc/%.xml
++ FORMAT_DIR=$(top_srcdir)/format \
++ $(BASH) ./xmlto -o $(dir $@) man $<
+
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
+ TESTS = xmlif/test/run-test
diff --git a/app-text/xmlto/xmlto-0.0.22.ebuild b/app-text/xmlto/xmlto-0.0.22.ebuild
new file mode 100644
index 000000000000..45f5b9f84226
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.22.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.15 2009/12/21 03:53:53 vapier Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="latex"
+
+RDEPEND="app-shells/bash
+ || ( sys-apps/which sys-freebsd/freebsd-ubin )
+ dev-libs/libxslt
+ >=app-text/docbook-xsl-stylesheets-1.62.0-r1
+ ~app-text/docbook-xml-dtd-4.2
+ || ( sys-apps/util-linux
+ app-misc/getopt )
+ || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp
+ sys-freebsd/freebsd-ubin )
+ latex? ( >=app-text/passivetex-1.25
+ >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+ sys-devel/flex"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch \
+ "${FILESDIR}"/${P}-parallelmake.patch
+ eautoreconf
+}
+
+src_configure() {
+ has_version sys-apps/util-linux || export GETOPT="getopt-long"
+ econf --prefix=/usr
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/*.xml
+}
diff --git a/app-text/xmlto/xmlto-0.0.23.ebuild b/app-text/xmlto/xmlto-0.0.23.ebuild
new file mode 100644
index 000000000000..fba72ced52e9
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.23.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.23.ebuild,v 1.8 2011/07/10 23:46:16 halcy0n Exp $
+
+EAPI=3
+
+inherit eutils autotools
+
+DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND="app-shells/bash
+ || ( sys-apps/which sys-freebsd/freebsd-ubin )
+ dev-libs/libxslt
+ >=app-text/docbook-xsl-stylesheets-1.62.0-r1
+ ~app-text/docbook-xml-dtd-4.2
+ || ( sys-apps/util-linux app-misc/getopt )
+ || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+ latex? ( >=app-text/passivetex-1.25
+ >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+ sys-devel/flex"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
+ "${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
+ eautoreconf
+}
+
+src_configure() {
+ export BASH
+ has_version sys-apps/util-linux || export GETOPT="getopt-long"
+ econf --prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
+ dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/*.xml
+}
diff --git a/app-text/xmlto/xmlto-0.0.24-r1.ebuild b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
index fef2c6d0dd61..26baedf026ed 100644
--- a/app-text/xmlto/xmlto-0.0.24-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.7 2012/01/12 16:53:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.6 2011/11/07 00:23:41 ranger Exp $
EAPI="3"
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="latex"
RDEPEND="app-shells/bash
diff --git a/app-text/xmlto/xmlto-0.0.24.ebuild b/app-text/xmlto/xmlto-0.0.24.ebuild
new file mode 100644
index 000000000000..3484acb6f8f7
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.24.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24.ebuild,v 1.1 2011/07/30 22:10:37 patrick Exp $
+
+EAPI=3
+
+inherit eutils autotools
+
+DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND="app-shells/bash
+ || ( sys-apps/which sys-freebsd/freebsd-ubin )
+ dev-libs/libxslt
+ >=app-text/docbook-xsl-stylesheets-1.62.0-r1
+ ~app-text/docbook-xml-dtd-4.2
+ || ( sys-apps/util-linux app-misc/getopt )
+ || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+ latex? ( >=app-text/passivetex-1.25
+ >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+ sys-devel/flex"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
+ "${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
+ eautoreconf
+}
+
+src_configure() {
+ export BASH
+ has_version sys-apps/util-linux || export GETOPT="getopt-long"
+ econf --prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
+ dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/*.xml
+}
diff --git a/app-text/xmlto/xmlto-0.0.25.ebuild b/app-text/xmlto/xmlto-0.0.25.ebuild
deleted file mode 100644
index b90a628b4b4c..000000000000
--- a/app-text/xmlto/xmlto-0.0.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.1 2012/01/12 17:11:36 ssuominen Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
- app-text/docbook-xml-dtd:4.2
- app-shells/bash
- dev-libs/libxslt
- sys-apps/grep
- || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
- || ( sys-apps/util-linux app-misc/getopt )
- || ( sys-apps/which sys-freebsd/freebsd-ubin )
- latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-}
-
-src_configure() {
- export BASH
- has_version sys-apps/util-linux || export GETOPT=getopt-long
- econf
-}
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
index 1bb146a07088..f3e4455c8cf4 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.5 2012/01/04 17:52:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.4 2011/12/15 12:22:40 ago Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gento
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
IUSE="+pdf"
COMMONDEPEND="
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
index f7b2b590a7ea..d333171750ec 100644
--- a/app-vim/automatictexplugin/Manifest
+++ b/app-vim/automatictexplugin/Manifest
@@ -1,4 +1,3 @@
DIST AutomaticTexPlugin_10.5.tar.gz 373006 RMD160 510c604d152c03214d1d55bb11f03df6a3af837c SHA1 49879ad5fec34e33e45cf7a6ed23316742f849e9 SHA256 de436a3863256e8cd5202a38b1afb1fccc5a944124126e33d855ac96428cfb32
DIST AutomaticTexPlugin_10.6.1.tar.gz 380428 RMD160 155210f33f4d8f10680c3da0b8eeedfe9b9e3cfc SHA1 8cbd732a3451111f30b62bbdf922c77bc4c11c68 SHA256 8f8caa341ac96d963fcc77eeced6b681ff4f68a18b0ca9b54b41a642920fb834
DIST AutomaticTexPlugin_10.6.3.tar.gz 384575 RMD160 31fec992d9c3e1f78214ded93408001449fbf525 SHA1 f3cb84dfae331810e78684694590fc28d9c5880e SHA256 56343dad61dce1663657f839c5de0a8b010bce34ffee0209ac62598a1350ab3f
-DIST AutomaticTexPlugin_10.6.4.tar.gz 385551 RMD160 3498baebcbad639290a0c9b77b83583ea06a3d40 SHA1 06d31d7c269439406789bd68087464b4925a4093 SHA256 1cb8523cc5a376969c33a765ba95dc2b9576bde79509c8792eaf5c9c70ffaef1
diff --git a/app-vim/automatictexplugin/automatictexplugin-10.6.4.ebuild b/app-vim/automatictexplugin/automatictexplugin-10.6.4.ebuild
deleted file mode 100644
index f2a1b0246f10..000000000000
--- a/app-vim/automatictexplugin/automatictexplugin-10.6.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-10.6.4.ebuild,v 1.1 2011/12/29 20:30:24 radhermit Exp $
-
-EAPI="4"
-VIM_PLUGIN_VIM_VERSION="7.3"
-
-inherit vim-plugin
-
-MY_P="AutomaticTexPlugin_${PV}"
-DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
-HOMEPAGE="http://atp-vim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atp-vim/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
-
-RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
- !app-vim/vim-latex
- app-vim/align
- app-text/wdiff
- >=dev-lang/python-2.7
- dev-python/psutil
- dev-tex/latexmk
- dev-tex/detex
- virtual/tex-base"
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
index 686d1b301def..27edfa5a06a0 100644
--- a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild,v 1.5 2012/01/31 14:32:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild,v 1.4 2011/12/14 09:06:02 phajdan.jr Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
LICENSE="as-is"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/calendar/calendar-2.2.ebuild b/app-vim/calendar/calendar-2.2.ebuild
index 63b71006c2ab..92b7aab11021 100644
--- a/app-vim/calendar/calendar-2.2.ebuild
+++ b/app-vim/calendar/calendar-2.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-2.2.ebuild,v 1.6 2011/12/17 19:02:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-2.2.ebuild,v 1.5 2011/01/07 22:10:18 ranger Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: calendar window"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
LICENSE="vim"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/calendar/calendar-2.5.ebuild b/app-vim/calendar/calendar-2.5.ebuild
index d0da291fca78..8c0496f13f33 100644
--- a/app-vim/calendar/calendar-2.5.ebuild
+++ b/app-vim/calendar/calendar-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-2.5.ebuild,v 1.5 2012/02/01 20:54:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/calendar/calendar-2.5.ebuild,v 1.3 2011/12/14 09:16:01 phajdan.jr Exp $
EAPI=3
@@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: calendar window"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
LICENSE="vim"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/colorschemes/colorschemes-20111107.ebuild b/app-vim/colorschemes/colorschemes-20111107.ebuild
index ed62b08a7565..007a54ed4b6c 100644
--- a/app-vim/colorschemes/colorschemes-20111107.ebuild
+++ b/app-vim/colorschemes/colorschemes-20111107.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/colorschemes/colorschemes-20111107.ebuild,v 1.6 2012/02/01 20:55:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/colorschemes/colorschemes-20111107.ebuild,v 1.4 2011/12/14 09:16:45 phajdan.jr Exp $
EAPI="4"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.vim.org/"
SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
LICENSE="vim GPL-2 public-domain as-is"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/cvsmenu/cvsmenu-1.147.ebuild b/app-vim/cvsmenu/cvsmenu-1.147.ebuild
index 07301bcbe5e2..a8ea893f893b 100644
--- a/app-vim/cvsmenu/cvsmenu-1.147.ebuild
+++ b/app-vim/cvsmenu/cvsmenu-1.147.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/cvsmenu/cvsmenu-1.147.ebuild,v 1.6 2012/02/01 21:02:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/cvsmenu/cvsmenu-1.147.ebuild,v 1.5 2011/12/14 09:24:38 phajdan.jr Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: CVS(NT) integration script"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1245"
LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
# Note, this comes from CVS on sf.net
diff --git a/app-vim/genindent/genindent-1.1.ebuild b/app-vim/genindent/genindent-1.1.ebuild
index 784a943e2cc7..5cf542f070b5 100644
--- a/app-vim/genindent/genindent-1.1.ebuild
+++ b/app-vim/genindent/genindent-1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/genindent/genindent-1.1.ebuild,v 1.2 2012/02/03 14:44:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/genindent/genindent-1.1.ebuild,v 1.1 2010/11/14 07:09:24 radhermit Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: library for simplifying indent files"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=678"
LICENSE="as-is"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 57bc99f8de2f..cb61c0869fc7 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,2 +1 @@
DIST gentoo-syntax-20101212.tar.bz2 18927 RMD160 f17bc03506037dd1c5236ec97a3292b4a4e65f5a SHA1 a1d29bb9cc93b1307ef4c665127d4fceacfa363d SHA256 70bb59acb00a726941e43d8f99d63ee9feb9335de9eb6d36e66917f2a2d3416f
-DIST gentoo-syntax-20120109.tar.bz2 19526 RMD160 17630802e8bc1c59be9e2d37b11e7584a9c99d1d SHA1 b2d478ce3646ea8126ea9c25e5223b4d2e810744 SHA256 dabab1a569ec84286d15feb93652f044888d92c0e0c8c1f298f8dec80fcab4c5
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
deleted file mode 100644
index 60d2a7431ea0..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.1 2012/01/10 04:37:33 radhermit Exp $
-
-EAPI=4
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files syntax highlighting, filetype and indent settings"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
- if use ignore-glep31 ; then
- for f in ftplugin/*.vim ; do
- ebegin "Removing UTF-8 rules from ${f} ..."
- sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
- || die "waah! bad sed voodoo. need more goats."
- eend $?
- done
- fi
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
- if use ignore-glep31 1>/dev/null ; then
- ewarn "You have chosen to disable the rules which ensure GLEP 31"
- ewarn "compliance. When editing ebuilds, please make sure you get"
- ewarn "the character set correct."
- else
- elog "Note for developers and anyone else who edits ebuilds:"
- elog " This release of gentoo-syntax now contains filetype rules to set"
- elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
- elog " If you find this feature breaks things, please submit a bug and"
- elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
- elog " flag to remove these rules."
- fi
- echo
-}
diff --git a/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild b/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
index 079bae50aa49..6cbfb9c53003 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild,v 1.6 2012/02/01 20:46:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild,v 1.5 2011/12/04 18:27:15 armin76 Exp $
EAPI=3
@@ -9,5 +9,5 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1000"
LICENSE="as-is"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
diff --git a/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
index 175cd4bf3b12..e18260b83456 100644
--- a/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
+++ b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild,v 1.5 2012/02/01 21:03:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild,v 1.1 2010/11/14 07:10:47 radhermit Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: SELinux type enforcement policy syntax"
HOMEPAGE="http://www.cip.ifi.lmu.de/~bleher/selinux/"
LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/supertab/supertab-1.6.ebuild b/app-vim/supertab/supertab-1.6.ebuild
index 5907860138aa..153c057236a3 100644
--- a/app-vim/supertab/supertab-1.6.ebuild
+++ b/app-vim/supertab/supertab-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/supertab/supertab-1.6.ebuild,v 1.6 2012/02/01 20:48:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/supertab/supertab-1.6.ebuild,v 1.5 2011/12/14 08:52:53 phajdan.jr Exp $
EAPI="4"
inherit vim-plugin
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1643"
SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 ~mips ppc x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="supertab"
diff --git a/app-vim/vcscommand/vcscommand-1.99.45.ebuild b/app-vim/vcscommand/vcscommand-1.99.45.ebuild
index 3543746ad743..4273d1bec8b8 100644
--- a/app-vim/vcscommand/vcscommand-1.99.45.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.45.ebuild,v 1.5 2012/02/01 20:58:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.45.ebuild,v 1.4 2011/12/14 09:17:25 phajdan.jr Exp $
EAPI=4
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="!app-vim/cvscommand"
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
index 8b077d58694a..1b06e8cee28a 100644
--- a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.5 2012/02/01 21:00:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.4 2011/12/14 09:27:41 phajdan.jr Exp $
inherit vim-plugin
DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
LICENSE="as-is"
-KEYWORDS="amd64 ~hppa ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-xemacs/gentoo-syntax/Manifest b/app-xemacs/gentoo-syntax/Manifest
index 562be9b4113f..4987f98fa8f0 100644
--- a/app-xemacs/gentoo-syntax/Manifest
+++ b/app-xemacs/gentoo-syntax/Manifest
@@ -1,4 +1,3 @@
DIST gentoo-syntax-1.16.tar.bz2 19086 RMD160 5e83bbde3676e7d7dedd7d9f2113a49f25ec6f5b SHA1 e015c4f26ab6023b42941ee2638cee8c00654c11 SHA256 0f8ad69e2f663156a343bd620d7d5ade87259c75e2cac79c6709d005ca23c5cc
DIST gentoo-syntax-1.17.tar.bz2 20238 RMD160 88449201daebb60d7292ddc92cab1c39c2abc8f2 SHA1 5e78d3437493b41d32bd2137e59b46569c9d40bf SHA256 fe5743de2cb2326448eba9335f4c64e07a84269ec9703fb8a3b89522241b4b33
DIST gentoo-syntax-1.18.tar.bz2 20819 RMD160 362c8557aba26af3bd4fd7c8deb73140292ba5a9 SHA1 f87cf81504dd7506f090967543aab8411aca17f9 SHA256 c05a935ce7803595a888c77c37c2f16dd9fe5da31418bc8f9b5940be9c08fb14
-DIST gentoo-syntax-1.19.tar.bz2 21385 RMD160 48b36dafaa1fdb1cca3647cba33b3f4079c6de01 SHA1 c612288be9f059d78fc41b791d60ac3ed7220ba1 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058
diff --git a/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild b/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
index dd202e97ae80..31bb94ba8ce0 100644
--- a/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
+++ b/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild,v 1.3 2012/01/04 18:20:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.18.ebuild,v 1.1 2010/10/23 07:28:30 graaff Exp $
inherit xemacs-elisp eutils
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=app-editors/xemacs-21.4.20-r5
diff --git a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild b/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
deleted file mode 100644
index 31e61838a7f2..000000000000
--- a/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.1 2011/12/24 13:54:35 graaff Exp $
-
-inherit xemacs-elisp eutils
-
-DESCRIPTION="An Emacs mode for editing ebuilds and other Gentoo specific files."
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
- app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
diff --git a/dev-cpp/atkmm/atkmm-2.22.6.ebuild b/dev-cpp/atkmm/atkmm-2.22.6.ebuild
index c759605a581b..63c629b397ee 100644
--- a/dev-cpp/atkmm/atkmm-2.22.6.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.22.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.6.ebuild,v 1.5 2012/01/18 19:58:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.6.ebuild,v 1.1 2011/10/26 17:53:33 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=dev-cpp/glibmm-2.24:2[doc?]
diff --git a/dev-cpp/bakery/Manifest b/dev-cpp/bakery/Manifest
new file mode 100644
index 000000000000..947c17a775c3
--- /dev/null
+++ b/dev-cpp/bakery/Manifest
@@ -0,0 +1,2 @@
+DIST bakery-2.4.4.tar.bz2 382214 RMD160 b1f82904a1c133007d8d79cf5c9a4fd98d6789be SHA1 29a8066b2c1502df30cc20ed59f52dccbde8c22d SHA256 04fccb599d28884214da9a6ed71e195141baa4e48da09c1f80fc2ec5440f02b9
+DIST bakery-2.6.3.tar.bz2 1502637 RMD160 41089a0c9664933a9d67f97cf1d05d70d4038961 SHA1 a379f36983b203c3759a05d49253fbe2c4d2bd60 SHA256 7e9cfb3a6b44fd09591ed1da1caa101591959841bb3f2802b19854dbd7a20433
diff --git a/dev-cpp/bakery/bakery-2.4.4.ebuild b/dev-cpp/bakery/bakery-2.4.4.ebuild
new file mode 100644
index 000000000000..30274b522d72
--- /dev/null
+++ b/dev-cpp/bakery/bakery-2.4.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/bakery/bakery-2.4.4.ebuild,v 1.3 2011/03/29 06:09:56 nirbheek Exp $
+
+EAPI="1"
+
+inherit autotools gnome2
+
+DESCRIPTION="Bakery is a C++ Framework for creating GNOME applications using gtkmm."
+HOMEPAGE="http://bakery.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-cpp/gtkmm-2.10:2.4
+ >=dev-cpp/gconfmm-2.6
+ >=dev-cpp/libglademm-2.4:2.4
+ >=dev-cpp/libxmlpp-2.8:2.6
+ >=dev-cpp/gnome-vfsmm-2.6:1.1"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.25
+ >=dev-util/pkgconfig-0.12"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+pkg_setup() {
+ G2CONF="--disable-option-checking --disable-maemo"
+}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ sed -i "/AM_INIT/ a \AM_MAINTAINER_MODE" configure.in || \
+ die "sed maintainer-mode failed"
+
+ # should be configured via configure switch
+ if ! use examples ; then
+ sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.am || \
+ die "sed Makefile.am failed"
+ fi
+
+ eautoreconf
+}
+
+src_install() {
+ gnome2_src_install
+ use doc && dohtml docs/*.html docs/reference/*.html
+}
diff --git a/dev-cpp/bakery/bakery-2.6.3.ebuild b/dev-cpp/bakery/bakery-2.6.3.ebuild
new file mode 100644
index 000000000000..932a9b690027
--- /dev/null
+++ b/dev-cpp/bakery/bakery-2.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/bakery/bakery-2.6.3.ebuild,v 1.2 2011/03/29 06:08:38 nirbheek Exp $
+
+EAPI="2"
+
+inherit gnome2
+
+DESCRIPTION="Bakery is a C++ Framework for creating GNOME applications using gtkmm."
+HOMEPAGE="http://bakery.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="2.6"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-cpp/gtkmm-2.10:2.4
+ >=dev-cpp/gconfmm-2.6
+ >=dev-cpp/libglademm-2.4:2.4
+ >=dev-cpp/libxmlpp-2.6:2.6
+ >=dev-cpp/glibmm-2.16:2"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.25
+ >=dev-util/pkgconfig-0.12"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # should be configured via configure switch
+ if ! use examples ; then
+ sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || \
+ die "sed Makefile.am failed"
+ fi
+}
+
+src_configure() {
+ G2CONF="${G2CONF} --disable-option-checking --disable-maemo"
+ gnome2_src_configure
+}
+
+src_install() {
+ gnome2_src_install
+ use doc && dohtml docs/*.html docs/reference/*.html
+}
diff --git a/dev-cpp/bakery/metadata.xml b/dev-cpp/bakery/metadata.xml
new file mode 100644
index 000000000000..eaf81c3eda49
--- /dev/null
+++ b/dev-cpp/bakery/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+gnome-mm
+
+Bakery is a C++ Application Framework for use with gtkmm.This application
+provides a Document/View architecture but it doesn't force you to use the whole
+architecture, can use XML as a document storage format, it provides default
+functionality, which can be easily customized, makes it easy to start developing
+GNOME applications, gives your application structure and contains a few utility
+classes.
+
+
+
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index a4bd9fdb43d6..2d58286b06ad 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,4 +1,5 @@
+DIST eigen-2.0.13.tar.bz2 367015 RMD160 4cb4bc279ef89790da32a48962597184dcb29928 SHA1 593d89d0d45b60a6a9f12cf40b5c2601eb5b4543 SHA256 bc63ae16ad95b18d5a6c51f4f17082fa7389539e103e9d2b3d21680f9a558ab1
+DIST eigen-2.0.15.tar.bz2 367487 RMD160 92b6d3bc4ed87c9965eddc1557feb67e454199cf SHA1 834aabc3df9b4e67dc79f7f1926c3e0a2c77b5b1 SHA256 0361f687cecba6312f94462efc16bb9203ac23556ebf8b11e20ad7a7f9ac2f3b
DIST eigen-2.0.16.tar.bz2 367748 RMD160 28da1dc4a26b02b059ed26219944f122918bb7d2 SHA1 d0fad8b182280c378f413d1908ad611c921f40c2 SHA256 0c9379d6bfdde78c5a1794e0bdfcc875688bea4a9ff2e40b8a631a8c4981687b
-DIST eigen-2.0.17.tar.bz2 367890 RMD160 183c8f7ee3c85ccb447fdcefa3a366f06cca351b SHA1 461546be98b964d8d5d2adb0f1c31ba0e42efc38 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960
DIST eigen-3.0.0.tar.bz2 899931 RMD160 05d15d1e6159bb7abe1a970bba2648211f8894bd SHA1 f0c6243c605e158968a96a6b502c9607cd1688c7 SHA256 e60efc5b18331b2e6c23ac5a8180a13b987f0aeb6fc6dca316ae338fa0513931
DIST eigen-3.0.2.tar.bz2 955760 RMD160 7686dc72ac8ee96cb055d4bca8cd6da526d5780c SHA1 2bcc7a6b415f5c75b5e061a399c3f9ab9aadb708 SHA256 cd76169b426f89b667db24beaaaf2d982b48664d9615ad781bdf9e83f0be5e5f
diff --git a/dev-cpp/eigen/eigen-2.0.13.ebuild b/dev-cpp/eigen/eigen-2.0.13.ebuild
new file mode 100644
index 000000000000..04112a597e54
--- /dev/null
+++ b/dev-cpp/eigen/eigen-2.0.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-2.0.13.ebuild,v 1.9 2011/03/25 16:01:28 jlec Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="2"
+IUSE="debug doc examples"
+
+COMMON_DEPEND="
+ examples? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-cpp/eigen:0
+"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+ # benchmarks (BTL) brings up damn load of external deps including fortran
+ # compiler
+ # library hangs up complete compilation proccess, test later
+ mycmakeargs=(
+ -DEIGEN_BUILD_LIB=OFF
+ -DEIGEN_BUILD_BTL=OFF
+ $(cmake-utils_use examples EIGEN_BUILD_DEMOS)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ cd "${CMAKE_BUILD_DIR}"
+ emake doc || die "building documentation failed"
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use doc; then
+ cd "${CMAKE_BUILD_DIR}"/doc
+ dohtml -r html/* || die "dohtml failed"
+ fi
+ if use examples; then
+ cd "${CMAKE_BUILD_DIR}"/demos
+ dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed"
+ fi
+}
+
+src_test() {
+ mycmakeargs=(
+ -DEIGEN_BUILD_TESTS=ON
+ -DEIGEN_TEST_NO_FORTRAN=ON
+ )
+ cmake-utils_src_configure
+ cmake-utils_src_compile
+ cmake-utils_src_test
+}
diff --git a/dev-cpp/eigen/eigen-2.0.15.ebuild b/dev-cpp/eigen/eigen-2.0.15.ebuild
new file mode 100644
index 000000000000..284a0e4f5948
--- /dev/null
+++ b/dev-cpp/eigen/eigen-2.0.15.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-2.0.15.ebuild,v 1.2 2011/03/25 16:01:28 jlec Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="2"
+IUSE="debug doc examples"
+
+COMMON_DEPEND="
+ examples? (
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+ !dev-cpp/eigen:0
+"
+
+src_unpack() {
+ unpack ${A}
+ mv ${PN}* ${P}
+}
+
+src_configure() {
+ # benchmarks (BTL) brings up damn load of external deps including fortran
+ # compiler
+ # library hangs up complete compilation proccess, test later
+ mycmakeargs=(
+ -DEIGEN_BUILD_LIB=OFF
+ -DEIGEN_BUILD_BTL=OFF
+ $(cmake-utils_use examples EIGEN_BUILD_DEMOS)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ cd "${CMAKE_BUILD_DIR}"
+ emake doc || die "building documentation failed"
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use doc; then
+ cd "${CMAKE_BUILD_DIR}"/doc
+ dohtml -r html/* || die "dohtml failed"
+ fi
+ if use examples; then
+ cd "${CMAKE_BUILD_DIR}"/demos
+ dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed"
+ fi
+}
+
+src_test() {
+ mycmakeargs=(
+ -DEIGEN_BUILD_TESTS=ON
+ -DEIGEN_TEST_NO_FORTRAN=ON
+ )
+ cmake-utils_src_configure
+ cmake-utils_src_compile
+ cmake-utils_src_test
+}
diff --git a/dev-cpp/eigen/eigen-2.0.16.ebuild b/dev-cpp/eigen/eigen-2.0.16.ebuild
index b68dfa841ab6..0851163b4f08 100644
--- a/dev-cpp/eigen/eigen-2.0.16.ebuild
+++ b/dev-cpp/eigen/eigen-2.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-2.0.16.ebuild,v 1.7 2012/02/01 09:01:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-2.0.16.ebuild,v 1.1 2011/09/03 22:04:07 dilfridge Exp $
EAPI=4
@@ -8,10 +8,10 @@ inherit cmake-utils
DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="2"
IUSE="debug doc examples"
@@ -19,18 +19,16 @@ COMMON_DEPEND="
examples? (
x11-libs/qt-gui:4
x11-libs/qt-opengl:4
- )"
+ )
+"
DEPEND="${COMMON_DEPEND}
- doc? ( app-doc/doxygen )"
+ doc? ( app-doc/doxygen )
+"
RDEPEND="${COMMON_DEPEND}
- !dev-cpp/eigen:0"
-
-MAKEOPTS+=" -j1"
+ !dev-cpp/eigen:0
+"
-src_unpack() {
- unpack ${A}
- mv ${PN}* ${P} || die
-}
+S=${WORKDIR}/${PN}-${P}
src_configure() {
# benchmarks (BTL) brings up damn load of external deps including fortran
@@ -39,7 +37,6 @@ src_configure() {
mycmakeargs=(
-DEIGEN_BUILD_LIB=OFF
-DEIGEN_BUILD_BTL=OFF
- -DEIGEN_BUILD_PKGCONFIG=ON
$(cmake-utils_use examples EIGEN_BUILD_DEMOS)
)
cmake-utils_src_configure
diff --git a/dev-cpp/eigen/eigen-2.0.17.ebuild b/dev-cpp/eigen/eigen-2.0.17.ebuild
deleted file mode 100644
index 75b21f7a629f..000000000000
--- a/dev-cpp/eigen/eigen-2.0.17.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-2.0.17.ebuild,v 1.1 2012/01/11 12:50:46 jlec Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
-HOMEPAGE="http://eigen.tuxfamily.org/"
-SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="2"
-IUSE="debug doc examples"
-
-COMMON_DEPEND="
- examples? (
- x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- )"
-DEPEND="${COMMON_DEPEND}
- doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
- !dev-cpp/eigen:0"
-
-MAKEOPTS+=" -j1"
-
-src_unpack() {
- unpack ${A}
- mv ${PN}* ${P} || die
-}
-
-src_configure() {
- # benchmarks (BTL) brings up damn load of external deps including fortran
- # compiler
- # library hangs up complete compilation proccess, test later
- mycmakeargs=(
- -DEIGEN_BUILD_LIB=OFF
- -DEIGEN_BUILD_BTL=OFF
- -DEIGEN_BUILD_PKGCONFIG=ON
- $(cmake-utils_use examples EIGEN_BUILD_DEMOS)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc; then
- cd "${CMAKE_BUILD_DIR}"
- emake doc
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- if use doc; then
- cd "${CMAKE_BUILD_DIR}"/doc
- dohtml -r html/*
- fi
- if use examples; then
- cd "${CMAKE_BUILD_DIR}"/demos
- dobin mandelbrot/mandelbrot opengl/quaternion_demo
- fi
-}
-
-src_test() {
- mycmakeargs=(
- -DEIGEN_BUILD_TESTS=ON
- -DEIGEN_TEST_NO_FORTRAN=ON
- )
- cmake-utils_src_configure
- cmake-utils_src_compile
- cmake-utils_src_test
-}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index 82bab86f6426..c89abd802081 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -3,7 +3,7 @@
sci
kde
-
+
Eigen is a lightweight C++ template library for vector and matrix math,
a.k.a. linear algebra. Unlike most other linear algebra libraries, Eigen
focuses on the simple mathematical needs of applications: games and other
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild
index 5c9dc4d82023..36ff1bd93fc7 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild,v 1.4 2012/01/18 20:00:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.28.3.ebuild,v 1.1 2011/10/21 18:49:35 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc"
RDEPEND=">=gnome-base/gconf-2.4:2
diff --git a/dev-cpp/glibmm/glibmm-2.30.1.ebuild b/dev-cpp/glibmm/glibmm-2.30.1.ebuild
index 6566492d57c0..e43f8e9ca68d 100644
--- a/dev-cpp/glibmm/glibmm-2.30.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.30.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.30.1.ebuild,v 1.5 2012/01/18 20:13:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.30.1.ebuild,v 1.1 2011/11/20 15:45:42 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="|| ( LGPL-2.1 GPL-2 )"
SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug examples test"
RDEPEND=">=dev-libs/libsigc++-2.2.10:2
diff --git a/dev-cpp/libbinio/libbinio-1.4.ebuild b/dev-cpp/libbinio/libbinio-1.4.ebuild
index 3da024d3a851..d47d84c6305b 100644
--- a/dev-cpp/libbinio/libbinio-1.4.ebuild
+++ b/dev-cpp/libbinio/libbinio-1.4.ebuild
@@ -1,32 +1,28 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbinio/libbinio-1.4.ebuild,v 1.20 2011/12/23 00:48:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbinio/libbinio-1.4.ebuild,v 1.19 2011/03/26 13:03:29 spock Exp $
-EAPI=4
inherit eutils
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
DESCRIPTION="Binary I/O stream class library"
HOMEPAGE="http://libbinio.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-DOCS=( AUTHORS NEWS README )
+IUSE=""
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-cstdio.patch \
- "${FILESDIR}"/${P}-texi.patch
-}
+DEPEND=""
+RDEPEND=""
-src_configure() {
- econf $(use_enable static-libs static)
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-cstdio.patch"
+ epatch "${FILESDIR}/${P}-texi.patch"
}
src_install() {
- default
- rm -f "${ED}"usr/lib*/${PN}.la
+ emake DESTDIR="${D}" install || die "emake install failed"
}
diff --git a/dev-cpp/libcmis/libcmis-0.1.0.ebuild b/dev-cpp/libcmis/libcmis-0.1.0.ebuild
index 23a31fd53b4a..ed9549de5db3 100644
--- a/dev-cpp/libcmis/libcmis-0.1.0.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0.ebuild,v 1.5 2011/12/18 20:51:04 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0.ebuild,v 1.4 2011/12/09 13:28:55 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/"
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs test"
RDEPEND="
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 813f9c478af5..185443647fb0 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,2 +1,3 @@
+DIST muparser_v132.tar.gz 1009309 RMD160 a8c03084db33f0a62b9d927799134fc35c7a4d87 SHA1 ff9e7be4408cafbbd6d9256095eaf8ebb12611b1 SHA256 49dec550c0a5bddf506c3ce80e3d98c92f83dd021acb0e0d57ce4d3ea9df8f47
DIST muparser_v134.tar.gz 1013841 RMD160 ee7e0e4ebedde6368d1bfa100da23ac3ce946500 SHA1 d6d834d3ba2bd3c316c9b3070369d32701703f78 SHA256 0e3d3dffe2d0bac9c381fc1320ee1e549993aff554d8c16d719caf23653f2276
DIST muparser_v2_1_0.zip 1465893 RMD160 cf52e9baca5a094bee00e5dafda4e8aa60f9f393 SHA1 797a45593e6edb86cb01f9dfe02e984849b96675 SHA256 4babb0cf4073943cb369cf78cb7a1b2c3188cdcf5406becf3b229509ce6bd17d
diff --git a/dev-cpp/muParser/muParser-1.32-r1.ebuild b/dev-cpp/muParser/muParser-1.32-r1.ebuild
new file mode 100644
index 000000000000..a5820a77260a
--- /dev/null
+++ b/dev-cpp/muParser/muParser-1.32-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.32-r1.ebuild,v 1.2 2010/04/26 20:35:19 maekke Exp $
+
+EAPI=2
+inherit eutils
+
+MY_PN=${PN/P/p}
+MY_P=${MY_PN}_v${PV/./}
+DESCRIPTION="Library for parsing mathematical expressions"
+HOMEPAGE="http://muparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # fix destdir and respect cxxflags
+ # cant really use autotools cause muparser use bakefile
+ # and too lasy to make an ebuild for it.
+ epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
+src_configure() {
+ econf $(use_enable test samples)
+}
+
+src_test() {
+ cat > test.sh <<-EOFTEST
+ LD_LIBRARY_PATH=${S}/lib samples/example1/example1 << EOF
+ quit
+ EOF
+ EOFTEST
+ sh ./test.sh || die "test failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc Changes.txt Credits.txt || die "dodoc failed"
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins -r docs/html || die
+ fi
+}
diff --git a/dev-cpp/muParser/muParser-1.34.ebuild b/dev-cpp/muParser/muParser-1.34.ebuild
index da2ef576e7d9..6b3d7300f270 100644
--- a/dev-cpp/muParser/muParser-1.34.ebuild
+++ b/dev-cpp/muParser/muParser-1.34.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.34.ebuild,v 1.5 2011/12/21 08:37:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/muParser/muParser-1.34.ebuild,v 1.4 2011/12/16 16:42:22 ago Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc test"
S="${WORKDIR}"/${MY_P}
diff --git a/dev-cpp/pangomm/pangomm-2.28.4.ebuild b/dev-cpp/pangomm/pangomm-2.28.4.ebuild
index 7c16938790b2..74098fcb24cb 100644
--- a/dev-cpp/pangomm/pangomm-2.28.4.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.28.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/pangomm-2.28.4.ebuild,v 1.5 2012/01/18 20:15:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/pangomm-2.28.4.ebuild,v 1.1 2011/10/26 17:57:24 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="1.4"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND=">=x11-libs/pango-1.23.0
diff --git a/dev-cpp/pngpp/Manifest b/dev-cpp/pngpp/Manifest
deleted file mode 100644
index 6331bb63b55a..000000000000
--- a/dev-cpp/pngpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST png++-0.2.5.tar.gz 577854 RMD160 f410b46cafe1fbe6972fad0a933dd51e8b090487 SHA1 bfe39c414a8c5c18dbaaf96fea22ce12a6887576 SHA256 339fa2dff2cdd117efb43768cb272745faef4d02705b5e0e840537a2c1467b72
diff --git a/dev-cpp/pngpp/metadata.xml b/dev-cpp/pngpp/metadata.xml
deleted file mode 100644
index 553d24be4d52..000000000000
--- a/dev-cpp/pngpp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- graphics
- cpp
-
- ssuominen@gentoo.org
- Samuli Suominen
-
-
diff --git a/dev-cpp/pngpp/pngpp-0.2.5.ebuild b/dev-cpp/pngpp/pngpp-0.2.5.ebuild
deleted file mode 100644
index a488de8deb01..000000000000
--- a/dev-cpp/pngpp/pngpp-0.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pngpp/pngpp-0.2.5.ebuild,v 1.1 2012/01/28 12:57:59 ssuominen Exp $
-
-EAPI=4
-
-MY_P=${P/pp/++}
-
-DESCRIPTION="A simple but powerful C++ interface to libpng"
-HOMEPAGE="http://www.nongnu.org/pngpp/"
-SRC_URI="mirror://nongnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
- emake PREFIX="${D}/usr" install-headers
- dodoc AUTHORS BUGS ChangeLog NEWS README TODO
- docinto examples
- dodoc example/*.cpp
-}
diff --git a/dev-cpp/sptk/Manifest b/dev-cpp/sptk/Manifest
index c59306022cbe..72acb05ea82e 100644
--- a/dev-cpp/sptk/Manifest
+++ b/dev-cpp/sptk/Manifest
@@ -3,4 +3,3 @@ DIST sptk-3.5.8.14.tbz2 4378384 RMD160 47d57c1992a3005ab2bb74a5bb5c9c117f8673ad
DIST sptk-4.00.tbz2 3778145 RMD160 a452911c098491831d19d745ecfd39c366cb0f68 SHA1 ef0f65369dcc7667767c28458333cf17bcc91664 SHA256 b5c15f1e98a395c4884e8f62855a8f1cbde857fb46b6291f6788a36bfa194a4d
DIST sptk-4.02.tbz2 3782165 RMD160 50683b7fb9805e692643599b40f04ec976aca6e5 SHA1 00384869ce7f0b6448b09d982bae9e0d70d405ae SHA256 f6c097d039b1a909e768f7cc42b55e2449e02530bfa21fee4b2db3d064011970
DIST sptk-4.11.tbz2 3839172 RMD160 4e8fcf84d5fd22177eab7ff4fbac50e23f9792a6 SHA1 a97689e9ce571dbc6b18201633714b68b08137a4 SHA256 b825abcb83c6672faa988455d447b483a1578b1157fa58c24cf16f86584b7bbf
-DIST sptk-4.13.tbz2 3856304 RMD160 1fb9f280280b9e10cbb159835de4fded0b668873 SHA1 2c5491941b962f00d22473c4398c69e931b21f00 SHA256 290471e76aa4987a10dd340e60b7dfc10872e6657bdc3ef545c41348410f82f8
diff --git a/dev-cpp/sptk/sptk-4.13.ebuild b/dev-cpp/sptk/sptk-4.13.ebuild
deleted file mode 100644
index 0f348973a6ae..000000000000
--- a/dev-cpp/sptk/sptk-4.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-4.13.ebuild,v 1.1 2012/02/06 20:09:46 ssuominen Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-DESCRIPTION="C++ user interface toolkit for X with database and Excel support"
-SRC_URI="http://www.sptk.net/sptk-${PV}.tbz2"
-HOMEPAGE="http://www.sptk.net"
-
-SLOT="4"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="fltk odbc doc sqlite excel postgres aspell mysql gnutls"
-
-RDEPEND="
- aspell? ( >=app-text/aspell-0.50 )
- fltk? ( x11-libs/fltk:1 )
- gnutls? ( net-libs/gnutls )
- mysql? ( virtual/mysql )
- odbc? ( >=dev-db/unixODBC-2.2.6 )
- postgres? ( >=dev-db/postgresql-base-8.0 )
- sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-}
-
-src_compile() {
- local mycmakeargs="$(cmake-utils_use_no postgres POSTGRESQL)
- $(cmake-utils_use_no mysql MYSQL)
- $(cmake-utils_use_no sqlite SQLITE3)
- $(cmake-utils_use_no odbc ODBC)
- $(cmake-utils_use_no aspell ASPELL)
- $(cmake-utils_use_no fltk FLTK)
- $(cmake-utils_use_no excel EXCEL)
- $(cmake-utils_use_no gnutls TLS)"
-
- mycmakeargs="${mycmakeargs} -D CMAKE_INSTALL_PREFIX:PATH=/usr -D LIBDIR=$(get_libdir) ${SPTK_OPTIONS} -DNO_EXAMPLES:BOOLEAN=TRUE"
-
- cmake-utils_src_configure
-
- cmake-utils_src_compile
- if use doc; then
- cd "${S}"
- einfo "Fixing sptk3.doxygen"
- sed -i -e 's,/cvs/sptk3/,,g' sptk3.doxygen
- einfo "Building docs"
- doxygen sptk3.doxygen
- fi
-}
-
-src_install () {
- DOCS="README AUTHORS"
- cmake-utils_src_install
-
- dodir /usr/share/doc/${PF}
- cp -r "${S}"/docs/* "${D}"/usr/share/doc/${PF}
- if use doc; then
- rm -fr "${D}/usr/share/doc/${PF}/latex"
- cp -rf "${S}/pictures" "${D}/usr/share/doc/${PF}"
- fi
- [ -f mv "${D}/usr/bin/sql2cpp.pl" ] && mv "${D}/usr/bin/sql2cpp.pl" "${D}/usr/bin/sql2cpp"
-}
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 3ca6446b7174..97613188623b 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,3 +1,4 @@
DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
+DIST tbb30_174oss_src.tgz 1826899 RMD160 5f6f853cf2fc6c05bd11dcf2928d60c5e2459fbf SHA1 b68764d0d9d2517c60fd88c71a3554d194733b03 SHA256 c06eae08435cb7118d2f922303fd83b03e2754d45a6c8fa98721cb09b0a463cc
+DIST tbb30_196oss_src.tgz 2015992 RMD160 8af026a436415b8d790a77b6a88165e1b926caaf SHA1 eb77db011bc595d77a69de4fb78004b370cabd2f SHA256 bc342b93b8456bdec911baaea2c44ae787c39b7bbcac88789f05ebed634510d7
DIST tbb30_221oss_src.tgz 1856676 RMD160 17cabfb522b2b3acc98fa4717c17accad91d04c5 SHA1 79c6b347f457e3176a5beae598a14b3a25bac4a0 SHA256 7bd3ecac7ef0ed13b1d71080006676ef31f7c08fb20c787208d94138bdf4e676
-DIST tbb40_278oss_src.tgz 2083516 RMD160 1b328f47a0afd14d50404b0079a958f0ae510d89 SHA1 d04ca01332d3f0148f91f6b5d8e69fa68edd8a6d SHA256 dd5c93a457acc1ef21c2d4c4008441ddc5b75e6be82cdd3c15fa1eda3656e4ef
diff --git a/dev-cpp/tbb/tbb-3.0.174.ebuild b/dev-cpp/tbb/tbb-3.0.174.ebuild
new file mode 100644
index 000000000000..ed0c806dc01c
--- /dev/null
+++ b/dev-cpp/tbb/tbb-3.0.174.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.174.ebuild,v 1.1 2011/04/21 21:04:35 bicatali Exp $
+
+EAPI=3
+inherit eutils versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="78/166"
+# release update
+MYR="%20update%20"6
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+DEPEND="!<=dev-cpp/tbb-2.1.016"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
+ epatch "${FILESDIR}"/${PN}-3.0.174-gcc46.patch
+ # use fully qualified compilers. do not force pentium4 for x86 users
+ local CC="$(tc-getCC)"
+ sed -i \
+ -e "s/-O2/${CXXFLAGS}/g" \
+ -e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
+ -e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
+ -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
+ -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+ build/*.inc || die
+ # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+ # actual command.
+ # - Force generation of version_string.tmp immediately after the directory
+ # is created. This avoids a race when the user builds tbb and tbbmalloc
+ # concurrently. The choice of Makefile.tbb (instead of
+ # Makefile.tbbmalloc) is arbitrary.
+ sed -i \
+ -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+ -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+ src/Makefile || die
+}
+
+src_compile() {
+ if [[ $(tc-getCXX) == *g++ ]]; then
+ myconf="compiler=gcc"
+ elif [[ $(tc-getCXX) == *ic*c ]]; then
+ myconf="compiler=icc"
+ fi
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+ fi
+ emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake failed"
+}
+
+src_test() {
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+ fi
+ emake -C src ${ccconf} test_release || die "emake test failed"
+}
+
+src_install(){
+ for l in $(find build -name lib\*.so.\*); do
+ dolib.so ${l} || die
+ local bl=$(basename ${l})
+ dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+ done
+ insinto /usr
+ doins -r include || die
+
+ dodoc README CHANGES doc/Release_Notes.txt
+ if use doc ; then
+ insinto /usr/share/doc/${PF}
+ doins -r doc/html || die
+ fi
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples/build
+ doins build/*.inc || die
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples || die
+ fi
+}
diff --git a/dev-cpp/tbb/tbb-3.0.196.ebuild b/dev-cpp/tbb/tbb-3.0.196.ebuild
new file mode 100644
index 000000000000..8528e8c4becc
--- /dev/null
+++ b/dev-cpp/tbb/tbb-3.0.196.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.196.ebuild,v 1.1 2011/05/31 21:34:13 bicatali Exp $
+
+EAPI=3
+inherit eutils versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="78/170"
+# release update
+MYR="%20update%20"7
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+DEPEND="!<=dev-cpp/tbb-2.1.016"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
+ epatch "${FILESDIR}"/${PN}-3.0.174-gcc46.patch
+ # use fully qualified compilers. do not force pentium4 for x86 users
+ local CC="$(tc-getCC)"
+ sed -i \
+ -e "s/-O2/${CXXFLAGS}/g" \
+ -e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
+ -e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
+ -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
+ -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+ build/*.inc || die
+ # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+ # actual command.
+ # - Force generation of version_string.tmp immediately after the directory
+ # is created. This avoids a race when the user builds tbb and tbbmalloc
+ # concurrently. The choice of Makefile.tbb (instead of
+ # Makefile.tbbmalloc) is arbitrary.
+ sed -i \
+ -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+ -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+ src/Makefile || die
+}
+
+src_compile() {
+ if [[ $(tc-getCXX) == *g++ ]]; then
+ myconf="compiler=gcc"
+ elif [[ $(tc-getCXX) == *ic*c ]]; then
+ myconf="compiler=icc"
+ fi
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+ fi
+ emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake failed"
+}
+
+src_test() {
+ local ccconf="${myconf}"
+ if use debug || use examples; then
+ ${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+ fi
+ emake -C src ${ccconf} test_release || die "emake test failed"
+}
+
+src_install(){
+ for l in $(find build -name lib\*.so.\*); do
+ dolib.so ${l} || die
+ local bl=$(basename ${l})
+ dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+ done
+ insinto /usr
+ doins -r include || die
+
+ dodoc README CHANGES doc/Release_Notes.txt
+ if use doc ; then
+ insinto /usr/share/doc/${PF}
+ doins -r doc/html || die
+ fi
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples/build
+ doins build/*.inc || die
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples || die
+ fi
+}
diff --git a/dev-cpp/tbb/tbb-4.0.278.ebuild b/dev-cpp/tbb/tbb-4.0.278.ebuild
deleted file mode 100644
index 26039e74f2ba..000000000000
--- a/dev-cpp/tbb/tbb-4.0.278.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.278.ebuild,v 1.2 2012/01/07 20:47:39 bicatali Exp $
-
-EAPI=4
-inherit eutils versionator toolchain-funcs
-
-# those 2 below change pretty much every release
-# url number
-MYU="78/179"
-# release update
-MYR="%20update%202"
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="http://www.threadingbuildingblocks.org/"
-SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-DEPEND="!<=dev-cpp/tbb-2.1.016"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
- # use fully qualified compilers. do not force pentium4 for x86 users
- local CC="$(tc-getCC)"
- sed -i \
- -e "s/-O2/${CXXFLAGS}/g" \
- -e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
- -e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
- -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
- -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
- build/*.inc || die
- # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
- # actual command.
- # - Force generation of version_string.tmp immediately after the directory
- # is created. This avoids a race when the user builds tbb and tbbmalloc
- # concurrently. The choice of Makefile.tbb (instead of
- # Makefile.tbbmalloc) is arbitrary.
- sed -i \
- -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
- -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
- src/Makefile || die
- find include -name \*.html -delete
-}
-
-src_compile() {
- if [[ $(tc-getCXX) == *g++ ]]; then
- myconf="compiler=gcc"
- elif [[ $(tc-getCXX) == *ic*c ]]; then
- myconf="compiler=icc"
- fi
- local ccconf="${myconf}"
- if use debug || use examples; then
- ccconf="${ccconf} tbb_debug tbbmalloc_debug"
- fi
- emake -C src ${ccconf} tbb_release tbbmalloc_release
-}
-
-src_test() {
- local ccconf="${myconf}"
- if use debug || use examples; then
- ${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
- fi
- emake -C src ${ccconf} test_release
-}
-
-src_install(){
- for l in $(find build -name lib\*.so.\*); do
- dolib.so ${l}
- local bl=$(basename ${l})
- dosym ${bl} /usr/$(get_libdir)/${bl%.*}
- done
- insinto /usr
- doins -r include
-
- dodoc README CHANGES doc/Release_Notes.txt
- use doc && dohtml -r doc/html/*
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples/build
- doins build/*.inc
- insinto /usr/share/doc/${PF}/examples
- doins -r examples
- fi
-}
diff --git a/dev-cpp/tree/tree-2.65-r1.ebuild b/dev-cpp/tree/tree-2.65-r1.ebuild
index b245297cc0d2..7ef9518a9c14 100644
--- a/dev-cpp/tree/tree-2.65-r1.ebuild
+++ b/dev-cpp/tree/tree-2.65-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/tree-2.65-r1.ebuild,v 1.3 2011/12/26 12:30:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/tree-2.65-r1.ebuild,v 1.2 2011/12/14 20:57:37 ago Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc"
DEPEND=""
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index 5234af93a600..23520d26e138 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/tree-2.81.ebuild,v 1.2 2011/12/18 16:48:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/tree-2.81.ebuild,v 1.1 2011/12/14 09:50:28 jlec Exp $
EAPI=4
@@ -37,6 +37,6 @@ src_install() {
doins tree.hh tree_util.hh
dodoc tree_example.cc
if use doc; then
- dohtml "${S}"/../doc/*
+ dohtml "${WORKDIR}"/doc/*
fi
}
diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml
index 806050a82b30..877161cf6041 100644
--- a/dev-db/drizzle/metadata.xml
+++ b/dev-db/drizzle/metadata.xml
@@ -10,6 +10,11 @@
+
+ Use the dev-util/google-perftools libraries to
+ replace the malloc() implementation with a possibly faster one.
+
+
Build the API documentation for the package, using
app-doc/doxygen. Warning, this might take over an
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index c53c6ab3867f..8690e8e98d06 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,4 +1,4 @@
DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 RMD160 af9ae88f8a8152ffeb7d128f009436b06e28c07f SHA1 1504e4a579d9020bd47470ae54c67490ad13f032 SHA256 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28
-DIST Firebird-2.5.1.26351-0.tar.bz2 13665242 RMD160 8802523615bf94ef1ffc04bcd912baf3a6fac644 SHA1 f827736c812f4247e8204fbe9c696f648c0484b6 SHA256 c4d236e7a9ab3ca00df3faca80f55175d11052637369c877b3e22cd377edb813
+DIST Firebird-2.5.0.26074-0.tar.bz2 13579819 RMD160 b64a2bad70664dc438a03490b91f3a5a08b2dfa6 SHA1 d7afea3a87c8298fd39ad76cc9580ef9f4100421 SHA256 b9f1982c3c9a0571508d177f1ad7459a6e2d598fc07f0985bce491b93d497053
DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-client.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-client.patch
deleted file mode 100644
index 8331c8122faf..000000000000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-client.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird 2010-11-12 15:46:22.000000000 -0500
-+++ builds/posix/Makefile.in.firebird 2010-11-12 16:36:22.000000000 -0500
-@@ -145,7 +145,7 @@
-
- firebird : firebird_@FIREBIRD_ARCH_TYPE@ $(PLATFORM_POSTBUILD_TARGET)
-
--firebird_classic firebird_embedded: firebird_basic classic_targets fbtrace
-+firebird_classic firebird_embedded: firebird_boot libfbclient includes
- firebird_super firebird_server: firebird_basic super_targets fbtrace
-
-
diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch
deleted file mode 100644
index 8be521cc0fac..000000000000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
-
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
-
- firebird_boot: updateBuildNum boot_phase1 boot_phase2
-
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR= ar @AR_OPTIONS@ crsu
- LN= @LN_S@
- RANLIB= @RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
-
- CC = @CC@
- CXX = @CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
-
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
-
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
-
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
-
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
-
diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
deleted file mode 100644
index 3891cc776fae..000000000000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500
-+++ builds/posix/Makefile.in.firebird 2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql
- .PHONY: embed_gpre embed_util
-
--classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \
- embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET)
-
- libfbembed:
diff --git a/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild b/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild
new file mode 100644
index 000000000000..87c0329e2747
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.0.26074.0-r1.ebuild,v 1.1 2011/05/12 18:42:35 jer Exp $
+
+inherit flag-o-matic eutils autotools multilib versionator
+
+MY_P=Firebird-$(replace_version_separator 4 -)
+#MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+ doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 -ia64 ~x86"
+IUSE="doc client superserver xinetd examples debug"
+RESTRICT="userpriv"
+
+RDEPEND="dev-libs/libedit
+ dev-libs/icu"
+DEPEND="${RDEPEND}
+ dev-util/btyacc
+ doc? ( app-arch/unzip )"
+RDEPEND="${RDEPEND}
+ xinetd? ( virtual/inetd )
+ !sys-cluster/ganglia"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use client && use superserver ; then
+ die "Use flags client and superserver cannot be used together"
+ fi
+ if use client && use xinetd ; then
+ die "Use flags client and xinetd cannot be used together"
+ fi
+ if use superserver && use xinetd ; then
+ die "Use flags superserver and xinetd cannot be used together"
+ fi
+ enewgroup firebird 450
+ enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+}
+
+function check_sed() {
+ MSG="sed of $3, required $2 lines modified $1"
+ einfo "${MSG}"
+ [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+ if use doc; then
+ # Unpack docs
+ mkdir "${WORKDIR}/manuals"
+ cd "${WORKDIR}/manuals"
+ unpack ib_b60_doc.zip
+ cd "${WORKDIR}"
+ fi
+
+ unpack "${MY_P}.tar.bz2"
+
+ cd "${S}"
+
+ # This patch might be portable, and not need to be duplicated per version
+ # also might no longer be necessary to patch deps or libs, just flags
+ epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
+ use client && epatch "${FILESDIR}/${P}-client.patch"
+
+ # Rename references to isql to fbsql
+ # sed vs patch for portability and addtional location changes
+ check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+ src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+ check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+ src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+ check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+ -e 's:isql :fbsql :w /dev/stdout' \
+ -e 's:ISQL :FBSQL :w /dev/stdout' \
+ src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+ find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+ rm -rf "${S}"/extern/{editline,icu}
+
+ eautoreconf
+}
+
+src_compile() {
+ filter-flags -fprefetch-loop-arrays
+ filter-mfpmath sse
+
+ econf --prefix=/usr/$(get_libdir)/firebird \
+ $(use_enable superserver superserver) \
+ $(use_enable debug) \
+ --with-system-editline \
+ --with-system-icu \
+ --with-fbbin=/usr/bin \
+ --with-fbsbin=/usr/sbin \
+ --with-fbconf=/etc/${PN} \
+ --with-fblib=/usr/$(get_libdir) \
+ --with-fbinclude=/usr/include \
+ --with-fbdoc=/usr/share/doc/${P} \
+ --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+ --with-fbsample=/usr/share/doc/${P}/examples \
+ --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+ --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+ --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+ --with-fbmisc=/usr/share/${PN} \
+ --with-fbsecure-db=/etc/${PN} \
+ --with-fbmsg=/usr/$(get_libdir)/${PN} \
+ --with-fblog=/var/log/${PN}/ \
+ --with-fbglock=/var/run/${PN} \
+ --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+ ${myconf} || die "econf failed"
+ emake -j1 || die "error during make"
+}
+
+src_install() {
+ cd "${S}/gen/${PN}"
+
+ if use doc; then
+ dodoc docs/*.pdf
+ dodoc "${WORKDIR}"/manuals/*
+ fi
+
+ insinto /usr/include
+ doins include/*
+
+ rm lib/libfbstatic.a
+
+ insinto /usr/$(get_libdir)
+ dolib.so lib/*.so*
+
+ # links for backwards compatibility
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+ dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+ use client && return
+
+ einfo "Renaming isql -> fbsql"
+ mv bin/isql bin/fbsql
+
+ local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+ for bin in ${bins[@]}; do
+ dobin bin/${bin}
+ done
+
+ dosbin bin/fb_lock_print
+ # SuperServer
+ if use superserver ; then
+ dosbin bin/{fbguard,fbserver}
+ # ClassicServer
+ elif use xinetd ; then
+ dosbin bin/fb_inet_server
+ # SuperClassic
+ else
+ dosbin bin/{fbguard,fb_smp_server}
+ fi
+
+ exeinto /usr/bin/${PN}
+ exeopts -m0755
+ doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+ insinto /usr/$(get_libdir)/${PN}
+ doins *.msg
+
+ insinto /usr/$(get_libdir)/${PN}/help
+ doins help/help.fdb
+
+ exeinto /usr/$(get_libdir)/firebird/intl
+ dolib.so intl/libfbintl.so
+ dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
+ dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+ exeinto /usr/$(get_libdir)/${PN}/plugins
+ dolib.so plugins/libfbtrace.so
+ dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+
+ exeinto /usr/$(get_libdir)/${PN}/UDF
+ doexe UDF/*.so
+
+ insinto /usr/share/${PN}/upgrade
+ doins "${S}"/src/misc/upgrade/v2/*
+
+ insinto /etc/${PN}
+ insopts -m0644 -o firebird -g firebird
+ doins ../install/misc/*.conf
+ insopts -m0660 -o firebird -g firebird
+ doins security2.fdb
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+ else
+ newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+ newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+ fperms 640 /etc/conf.d/${PN}
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -m 755 -o firebird -g firebird
+ dodir /var/log/${PN}
+ dodir /var/run/${PN}
+ keepdir /var/log/${PN}
+ keepdir /var/run/${PN}
+
+ use examples && docinto examples
+}
+
+pkg_postinst() {
+ use client && return
+
+ # Hack to fix ownership/perms
+ chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+ chmod 750 "${ROOT}/etc/${PN}"
+
+ elog
+ elog "Firebird is no longer installed in /opt. Binaries are in"
+ elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
+ elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+ elog "The command line tool isql has been renamed to fbsql."
+ elog "Please report any problems or issues to bugs.gentoo.org."
+ elog
+}
+
+pkg_config() {
+ use client && return
+
+ # if found /etc/security.gdb from previous install, backup, and restore as
+ # /etc/security2.fdb
+ if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
+ # if we have scurity2.fdb already, back it 1st
+ if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
+ cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
+ fi
+ gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
+ gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
+ mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
+ rm "${ROOT}/etc/firebird/security.gbk"
+
+ # make sure they are readable only to firebird
+ chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
+ chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
+
+ einfo
+ einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+ einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+ einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+ einfo
+ fi
+
+ # we need to enable local access to the server
+ if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
+ touch "${ROOT}/etc/hosts.equiv"
+ chown root:0 "${ROOT}/etc/hosts.equiv"
+ chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
+ fi
+
+ # add 'localhost.localdomain' to the hosts.equiv file...
+ if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ # add 'localhost' to the hosts.equiv file...
+ if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "localhost" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ HS_NAME=`hostname`
+ if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ einfo "If you're using UDFs, please remember to move them"
+ einfo "to /usr/lib/firebird/UDF"
+}
diff --git a/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild b/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild
new file mode 100644
index 000000000000..e884406629c3
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild,v 1.1 2011/10/06 09:03:08 patrick Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils autotools multilib versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+ doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 -ia64 ~x86"
+IUSE="doc client superserver xinetd examples debug"
+RESTRICT="userpriv"
+
+RDEPEND="dev-libs/libedit
+ dev-libs/icu"
+DEPEND="${RDEPEND}
+ >=dev-util/btyacc-3.0-r2
+ doc? ( app-arch/unzip )"
+RDEPEND="${RDEPEND}
+ xinetd? ( virtual/inetd )
+ !sys-cluster/ganglia"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if use client && use superserver ; then
+ die "Use flags client and superserver cannot be used together"
+ fi
+ if use client && use xinetd ; then
+ die "Use flags client and xinetd cannot be used together"
+ fi
+ if use superserver && use xinetd ; then
+ die "Use flags superserver and xinetd cannot be used together"
+ fi
+}
+
+pkg_setup() {
+ enewgroup firebird 450
+ enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+}
+
+function check_sed() {
+ MSG="sed of $3, required $2 lines modified $1"
+ einfo "${MSG}"
+ [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+ if use doc; then
+ # Unpack docs
+ mkdir "${WORKDIR}/manuals"
+ cd "${WORKDIR}/manuals"
+ unpack ib_b60_doc.zip
+ cd "${WORKDIR}"
+ fi
+ unpack "${MY_P}.tar.bz2"
+ cd "${S}"
+}
+
+src_prepare() {
+ # Fixes bug #347133
+ epatch "${FILESDIR}/${P}-build.patch"
+ cp "${FILESDIR}/${P}-Makefile.in.static.createdb" \
+ "${S}/builds/posix/Makefile.in.static.createdb" \
+ || die "createdb makefile not found"
+
+ # This patch might be portable, and not need to be duplicated per version
+ # also might no longer be necessary to patch deps or libs, just flags
+ epatch "${FILESDIR}/${P}-deps-flags.patch"
+
+ use client && epatch "${FILESDIR}/${P}-client.patch"
+ if ! use superserver ; then
+ epatch "${FILESDIR}/${P}-superclassic.patch"
+ fi
+
+ # Rename references to isql to fbsql
+ # sed vs patch for portability and addtional location changes
+ check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+ src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+ check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+ src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+ check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+ -e 's:isql :fbsql :w /dev/stdout' \
+ -e 's:ISQL :FBSQL :w /dev/stdout' \
+ src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+ find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+ rm -rf "${S}"/extern/{btyacc,editline,icu}
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fprefetch-loop-arrays
+ filter-mfpmath sse
+
+ econf --prefix=/usr/$(get_libdir)/firebird \
+ $(use_enable superserver superserver) \
+ $(use_enable debug) \
+ --with-editline \
+ --with-system-editline \
+ --with-system-icu \
+ --with-fbbin=/usr/bin \
+ --with-fbsbin=/usr/sbin \
+ --with-fbconf=/etc/${PN} \
+ --with-fblib=/usr/$(get_libdir) \
+ --with-fbinclude=/usr/include \
+ --with-fbdoc=/usr/share/doc/${P} \
+ --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+ --with-fbsample=/usr/share/doc/${P}/examples \
+ --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+ --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+ --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+ --with-fbmisc=/usr/share/${PN} \
+ --with-fbsecure-db=/etc/${PN} \
+ --with-fbmsg=/usr/$(get_libdir)/${PN} \
+ --with-fblog=/var/log/${PN}/ \
+ --with-fbglock=/var/run/${PN} \
+ --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+ --with-gnu-ld \
+ ${myconf}
+}
+
+src_compile() {
+ MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
+ emake
+}
+
+src_install() {
+ cd "${S}/gen/${PN}"
+
+ if use doc; then
+ dodoc docs/*.pdf
+ dodoc "${WORKDIR}"/manuals/*
+ fi
+
+ insinto /usr/include
+ doins include/*
+
+ rm lib/libfbstatic.a
+
+ insinto /usr/$(get_libdir)
+ dolib.so lib/*.so*
+
+ # links for backwards compatibility
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so
+ dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
+ dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
+
+ insinto /usr/$(get_libdir)/${PN}
+ doins *.msg
+
+ use client && return
+
+ einfo "Renaming isql -> fbsql"
+ mv bin/isql bin/fbsql
+
+ local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
+ for bin in ${bins[@]}; do
+ dobin bin/${bin}
+ done
+
+ dosbin bin/fb_lock_print
+ # SuperServer
+ if use superserver ; then
+ dosbin bin/{fbguard,fbserver}
+ # ClassicServer
+ elif use xinetd ; then
+ dosbin bin/fb_inet_server
+ # SuperClassic
+ else
+ dosbin bin/{fbguard,fb_smp_server}
+
+ #Temp should not be necessary, need to patch/fix
+ dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
+ fi
+
+ exeinto /usr/bin/${PN}
+ exeopts -m0755
+ doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+ insinto /usr/$(get_libdir)/${PN}/help
+ doins help/help.fdb
+
+ exeinto /usr/$(get_libdir)/firebird/intl
+ dolib.so intl/libfbintl.so
+ dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+ dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
+
+ exeinto /usr/$(get_libdir)/${PN}/plugins
+ dolib.so plugins/libfbtrace.so
+ dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+
+ exeinto /usr/$(get_libdir)/${PN}/UDF
+ doexe UDF/*.so
+
+ insinto /usr/share/${PN}/upgrade
+ doins "${S}"/src/misc/upgrade/v2/*
+
+ insinto /etc/${PN}
+ insopts -m0644 -o firebird -g firebird
+ doins ../install/misc/*.conf
+ insopts -m0660 -o firebird -g firebird
+ doins security2.fdb
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/${PN}.xinetd" ${PN}
+ else
+ newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
+ newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
+ fperms 640 /etc/conf.d/${PN}
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -m 755 -o firebird -g firebird
+ dodir /var/log/${PN}
+ dodir /var/run/${PN}
+ keepdir /var/log/${PN}
+ keepdir /var/run/${PN}
+
+ use examples && docinto examples
+}
+
+pkg_postinst() {
+ use client && return
+
+ # Hack to fix ownership/perms
+ chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
+ chmod 750 "${ROOT}/etc/${PN}"
+
+ elog
+ elog "Firebird is no longer installed in /opt. Binaries are in"
+ elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
+ elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+ elog "The command line tool isql has been renamed to fbsql."
+ elog "Please report any problems or issues to bugs.gentoo.org."
+ elog
+}
+
+pkg_config() {
+ use client && return
+
+ # if found /etc/security.gdb from previous install, backup, and restore as
+ # /etc/security2.fdb
+ if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
+ # if we have scurity2.fdb already, back it 1st
+ if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
+ cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
+ fi
+ gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
+ gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
+ mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
+ rm "${ROOT}/etc/firebird/security.gbk"
+
+ # make sure they are readable only to firebird
+ chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
+ chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
+
+ einfo
+ einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+ einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+ einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+ einfo
+ fi
+
+ # we need to enable local access to the server
+ if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
+ touch "${ROOT}/etc/hosts.equiv"
+ chown root:0 "${ROOT}/etc/hosts.equiv"
+ chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
+ fi
+
+ # add 'localhost.localdomain' to the hosts.equiv file...
+ if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ # add 'localhost' to the hosts.equiv file...
+ if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "localhost" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ HS_NAME=`hostname`
+ if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+ echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
+ einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+ fi
+
+ einfo "If you're using UDFs, please remember to move them"
+ einfo "to /usr/lib/firebird/UDF"
+}
diff --git a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild b/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
deleted file mode 100644
index 2758c942fce9..000000000000
--- a/dev-db/firebird/firebird-2.5.1.26351.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.1.26351.0.ebuild,v 1.1 2011/12/30 06:25:04 patrick Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils autotools multilib versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
- doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-IUSE="doc client superserver xinetd examples debug"
-RESTRICT="userpriv"
-
-RDEPEND="dev-libs/libedit
- dev-libs/icu"
-DEPEND="${RDEPEND}
- >=dev-util/btyacc-3.0-r2
- doc? ( app-arch/unzip )"
-RDEPEND="${RDEPEND}
- xinetd? ( virtual/inetd )
- !sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if use client && use superserver ; then
- die "Use flags client and superserver cannot be used together"
- fi
- if use client && use xinetd ; then
- die "Use flags client and xinetd cannot be used together"
- fi
- if use superserver && use xinetd ; then
- die "Use flags superserver and xinetd cannot be used together"
- fi
-}
-
-pkg_setup() {
- enewgroup firebird 450
- enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
- MSG="sed of $3, required $2 lines modified $1"
- einfo "${MSG}"
- [[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
- if use doc; then
- # Unpack docs
- mkdir "${WORKDIR}/manuals"
- cd "${WORKDIR}/manuals"
- unpack ib_b60_doc.zip
- cd "${WORKDIR}"
- fi
- unpack "${MY_P}.tar.bz2"
- cd "${S}"
-}
-
-src_prepare() {
- # This patch might be portable, and not need to be duplicated per version
- # also might no longer be necessary to patch deps or libs, just flags
- epatch "${FILESDIR}/${P}-deps-flags.patch"
-
- use client && epatch "${FILESDIR}/${P}-client.patch"
- if ! use superserver ; then
- epatch "${FILESDIR}/${P}-superclassic.patch"
- fi
-
- # Rename references to isql to fbsql
- # sed vs patch for portability and addtional location changes
- check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
- src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
- check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
- src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
- check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
- -e 's:isql :fbsql :w /dev/stdout' \
- -e 's:ISQL :FBSQL :w /dev/stdout' \
- src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
- find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
- rm -rf "${S}"/extern/{btyacc,editline,icu}
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -fprefetch-loop-arrays
- filter-mfpmath sse
-
- econf --prefix=/usr/$(get_libdir)/firebird \
- $(use_enable superserver superserver) \
- $(use_enable debug) \
- --with-editline \
- --with-system-editline \
- --with-system-icu \
- --with-fbbin=/usr/bin \
- --with-fbsbin=/usr/sbin \
- --with-fbconf=/etc/${PN} \
- --with-fblib=/usr/$(get_libdir) \
- --with-fbinclude=/usr/include \
- --with-fbdoc=/usr/share/doc/${P} \
- --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
- --with-fbsample=/usr/share/doc/${P}/examples \
- --with-fbsample-db=/usr/share/doc/${P}/examples/db \
- --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
- --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
- --with-fbmisc=/usr/share/${PN} \
- --with-fbsecure-db=/etc/${PN} \
- --with-fbmsg=/usr/$(get_libdir)/${PN} \
- --with-fblog=/var/log/${PN}/ \
- --with-fbglock=/var/run/${PN} \
- --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
- --with-gnu-ld \
- ${myconf}
-}
-
-src_compile() {
- MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
- emake
-}
-
-src_install() {
- cd "${S}/gen/${PN}"
-
- if use doc; then
- dodoc docs/*.pdf
- dodoc "${WORKDIR}"/manuals/*
- fi
-
- insinto /usr/include
- doins include/*
-
- rm lib/libfbstatic.a
-
- insinto /usr/$(get_libdir)
- dolib.so lib/*.so*
-
- # links for backwards compatibility
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so
- dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
- dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
- insinto /usr/$(get_libdir)/${PN}
- doins *.msg
-
- use client && return
-
- einfo "Renaming isql -> fbsql"
- mv bin/isql bin/fbsql
-
- local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
- for bin in ${bins[@]}; do
- dobin bin/${bin}
- done
-
- dosbin bin/fb_lock_print
- # SuperServer
- if use superserver ; then
- dosbin bin/{fbguard,fbserver}
- # ClassicServer
- elif use xinetd ; then
- dosbin bin/fb_inet_server
- # SuperClassic
- else
- dosbin bin/{fbguard,fb_smp_server}
-
- #Temp should not be necessary, need to patch/fix
- dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
- fi
-
- exeinto /usr/bin/${PN}
- exeopts -m0755
- doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
- insinto /usr/$(get_libdir)/${PN}/help
- doins help/help.fdb
-
- exeinto /usr/$(get_libdir)/firebird/intl
- dolib.so intl/libfbintl.so
- dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
- dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
- exeinto /usr/$(get_libdir)/${PN}/plugins
- dolib.so plugins/libfbtrace.so
- dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
- exeinto /usr/$(get_libdir)/${PN}/UDF
- doexe UDF/*.so
-
- insinto /usr/share/${PN}/upgrade
- doins "${S}"/src/misc/upgrade/v2/*
-
- insinto /etc/${PN}
- insopts -m0644 -o firebird -g firebird
- doins ../install/misc/*.conf
- insopts -m0660 -o firebird -g firebird
- doins security2.fdb
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/${PN}.xinetd" ${PN}
- else
- newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
- newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
- fperms 640 /etc/conf.d/${PN}
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- diropts -m 755 -o firebird -g firebird
- dodir /var/log/${PN}
- dodir /var/run/${PN}
- keepdir /var/log/${PN}
- keepdir /var/run/${PN}
-
- use examples && docinto examples
-}
-
-pkg_postinst() {
- use client && return
-
- # Hack to fix ownership/perms
- chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
- chmod 750 "${ROOT}/etc/${PN}"
-
- elog
- elog "Firebird is no longer installed in /opt. Binaries are in"
- elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
- elog "are in /var/log/firebird, and lock files in /var/run/firebird"
- elog "The command line tool isql has been renamed to fbsql."
- elog "Please report any problems or issues to bugs.gentoo.org."
- elog
-}
-
-pkg_config() {
- use client && return
-
- # if found /etc/security.gdb from previous install, backup, and restore as
- # /etc/security2.fdb
- if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
- # if we have scurity2.fdb already, back it 1st
- if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
- cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
- fi
- gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
- gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
- mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
- rm "${ROOT}/etc/firebird/security.gbk"
-
- # make sure they are readable only to firebird
- chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
- chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
- einfo
- einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
- einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
- einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
- einfo
- fi
-
- # we need to enable local access to the server
- if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
- touch "${ROOT}/etc/hosts.equiv"
- chown root:0 "${ROOT}/etc/hosts.equiv"
- chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
- fi
-
- # add 'localhost.localdomain' to the hosts.equiv file...
- if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
- fi
-
- # add 'localhost' to the hosts.equiv file...
- if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "localhost" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
- fi
-
- HS_NAME=`hostname`
- if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
- echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
- einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
- fi
-
- einfo "If you're using UDFs, please remember to move them"
- einfo "to /usr/lib/firebird/UDF"
-}
diff --git a/dev-db/freetds/files/config.rpath b/dev-db/freetds/files/config.rpath
new file mode 100755
index 000000000000..c547c68825fa
--- /dev/null
+++ b/dev-db/freetds/files/config.rpath
@@ -0,0 +1,666 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+# Copyright 1996-2007 Free Software Foundation, Inc.
+# Taken from GNU libtool, 2001
+# Originally by Gordon Matzigkeit , 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+# than 256 bytes, otherwise the compiler driver will dump core. The only
+# known workaround is to choose shorter directory names for the build
+# directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+ wl='-Wl,'
+else
+ case "$host_os" in
+ aix*)
+ wl='-Wl,'
+ ;;
+ darwin*)
+ case $cc_basename in
+ xlc*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+ mingw* | cygwin* | pw32* | os2*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+ ;;
+ irix5* | irix6* | nonstopux*)
+ wl='-Wl,'
+ ;;
+ newsos6)
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
+ wl='-Wl,'
+ ;;
+ pgcc | pgf77 | pgf90)
+ wl='-Wl,'
+ ;;
+ ccc*)
+ wl='-Wl,'
+ ;;
+ como)
+ wl='-lopt='
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ osf3* | osf4* | osf5*)
+ wl='-Wl,'
+ ;;
+ rdos*)
+ ;;
+ solaris*)
+ wl='-Wl,'
+ ;;
+ sunos4*)
+ wl='-Qoption ld '
+ ;;
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ wl='-Wl,'
+ ;;
+ sysv4*MP*)
+ ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ wl='-Wl,'
+ ;;
+ unicos*)
+ wl='-Wl,'
+ ;;
+ uts4*)
+ ;;
+ esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
+ # option of GNU ld is called -rpath, not --rpath.
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ case "$host_os" in
+ aix3* | aix4* | aix5*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ fi
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # Samuel A. Falvo II reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we cannot use
+ # them.
+ ld_shlibs=no
+ ;;
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ cygwin* | mingw* | pw32*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ netbsd*)
+ ;;
+ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+ sunos4*)
+ hardcode_direct=yes
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ if test "$ld_shlibs" = no; then
+ hardcode_libdir_flag_spec=
+ fi
+else
+ case "$host_os" in
+ aix3*)
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$GCC" = yes; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+ aix4* | aix5*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ else
+ aix_use_runtimelinking=no
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+ fi
+ hardcode_direct=yes
+ hardcode_libdir_separator=':'
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ ;;
+ esac
+ fi
+ # Begin _LT_AC_SYS_LIBPATH_AIX.
+ echo 'int main () { return 0; }' > conftest.c
+ ${CC} ${LDFLAGS} conftest.c -o conftest
+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`
+ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`
+ fi
+ if test -z "$aix_libpath"; then
+ aix_libpath="/usr/lib:/lib"
+ fi
+ rm -f conftest.c conftest
+ # End _LT_AC_SYS_LIBPATH_AIX.
+ if test "$aix_use_runtimelinking" = yes; then
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ else
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ fi
+ fi
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # see comment about different semantics on the GNU ld section
+ ld_shlibs=no
+ ;;
+ bsdi[45]*)
+ ;;
+ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+ libext=lib
+ ;;
+ darwin* | rhapsody*)
+ hardcode_direct=no
+ if test "$GCC" = yes ; then
+ :
+ else
+ case $cc_basename in
+ xlc*)
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+ fi
+ ;;
+ dgux*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+ freebsd2.2*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ freebsd2*)
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ freebsd* | dragonfly*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ hpux9*)
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ hpux10*)
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+ hpux11*)
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct=no
+ ;;
+ *)
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ esac
+ fi
+ ;;
+ irix5* | irix6* | nonstopux*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ netbsd*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ newsos6)
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ osf3*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ osf4* | osf5*)
+ if test "$GCC" = yes; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ # Both cc and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ hardcode_libdir_separator=:
+ ;;
+ solaris*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ sunos4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ sysv4)
+ case $host_vendor in
+ sni)
+ hardcode_direct=yes # is this really true???
+ ;;
+ siemens)
+ hardcode_direct=no
+ ;;
+ motorola)
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ ;;
+ sysv4.3*)
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ ld_shlibs=yes
+ fi
+ ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator=':'
+ ;;
+ uts4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec= # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+ aix3*)
+ library_names_spec='$libname.a'
+ ;;
+ aix4* | aix5*)
+ library_names_spec='$libname$shrext'
+ ;;
+ amigaos*)
+ library_names_spec='$libname.a'
+ ;;
+ beos*)
+ library_names_spec='$libname$shrext'
+ ;;
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ cygwin* | mingw* | pw32*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+ darwin* | rhapsody*)
+ shrext=.dylib
+ library_names_spec='$libname$shrext'
+ ;;
+ dgux*)
+ library_names_spec='$libname$shrext'
+ ;;
+ freebsd1*)
+ ;;
+ freebsd* | dragonfly*)
+ case "$host_os" in
+ freebsd[123]*)
+ library_names_spec='$libname$shrext$versuffix' ;;
+ *)
+ library_names_spec='$libname$shrext' ;;
+ esac
+ ;;
+ gnu*)
+ library_names_spec='$libname$shrext'
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $host_cpu in
+ ia64*)
+ shrext=.so
+ ;;
+ hppa*64*)
+ shrext=.sl
+ ;;
+ *)
+ shrext=.sl
+ ;;
+ esac
+ library_names_spec='$libname$shrext'
+ ;;
+ interix[3-9]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ irix5* | irix6* | nonstopux*)
+ library_names_spec='$libname$shrext'
+ case "$host_os" in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+ *) libsuff= shlibsuff= ;;
+ esac
+ ;;
+ esac
+ ;;
+ linux*oldld* | linux*aout* | linux*coff*)
+ ;;
+ linux* | k*bsd*-gnu)
+ library_names_spec='$libname$shrext'
+ ;;
+ knetbsd*-gnu)
+ library_names_spec='$libname$shrext'
+ ;;
+ netbsd*)
+ library_names_spec='$libname$shrext'
+ ;;
+ newsos6)
+ library_names_spec='$libname$shrext'
+ ;;
+ nto-qnx*)
+ library_names_spec='$libname$shrext'
+ ;;
+ openbsd*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
+ os2*)
+ libname_spec='$name'
+ shrext=.dll
+ library_names_spec='$libname.a'
+ ;;
+ osf3* | osf4* | osf5*)
+ library_names_spec='$libname$shrext'
+ ;;
+ rdos*)
+ ;;
+ solaris*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sunos4*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
+ sysv4 | sysv4.3*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sysv4*MP*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ library_names_spec='$libname$shrext'
+ ;;
+ uts4*)
+ library_names_spec='$libname$shrext'
+ ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <
+
+ Use the dev-util/google-perftools libraries to
+ replace the malloc() implementation with a possibly faster one.
+
+
Add support for compressed tables through
sys-libs/zlib.
diff --git a/dev-db/hsqldb/files/35hsqldb b/dev-db/hsqldb/files/35hsqldb
new file mode 100644
index 000000000000..7ea66e048230
--- /dev/null
+++ b/dev-db/hsqldb/files/35hsqldb
@@ -0,0 +1 @@
+CONFIG_PROTECT="/var/lib/hsqldb"
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
index e842964186ba..c47f242bece6 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.7 2012/02/07 12:26:05 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild,v 1.6 2011/10/19 01:58:38 fordfrog Exp $
EAPI=1
JAVA_PKG_IUSE="doc source test"
@@ -96,8 +96,8 @@ src_install() {
fi
use source && java-pkg_dosrc src/*
- echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
- doenvd "${T}"/35hsqldb || die
+ # Install env file for CONFIG_PROTECT support
+ doenvd "${FILESDIR}/35hsqldb" || die
# Put init, configuration and authorization files in /etc
doinitd "${FILESDIR}/hsqldb" || die
@@ -168,4 +168,13 @@ pkg_postinst() {
elog "init script to your start-up scripts, this should be done like this:"
elog " \`rc-update add hsqldb default\`"
echo
+
+ # Enable CONFIG_PROTECT for hsqldb
+ env-update
+ elog "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
+ elog "is added to the CONFIG_PROTECT list. In order to immediately activate"
+ elog "these settings please do:"
+ elog " \`env-update && source /etc/profile\`"
+ elog "Otherwise the settings will become active next time you login"
+ echo
}
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
index d513407b5814..f4b46f819f49 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.2 2012/02/07 12:26:05 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.1 2011/10/19 11:02:38 fordfrog Exp $
EAPI=1
JAVA_PKG_IUSE="doc source test"
@@ -96,8 +96,8 @@ src_install() {
fi
use source && java-pkg_dosrc src/*
- echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
- doenvd "${T}"/35hsqldb || die
+ # Install env file for CONFIG_PROTECT support
+ doenvd "${FILESDIR}/35hsqldb" || die
# Put init, configuration and authorization files in /etc
doinitd "${FILESDIR}/hsqldb" || die
@@ -168,4 +168,13 @@ pkg_postinst() {
elog "init script to your start-up scripts, this should be done like this:"
elog " \`rc-update add hsqldb default\`"
echo
+
+ # Enable CONFIG_PROTECT for hsqldb
+ env-update
+ elog "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
+ elog "is added to the CONFIG_PROTECT list. In order to immediately activate"
+ elog "these settings please do:"
+ elog " \`env-update && source /etc/profile\`"
+ elog "Otherwise the settings will become active next time you login"
+ echo
}
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 4fd7b5dbaace..d5f520f9665e 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -1,2 +1,2 @@
+DIST kyotocabinet-1.2.69.tar.gz 925609 RMD160 ce512f2d2aa4f3cd04bcae271fcd71f6dc033e73 SHA1 93ae2c560f72221cef51d0cb8780eb9e90e9d621 SHA256 9032452af0a72fc2171e87334130b9fb73ff173fb9435f3583216aceb4638f89
DIST kyotocabinet-1.2.70.tar.gz 925694 RMD160 53f7383576db0553d393539a975b0df3f6bd0e96 SHA1 58dee8ff10dbff4d9508fdcfa8d5699ef1035f74 SHA256 6b6f111e99f04c5f79e8dafed0b1458e8b0fa296d6d81e4712b0dcaa17f02ebb
-DIST kyotocabinet-1.2.72.tar.gz 925517 RMD160 20c2a11a80cad9fbd8aa951ea832a521b7c83515 SHA1 3ce2a2b2f8f8d36aa6dea840f62f88342fcd2a3a SHA256 bbdc18e06440e7ad909202410069f408b02449a30c265793190792f1a6ebb2c7
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.69.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.69.ebuild
new file mode 100644
index 000000000000..f224403a7393
--- /dev/null
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.69.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.69.ebuild,v 1.1 2011/07/29 22:12:28 patrick Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A straightforward implementation of DBM"
+HOMEPAGE="http://fallabs.com/kyotocabinet/"
+SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="debug doc examples static-libs"
+
+DEPEND="sys-libs/zlib
+ app-arch/xz-utils"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/fix_configure-1.2.62.patch"
+ sed -ie "/ldconfig/d" Makefile.in
+ sed -ie "/DOCDIR/d" Makefile.in
+}
+
+src_configure() {
+ econf $(use_enable debug) \
+ $(use_enable static-libs static) \
+ $(use_enable !static-libs shared) \
+ --enable-lzma --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+ use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
+
+ if use examples; then
+ insinto /usr/share/${PF}/example
+ doins example/* || die "Install failed"
+ fi
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins -r doc/* || die "Install failed"
+ fi
+}
+
+src_test() {
+ emake -j1 check || die "Tests failed"
+}
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.72.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.72.ebuild
deleted file mode 100644
index 8432ff2bdd57..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.72.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.72.ebuild,v 1.1 2011/12/19 03:09:14 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A straightforward implementation of DBM"
-HOMEPAGE="http://fallabs.com/kyotocabinet/"
-SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples static-libs"
-
-DEPEND="sys-libs/zlib
- app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/fix_configure-1.2.62.patch"
- sed -ie "/ldconfig/d" Makefile.in
- sed -ie "/DOCDIR/d" Makefile.in
-}
-
-src_configure() {
- econf $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_enable !static-libs shared) \
- --enable-lzma --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
- if use examples; then
- insinto /usr/share/${PF}/example
- doins example/* || die "Install failed"
- fi
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins -r doc/* || die "Install failed"
- fi
-}
-
-src_test() {
- emake -j1 check || die "Tests failed"
-}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c7735038bfa3..f6d83a3df632 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,8 @@
DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b
DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8f87 SHA1 0f314a6f396192b364d81feb7732ea2544153ffb SHA256 7d2a42374d05de28180985e8f4de98c2133ea1c7e39d8ccb9c12a4323704a5e7
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
+DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3
+DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
DIST mysql-extras-20100324-0235Z.tar.bz2 1054397 RMD160 7c0800f08ca96cd6dbdd812cb7a922d96077361c SHA1 bf77a1e759bfc1bff1ba0914a5701543de4d953f SHA256 6345de31176cbc69b13e92a4d459432c54a82fcd5f54350c4280287da9b3b0c1
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
diff --git a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild b/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
index f63980b5b6a8..d030f57f3167 100644
--- a/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.42-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.42-r1.ebuild,v 1.3 2012/01/08 23:55:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.42-r1.ebuild,v 1.2 2010/04/01 20:33:40 robbat2 Exp $
MY_EXTRAS_VER="20100324-0235Z"
-EAPI="4"
+EAPI=2
inherit toolchain-funcs mysql
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb/mariadb-5.1.42.ebuild b/dev-db/mariadb/mariadb-5.1.42.ebuild
index 7f6d29278eeb..88ac6bd71f84 100644
--- a/dev-db/mariadb/mariadb-5.1.42.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.42.ebuild,v 1.7 2012/01/08 23:55:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.42.ebuild,v 1.6 2010/04/01 20:33:40 robbat2 Exp $
MY_EXTRAS_VER="20100324-0235Z"
-EAPI="4"
+EAPI=2
inherit toolchain-funcs mysql
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb/mariadb-5.1.50.ebuild b/dev-db/mariadb/mariadb-5.1.50.ebuild
index dc79a0a97727..c6f6550b2d13 100644
--- a/dev-db/mariadb/mariadb-5.1.50.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.50.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.50.ebuild,v 1.3 2012/01/08 23:55:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.50.ebuild,v 1.2 2010/10/07 19:05:47 robbat2 Exp $
MY_EXTRAS_VER="20101006-0004Z"
-EAPI="4"
+EAPI=2
inherit toolchain-funcs mysql
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb/mariadb-5.1.55.ebuild b/dev-db/mariadb/mariadb-5.1.55.ebuild
index 7f9927c2207d..de429e9a68b7 100644
--- a/dev-db/mariadb/mariadb-5.1.55.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.55.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.55.ebuild,v 1.2 2012/01/06 20:27:23 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.55.ebuild,v 1.1 2011/07/15 11:51:40 jmbsvicetto Exp $
MY_EXTRAS_VER="20110426-1046Z"
-EAPI="4"
+EAPI="2"
# Build system
BUILD="autotools"
diff --git a/dev-db/mariadb/mariadb-5.2.7.ebuild b/dev-db/mariadb/mariadb-5.2.7.ebuild
new file mode 100644
index 000000000000..1acbdd46bd8e
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.7.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.7.ebuild,v 1.2 2011/08/19 15:47:28 jmbsvicetto Exp $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ emake check || die "make check failed"
+ if ! use "minimal" ; then
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+ else
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb-5.2.8.ebuild
new file mode 100644
index 000000000000..a80dcfcf4b2c
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.2.8.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.8.ebuild,v 1.1 2011/08/19 15:49:18 jmbsvicetto Exp $
+
+MY_EXTRAS_VER="20110819-0415Z"
+EAPI="2"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+ sed -i \
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \
+ "${S}"/unittest/mytap/t/Makefile.am
+ mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ emake check || die "make check failed"
+ if ! use "minimal" ; then
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ cd "${S}"
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ local retstatus_unit
+ local retstatus_ns
+ local retstatus_ps
+ local t
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+ # The entire 5.0 series has pre-generated SSL certificates, they have
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem
+ # The certs really SHOULD be generated for the tests, so that they are
+ # not expiring like this. We cannot do so ourselves as the tests look
+ # closely as the cert path data, and we do not have the CA key to regen
+ # ourselves. Alternatively, upstream should generate them with at least
+ # 50-year validity.
+ #
+ # Known expiry points:
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+ #
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+ # expired/invalid.
+ case ${PV} in
+ 5.1.*|5.4.*|5.5.*)
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+ mysql-v2_disable_test \
+ "$t" \
+ "These OpenSSL tests break due to expired certificates"
+ done
+ ;;
+ esac
+
+ # These are also failing in MySQL 5.1 for now, and are believed to be
+ # false positives:
+ #
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema,
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.not_partition:
+ # Failure reason unknown at this time, must resolve before package.mask
+ # removal FIXME
+ case ${PV} in
+ 5.1.*|5.2.*|5.4.*|5.5.*)
+ for t in main.mysql_client_test main.mysql_comments \
+ main.mysql_upgrade \
+ main.information_schema \
+ main.not_partition funcs_1.is_columns_mysql \
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+ ;;
+ esac
+
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+ # These tests are picking up a 'connect-timeout' config from somewhere,
+ # which is not valid, and since it does not have 'loose-' in front of
+ # it, it's causing a failure
+ case ${PV} in
+ 5.1.5*|5.4.*|5.5.*|6*)
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+ mysql-v2_disable_test "$t" \
+ "False positives in Gentoo: connect-timeout"
+ done
+ ;;
+ esac
+
+ use profiling && use community \
+ || mysql-v2_disable_test main.profiling \
+ "Profiling test needs profiling support"
+
+ if [ "${PN}" == "mariadb" ]; then
+ for t in \
+ parts.part_supported_sql_func_ndb \
+ parts.partition_auto_increment_ndb ; do
+ mysql-v2_disable_test $t "ndb not supported in mariadb"
+ done
+ fi
+
+ # create directories because mysqladmin might make out of order
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+ # We run the test protocols seperately
+ emake test-unit
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+ retstatus_ns=$?
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+ retstatus_ps=$?
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ # TODO:
+ # When upstream enables the pr and nr testsuites, we need those as well.
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+ else
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild
index 44b115c08837..33925c09da88 100644
--- a/dev-db/mariadb/mariadb-5.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.9.ebuild,v 1.2 2012/01/06 20:27:23 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.9.ebuild,v 1.1 2011/09/30 02:53:07 jmbsvicetto Exp $
MY_EXTRAS_VER="20110819-0415Z"
-EAPI="4"
+EAPI="2"
# Build system
BUILD="autotools"
diff --git a/dev-db/mongodb/mongodb-2.0.2.ebuild b/dev-db/mongodb/mongodb-2.0.2.ebuild
index 53b30669d7cf..b5c5b88b2d96 100644
--- a/dev-db/mongodb/mongodb-2.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.2.ebuild,v 1.2 2011/12/19 20:34:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.2.ebuild,v 1.1 2011/12/15 09:56:02 ultrabug Exp $
EAPI=4
SCONS_MIN_VERSION="1.2.0"
@@ -47,10 +47,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
-
- # drop -Werror
- sed -i -e '/Werror/d' SConstruct || die
-
sed -i -e "s@jsapi.h@js/jsapi.h@g" \
-e "s@jsobj.h@js/jsobj.h@g" \
-e "s@jsdate.h@js/jsdate.h@g" \
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild
index 7c295d539498..6facb2c040ef 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild,v 1.4 2011/12/18 17:32:21 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.0-r1.ebuild,v 1.3 2011/11/13 14:49:45 maekke Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug examples gcov static-libs"
DEPEND=">=virtual/mysql-5.1
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild
index 4f0b97e31d2f..4fbf266e5586 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild,v 1.6 2012/02/06 17:17:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild,v 1.1 2011/01/15 17:54:31 robbat2 Exp $
DESCRIPTION="Gentoo MySQL init scripts."
HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
index fa72431e13c5..59ea57fc0a7d 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.4 2011/12/26 12:22:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.2 2010/06/17 21:28:30 patrick Exp $
WANT_AUTOMAKE="1.4"
EAPI=2
@@ -15,7 +15,7 @@ SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+mysql postgres"
DEPEND="mysql? ( virtual/mysql )
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 5bb7554b4b21..f9d5b3e02610 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,4 +1,3 @@
DIST mysql-workbench-gpl-5.2.34-src.tar.gz 18160097 RMD160 9607f1c7082700d1df5b7b1aa42e3c903c68d049 SHA1 e4f9a9ee43783361c05a98196eaf196c42d03a03 SHA256 868dd4d92f601f3789eaa50af9920b9907c5c38711357a898b670acf9892b1ac
DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ece90dabb4b7caab072a2 SHA1 74c2dddba06e4b233f3b28acf8be45f0394310f2 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa
DIST mysql-workbench-gpl-5.2.36-src.tar.gz 18571353 RMD160 2afa2de53cff8fa7e23be449691421db59ca5830 SHA1 039a797970bf237f17eb58c9c6758b52e1b60ea2 SHA256 eedcde69505a0f374613485cf0f1b4e61fc6a32db38a54bbe06b32eebdc175f7
-DIST mysql-workbench-gpl-5.2.37-src.tar.gz 18554877 RMD160 f08369149b5ba3c6890bfbbb29e9087b57ee709a SHA1 5031f0436b01b756bc272d154eb0f6c67b222098 SHA256 44a110ced2877ded14d57d6b217cf03a9a7e83f9f5376ead1872fd01c2685744
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild
index 54f4489b1ec6..c2c32e3f7429 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild,v 1.4 2012/01/04 18:13:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.35.ebuild,v 1.3 2011/12/16 14:28:28 ago Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc nls readline static-libs"
CDEPEND="dev-db/sqlite:3
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.37.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.37.ebuild
deleted file mode 100644
index ff9b9af69fb0..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.37.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.37.ebuild,v 1.1 2012/01/05 16:09:46 graaff Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND=2
-
-inherit gnome2 eutils flag-o-matic python
-
-MY_P="${PN}-gpl-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="http://dev.mysql.com/workbench/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc nls static-libs"
-
-CDEPEND="dev-db/sqlite:3
- >=x11-libs/gtk+-2.6:2
- dev-libs/glib:2
- gnome-base/libglade:2.0
- dev-libs/libsigc++:2
- dev-libs/boost
- >=dev-cpp/ctemplate-0.95
- >=dev-libs/libxml2-2.6.2:2
- >=dev-cpp/glibmm-2.14:2
- >=dev-cpp/gtkmm-2.14:2.4
- dev-libs/libzip
- >=virtual/mysql-5.1
- dev-libs/libpcre
- virtual/opengl
- >=dev-lang/lua-5.1[deprecated]
- x11-libs/pango
- || ( sys-libs/e2fsprogs-libs
- dev-libs/ossp-uuid )
- >=x11-libs/cairo-1.5.12[svg]
- dev-python/pexpect
- dev-python/paramiko
- doc? ( dev-python/pysqlite:2 )
- nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
- app-admin/sudo
- sys-apps/net-tools"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-pkg_setup() {
- # Make sure we use Python 2 since the code is not compatible with 3.
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # ifconfig isn't in the normal path
- sed -i -e 's:ifconfig:/sbin/ifconfig:' plugins/wb.admin/backend/wb_server_control.py || die
-
- # paramiko 1.7.7.1 is newer, update version range check:
- # http://bugs.mysql.com/bug.php?id=63750
- sed -i -e 's/4,5,6/4,5,6,7/' plugins/wb.admin/backend/wb_admin_ssh.py || die
-
- # Remove hardcoded CXXFLAGS
- sed -i -e 's/debug_flags="-ggdb3 /debug_flags="/' configure || die
- sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/Makefile.in ext/scintilla/gtk/Makefile.am || die
-
- # Remove bundled ctemplate version to make sure we use the system
- # version, but leave a directory to avoid confusing configure, bug
- # 357539.
- rm -rf ext/ctemplate || die
- mkdir -p ext/ctemplate/ctemplate-src || die
-}
-
-src_configure() {
- econf \
- $(use_enable nls i18n) \
- $(use_enable debug) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-db/mysql/ChangeLog-2010 b/dev-db/mysql/ChangeLog-2010
deleted file mode 100644
index 56c1d5159546..000000000000
--- a/dev-db/mysql/ChangeLog-2010
+++ /dev/null
@@ -1,2715 +0,0 @@
-# ChangeLog for dev-db/mysql
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog-2010,v 1.1 2012/01/01 20:44:08 dilfridge Exp $
-
-*mysql-5.1.53 (29 Nov 2010)
-*mysql-5.1.52-r1 (29 Nov 2010)
-
- 29 Nov 2010; Robin H. Johnson +mysql-5.1.52-r1.ebuild,
- +mysql-5.1.53.ebuild:
- Version bump & revision bump (for .52 release), both include the fix for bug
- #344031: TEXTREL in libmystrings.so.0.
-
- 13 Nov 2010; Raúl Porcel mysql-5.1.51.ebuild:
- alpha/ia64/s390/sh/sparc stable wrt #339717
-
- 13 Nov 2010; Raúl Porcel mysql-5.1.50-r1.ebuild:
- ia64/s390/sh/sparc stable wrt #321791
-
- 06 Nov 2010; Mart Raudsepp mysql-5.1.52.ebuild:
- Add ~mips keyword, bug 189223
-
- 05 Nov 2010; Markus Meier mysql-5.1.51.ebuild:
- arm stable, bug #339717
-
- 05 Nov 2010; Jeroen Roovers mysql-5.1.51.ebuild:
- Stable for PPC (bug #339717).
-
- 04 Nov 2010; Mark Loeser mysql-5.1.51.ebuild:
- Stable on ppc64; bug #339717
-
-*mysql-5.1.52 (04 Nov 2010)
-
- 04 Nov 2010; Robin H. Johnson +mysql-5.1.52.ebuild:
- Version bump.
-
- 04 Nov 2010; Jeroen Roovers mysql-5.1.51.ebuild:
- Stable for HPPA (bug #339717).
-
- 03 Nov 2010; Markos Chandras mysql-5.1.51.ebuild:
- Stable on amd64 wrt bug #339717
-
- 03 Nov 2010; Pawel Hajdan jr mysql-5.1.51.ebuild:
- x86 stable wrt security bug #339717
-
- 29 Oct 2010; Markus Meier mysql-5.1.50-r1.ebuild:
- arm stable, bug #321791
-
- 24 Oct 2010; Mark Loeser mysql-5.1.50-r1.ebuild:
- Stable for ppc64; bug #321791
-
- 07 Oct 2010; Robin H. Johnson mysql-5.1.51.ebuild:
- We need a newer libtool now, bug #339717 comment #3.
-
-*mysql-5.1.51 (06 Oct 2010)
-
- 06 Oct 2010; Robin H. Johnson +mysql-5.1.51.ebuild:
- Version bump. Amarok use of embedded libmysqld.so is supported again.
-
- 28 Sep 2010; Fabian Groffen mysql-5.1.50-r1.ebuild:
- Marked ~x86-macos, bug #337498
-
- 22 Sep 2010; Brent Baude mysql-5.1.50-r1.ebuild:
- Marking mysql-5.1.50-r1 ppc for bug 321791
-
- 07 Sep 2010; Robin H. Johnson mysql-5.1.50-r1.ebuild:
- Hello again bug #332565.
-
- 06 Sep 2010; Tobias Klausmann
- mysql-5.1.50-r1.ebuild:
- Stable on alpha, bug #321791
-
- 05 Sep 2010; Jeroen Roovers mysql-5.1.50-r1.ebuild:
- Stable for HPPA (bug #321791).
-
- 05 Sep 2010; Robin H. Johnson mysql-5.1.50-r1.ebuild:
- Refix bug #332565.
-
- 03 Sep 2010; Markos Chandras mysql-5.1.50-r1.ebuild:
- Stable on amd64 wrt bug #321791
-
- 03 Sep 2010; Pawel Hajdan jr
- mysql-5.1.50-r1.ebuild:
- x86 stable wrt security bug #321791
-
-*mysql-5.1.50-r1 (01 Sep 2010)
-
- 01 Sep 2010; Robin H. Johnson
- +mysql-5.1.50-r1.ebuild:
- Bug #333923: Need to install my_compiler.h so that PHP compiles. Bug
- #332565: disable a false positive with USE=extraengine.
-
- 01 Sep 2010; Pawel Hajdan jr mysql-5.1.50.ebuild:
- x86 stable wrt security bug #321791
-
- 31 Aug 2010; Markos Chandras mysql-5.1.50.ebuild:
- Stable on amd64 wrt bug #321791
-
-*mysql-5.1.50 (21 Aug 2010)
-
- 21 Aug 2010; Robin H. Johnson +mysql-5.1.50.ebuild:
- Version bump.
-
-*mysql-5.1.49-r1 (09 Aug 2010)
-*mysql-5.0.91 (09 Aug 2010)
-
- 09 Aug 2010; Robin H. Johnson +mysql-5.0.91.ebuild,
- +mysql-5.1.49-r1.ebuild:
- Bug #312435: respin mysql 5.1 for GCC4.5. Bug #320539: avoid crash with
- skip-innodb. Bug #303747: version bump for security.
-
-*mysql-5.1.49 (08 Aug 2010)
-
- 08 Aug 2010; Robin H. Johnson +mysql-5.1.49.ebuild:
- Version bump, should clear the way for security bug #321791.
-
- 07 Jun 2010; Brent Baude mysql-5.0.90-r2.ebuild:
- Marking mysql-5.0.90-r2 ppc64 for bug 303747
-
- 15 May 2010; Jeremy Olexa mysql-5.1.46.ebuild:
- Add ~x64-macos as tested in bug 310533
-
-*mysql-5.1.46 (27 Apr 2010)
-
- 27 Apr 2010; Robin H. Johnson +mysql-5.1.46.ebuild:
- Latest release from upstream. Please note that plugin handling has changed
- a lot now in the eclass, and with it PBXT and XtraDB are handled slightly
- differently for building.
-
- 26 Apr 2010; Fabian Groffen mysql-5.1.45-r1.ebuild:
- Marked ~x86-solaris
-
- 04 Apr 2010; Raúl Porcel mysql-5.0.90-r2.ebuild:
- alpha/ia64/sparc stable wrt #303747
-
- 04 Apr 2010; Markos Chandras mysql-5.0.90-r2.ebuild:
- Stable wrt bug #303747
-
- 02 Apr 2010; Jeroen Roovers mysql-5.0.90-r2.ebuild:
- Stable for HPPA (bug #303747).
-
- 01 Apr 2010; Robin H. Johnson mysql-5.0.87.ebuild,
- mysql-5.0.88.ebuild, mysql-5.0.90.ebuild, mysql-5.0.90-r1.ebuild,
- mysql-5.0.90-r2.ebuild, mysql-5.1.39-r1.ebuild, mysql-5.1.44.ebuild,
- mysql-5.1.44-r1.ebuild, mysql-5.1.44-r2.ebuild, mysql-5.1.44-r3.ebuild,
- mysql-5.1.45.ebuild, mysql-5.1.45-r1.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Reintroduce ~hppa keyword that was removed before due to GCC restrictions.
-
- 01 Apr 2010; Robin H. Johnson mysql-5.0.87.ebuild,
- mysql-5.0.88.ebuild, mysql-5.0.90.ebuild, mysql-5.0.90-r1.ebuild,
- mysql-5.0.90-r2.ebuild, mysql-5.1.39-r1.ebuild, mysql-5.1.44.ebuild,
- mysql-5.1.44-r1.ebuild, mysql-5.1.44-r2.ebuild, mysql-5.1.44-r3.ebuild,
- mysql-5.1.45.ebuild, mysql-5.1.45-r1.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Followup on bug #284946, #293801, #310615, #307251: In 5.0.87, the mutex
- locking code was changed a lot again, so that while 5.0.84 required a
- newer GCC due to the HAVE_ATOMIC_BUILTINS error, newer releases do NOT
- need those GCC versions anymore. This also frees up ~hppa to do more
- stabilization.
-
-*mysql-5.1.45-r1 (24 Mar 2010)
-*mysql-5.1.44-r3 (24 Mar 2010)
-
- 24 Mar 2010; Robin H. Johnson files/my.cnf-5.1,
- +mysql-5.1.44-r3.ebuild, +mysql-5.1.45-r1.ebuild:
- Missed copying back last version of the new my.cnf from my personal
- overlay, and caused bug #311151.
-
- 24 Mar 2010; Robin H. Johnson mysql-5.0.90-r2.ebuild:
- Minor patchset bump for failed testcases that were noted in sec
- stabilization bug #303747, patch from bug #308999.
-
-*mysql-5.1.45 (24 Mar 2010)
-
- 24 Mar 2010; Robin H. Johnson +mysql-5.1.45.ebuild:
- Add 5.1.45 from overlay now.
-
- 24 Mar 2010; Robin H. Johnson mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild, mysql-5.0.87.ebuild,
- mysql-5.0.88.ebuild, mysql-5.0.90.ebuild, mysql-5.0.90-r1.ebuild,
- mysql-5.0.90-r2.ebuild, mysql-5.1.39-r1.ebuild, mysql-5.1.44.ebuild,
- mysql-5.1.44-r1.ebuild, mysql-5.1.44-r2.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Per bug #303747 masking mysql from hppa for now, try to make repoman
- happier until GCC4.3 is available (bug #307251).
-
-*mysql-5.1.44-r2 (24 Mar 2010)
-
- 24 Mar 2010; Robin H. Johnson +files/my.cnf-5.1,
- +mysql-5.1.44-r2.ebuild:
- Bug #306975, #310787: Fix config mode. Bug #310535: Patch for compiling on
- some Prefix arches.
-
- 23 Mar 2010; Brent Baude mysql-5.0.90-r2.ebuild:
- Marking mysql-5.0.90-r2 ppc for bug 303747
-
- 23 Mar 2010; Jeremy Olexa mysql-5.0.90-r2.ebuild:
- Add prefix kws as tested in the Gentoo Prefix overlay, bug 309627
-
- 22 Mar 2010; Robin H. Johnson mysql-5.1.39-r1.ebuild,
- mysql-5.1.44.ebuild, mysql-5.1.44-r1.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Bug #224751: Fix false positive fail of the profiling tests.
-
- 12 Mar 2010; Brent Baude mysql-5.0.83.ebuild:
- Marking mysql-5.0.83 ppc64 for bug 303747
-
- 09 Mar 2010; Christian Faulhammer
- mysql-5.0.90-r2.ebuild:
- x86 stable, security bug 303747
-
- 08 Mar 2010; Robin H. Johnson mysql-5.0.90-r2.ebuild:
- Backport more false positive disabling.
-
- 08 Mar 2010; Robin H. Johnson mysql-5.1.39-r1.ebuild,
- mysql-5.1.44.ebuild, mysql-5.1.44-r1.ebuild:
- Accidently disabling a test twice.
-
- 06 Mar 2010; Robin H. Johnson mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild, mysql-5.0.87.ebuild,
- mysql-5.0.88.ebuild, mysql-5.0.90.ebuild, mysql-5.0.90-r1.ebuild,
- mysql-5.0.90-r2.ebuild:
- Update the official test instructions to disable NDB tests per upstream.
-
- 01 Mar 2010; Robin H. Johnson mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild, mysql-5.0.87.ebuild,
- mysql-5.0.88.ebuild, mysql-5.0.90.ebuild, mysql-5.0.90-r1.ebuild,
- mysql-5.0.90-r2.ebuild, mysql-5.1.39-r1.ebuild, mysql-5.1.44.ebuild,
- mysql-5.1.44-r1.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Bug #307251: update the GCC DEPEND due to C++ template usage.
-
-*mysql-5.1.44-r1 (27 Feb 2010)
-
- 27 Feb 2010; Robin H. Johnson
- +mysql-5.1.44-r1.ebuild:
- Now with PBXT support again. XtraDB 1.0.6-9 confirmed to not work yet.
-
- 23 Feb 2010; Robin H. Johnson metadata.xml:
- Resync the metadata.xml between mysql packages.
-
-*mysql-5.1.44 (21 Feb 2010)
-*mysql-5.1.39-r1 (21 Feb 2010)
-*mysql-5.0.90-r2 (21 Feb 2010)
-
- 21 Feb 2010; Robin H. Johnson
- +mysql-5.0.90-r2.ebuild, -mysql-5.1.39.ebuild, +mysql-5.1.39-r1.ebuild,
- -mysql-5.1.41.ebuild, -mysql-5.1.42.ebuild, -mysql-5.1.43.ebuild,
- +mysql-5.1.44.ebuild, metadata.xml:
- 5.0.90-r2: Bug #305221: Fix ppc64 builds with new revision due to updated
- patches. 5.1.x: Drop older 5.1 ebuilds and add .39-r1 and .44 using latest
- updates and patches, ready for ~arch.
-
- 15 Feb 2010; Robin H. Johnson mysql-5.1.39.ebuild,
- mysql-5.1.41.ebuild, mysql-5.1.42.ebuild, mysql-5.1.43.ebuild,
- mysql-5.4.3_beta.ebuild, mysql-5.5.1_alpha_pre2.ebuild:
- Disable cluster from the official test runs. Will be handled by the
- upcoming mysql-cluster package instead.
-
- 10 Feb 2010; Jorge Manuel B. S. Vicetto
- mysql-5.1.39.ebuild, mysql-5.1.41.ebuild, mysql-5.1.42.ebuild,
- mysql-5.1.43.ebuild, mysql-5.4.3_beta.ebuild,
- mysql-5.5.1_alpha_pre2.ebuild:
- Restricted amarok block to amarok[embedded].
-
-*mysql-5.5.1_alpha_pre2 (02 Feb 2010)
-
- 02 Feb 2010; Robin H. Johnson
- +mysql-5.5.1_alpha_pre2.ebuild:
- Add mysql 5.5.1-m2, we don't support the same version syntax, so mangle
- _alpha_pre -> -m, because _alpha on it's own means something else
- upstream. -m comes BEFORE _alpha.
-
- 02 Feb 2010; Robin H. Johnson metadata.xml:
- Explicitly note what USE=extraengine turns on: Archive, CSV, Blackhole,
- Federated(X), Partition.
-
-*mysql-5.4.3_beta (02 Feb 2010)
-
- 02 Feb 2010; Robin H. Johnson
- +mysql-5.4.3_beta.ebuild:
- Add 5.4 series beta, based on hanno's overlay work. Testsuite false
- positives/known failures updated for 5.4/5.5.
-
- 01 Feb 2010; Robin H. Johnson mysql-5.1.39.ebuild,
- mysql-5.1.41.ebuild, mysql-5.1.42.ebuild, mysql-5.1.43.ebuild:
- We do not have shared-embedded support in MySQL 5.1 yet, still
- work-in-progress, block amarok for now.
-
-*mysql-5.1.43 (01 Feb 2010)
-*mysql-5.1.42 (01 Feb 2010)
-*mysql-5.1.41 (01 Feb 2010)
-*mysql-5.1.39 (01 Feb 2010)
-
- 01 Feb 2010; Robin H. Johnson +mysql-5.1.39.ebuild,
- +mysql-5.1.41.ebuild, +mysql-5.1.42.ebuild, +mysql-5.1.43.ebuild:
- Bring in 5.1 series again from the overlay. 5.1.39 includes working
- Percona XtraDB. 5.1.42 should have XtraDB, but it does not compile. 5.1.43
- is the latest from upstream, for security vulns. MANY thanks to
- jmbsvicetto for all the work he has put in helping on 5.1 updates.
-
- 31 Jan 2010; Robin H. Johnson mysql-5.0.54.ebuild,
- mysql-5.0.70-r1.ebuild, mysql-5.0.72.ebuild, mysql-5.0.72-r1.ebuild,
- mysql-5.0.76.ebuild, mysql-5.0.76-r1.ebuild, mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild:
- Disable the SSL tests in all old 5.x ebuilds because the SSL certificates
- have expired now.
-
- 31 Jan 2010; Robin H. Johnson
- -mysql-5.0.26-r2.ebuild, -mysql-5.0.32.ebuild, -mysql-5.0.34.ebuild,
- -mysql-5.0.38.ebuild, -mysql-5.0.40.ebuild, -mysql-5.0.42.ebuild,
- -mysql-5.0.44.ebuild, -mysql-5.0.44-r1.ebuild, -mysql-5.0.44-r2.ebuild,
- -mysql-5.0.56.ebuild, -mysql-5.0.60.ebuild, -mysql-5.0.60-r1.ebuild,
- -mysql-5.0.70.ebuild:
- Clean up some old versions, keeping only unstables newer than the majority
- of the stables, and one of each of the old major versions.
-
-*mysql-5.0.90-r1 (31 Jan 2010)
-
- 31 Jan 2010; Robin H. Johnson
- +mysql-5.0.90-r1.ebuild:
- Revision bump. 5.0.90-r1 includes the Percona 5.0.87-b20 patchset
- directly. Passes upstream testsuite w/ USE='cluster profiling extraengine
- embedded'. YMMV.
-
-*mysql-5.0.90 (31 Jan 2010)
-*mysql-5.0.88 (31 Jan 2010)
-*mysql-5.0.87 (31 Jan 2010)
-
- 31 Jan 2010; Robin H. Johnson +mysql-5.0.87.ebuild,
- +mysql-5.0.88.ebuild, +mysql-5.0.90.ebuild:
- Version bumps (bugs #301185, #292241, #279493). Only 5.0.87 contains the
- Percona patchset, as no Percona patches have been released for 5.0.88 or
- 5.0.90.
-
- 29 Nov 2009; Tobias Klausmann
- mysql-5.0.84-r1.ebuild:
- Stable on alpha, bug #290485
-
- 26 Nov 2009; Robin H. Johnson mysql-5.0.84-r1.ebuild:
- Update my official test instructions for arches seeking to mark as stable.
-
- 09 Nov 2009; Christian Faulhammer
- mysql-5.0.84-r1.ebuild:
- stable x86, bug 290485
-
- 26 Oct 2009; Samuli Suominen
- mysql-5.0.84-r1.ebuild:
- amd64 stable wrt #290485
-
- 10 Oct 2009; Robin H. Johnson mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild:
- Bug 284946 again, prefix needs gcc-apple too.
-
- 05 Oct 2009; Robin H. Johnson mysql-5.0.83.ebuild,
- mysql-5.0.84.ebuild, mysql-5.0.84-r1.ebuild:
- Bug #284946: Per upstream changes, MySQL now requires at least GCC4.
-
- 08 Sep 2009; Robin H. Johnson mysql-5.0.84-r1.ebuild:
- Bug #284078: Some of the version specs in the patchset were wrong, so the
- patches did not get applied, and lead to a failure to apply.
-
-*mysql-5.0.84-r1 (08 Sep 2009)
-
- 08 Sep 2009; Robin H. Johnson
- +mysql-5.0.84-r1.ebuild:
- Revbump because of bug #283926 causing issues for GCC4.4 users.
-
-*mysql-5.0.84 (04 Sep 2009)
-
- 04 Sep 2009; Robin H. Johnson +mysql-5.0.84.ebuild:
- Version bump. 5.0.85 will follow when that Percona patchset is available.
-
-*mysql-5.0.83 (06 Jul 2009)
-
- 06 Jul 2009; Robin H. Johnson +mysql-5.0.83.ebuild,
- metadata.xml:
- Version bump for bug 267091. Also fixes bugs: 253917, 271475. Include
- Percona patchset 5.0.83-b17. USE=community features now available directly
- and enabled by default.
-
- 14 Apr 2009; Jeremy Olexa
- -mysql-4.1.23_alpha20070101-r61.ebuild:
- remove p.masked version after talking to robbat2 in irc
-
-*mysql-5.0.76-r1 (12 Apr 2009)
-
- 12 Apr 2009; Robin H. Johnson
- +mysql-5.0.76-r1.ebuild:
- Bug #238487, lots of patching fun to enable building of a shared embedded
- libmysqld for Amarok.
-
- 01 Mar 2009; Raúl Porcel mysql-5.0.70-r1.ebuild:
- s390/sh stable wrt #246652
-
- 28 Feb 2009; Robin H. Johnson mysql-4.1.22-r1.ebuild,
- mysql-4.1.23_alpha20070101-r61.ebuild:
- Bug #259977: apply the automake patch so that older 4.1 still compiles.
-
-*mysql-5.0.76 (11 Feb 2009)
-
- 11 Feb 2009; Robin H. Johnson +mysql-5.0.76.ebuild:
- Version bump. Includes new patches for bad whitespace in the HTML encoding
- testcase, plus SIGBUS fixes for sparc. -r1 will contain the Percona
- patchset.
-
- 14 Dec 2008; Tobias Klausmann
- mysql-4.0.27-r1.ebuild, mysql-4.1.22-r1.ebuild,
- mysql-4.1.23_alpha20070101-r61.ebuild:
- Mysql 4 doesn't compile cleanly on alpha (bug 162062) and nothing depends
- on it specifically, so dropping the keyword altogether
-
- 03 Dec 2008; Brent Baude mysql-5.0.70-r1.ebuild,
- mysql-5.0.72-r1.ebuild:
- Marking mysql-5.0.70-r1 ppc64 and mysql-5.0.72-r1 ~ppc64
-
- 03 Dec 2008; Jeroen Roovers mysql-5.0.70-r1.ebuild:
- Stable for HPPA (bug #246652).
-
- 01 Dec 2008; Brent Baude mysql-5.0.72-r1.ebuild:
- Marking mysql-5.0.72-r1 ppc64 for bug 246652
-
- 01 Dec 2008; Raúl Porcel mysql-5.0.70-r1.ebuild:
- alpha/arm/ia64/sparc stable wrt #246652
-
- 30 Nov 2008; Markus Meier mysql-5.0.70-r1.ebuild:
- amd64/x86 stable, bug #246652
-
- 29 Nov 2008; Tobias Scherbaum
- mysql-5.0.70-r1.ebuild:
- ppc stable, bug #246652
-
-*mysql-5.0.72-r1 (29 Nov 2008)
-*mysql-5.0.70-r1 (29 Nov 2008)
-
- 29 Nov 2008; Robin H. Johnson
- +mysql-5.0.70-r1.ebuild, +mysql-5.0.72-r1.ebuild:
- Bump to add security fixes for bug #240407 (MySQL #27884), #229329 (MySQL
- #16470).
-
-*mysql-5.0.72 (29 Nov 2008)
-
- 29 Nov 2008; Robin H. Johnson +mysql-5.0.72.ebuild:
- Version bump, but -r1 to follow shortly with patches, just here for
- debugging.
-
- 29 Nov 2008; Robin H. Johnson mysql-5.0.70.ebuild:
- Move the hostname==localhost check from pkg_setup to pkg_config and
- src_test instead, to enable building in binpkg hosts more easily.
-
- 25 Nov 2008; Brent Baude mysql-5.0.70.ebuild:
- Marking mysql-5.0.70 ppc64 for bug 246652
-
- 22 Nov 2008; Tobias Scherbaum mysql-5.0.70.ebuild:
- ppc stable, bug #246652
-
- 21 Nov 2008; Raúl Porcel mysql-5.0.70.ebuild:
- ia64/sparc/x86 stable wrt #246652
-
- 18 Nov 2008; Robin H. Johnson mysql-5.0.70.ebuild:
- Update archive_gis disable.
-
- 17 Nov 2008; Jeroen Roovers mysql-5.0.70.ebuild:
- Stable for HPPA (bug #246652).
-
- 16 Nov 2008; Thomas Anderson mysql-5.0.70.ebuild:
- stable amd64, bug 246652
-
- 16 Nov 2008; Tobias Klausmann mysql-5.0.70.ebuild:
- Stable on alpha, bug #246652
-
- 14 Nov 2008; Robin H. Johnson mysql-4.0.27-r1.ebuild,
- mysql-4.1.22-r1.ebuild, mysql-4.1.23_alpha20070101-r61.ebuild,
- mysql-5.0.26-r2.ebuild, mysql-5.0.32.ebuild, mysql-5.0.34.ebuild,
- mysql-5.0.38.ebuild, mysql-5.0.40.ebuild, mysql-5.0.42.ebuild,
- mysql-5.0.44.ebuild, mysql-5.0.44-r1.ebuild, mysql-5.0.44-r2.ebuild,
- mysql-5.0.54.ebuild, mysql-5.0.56.ebuild, mysql-5.0.60.ebuild,
- mysql-5.0.60-r1.ebuild, mysql-5.0.70.ebuild:
- Repoman cleanups.
-
- 14 Nov 2008; Robin H. Johnson mysql-5.0.70.ebuild:
- archive_gis is still broken on big_endian.
-
- 14 Nov 2008; Robin H. Johnson mysql-5.0.70.ebuild:
- Test commit again, with repoman.
-
- 14 Nov 2008; Robin H. Johnson files/my.cnf-4.0,
- files/my.cnf-4.1:
- Another instance for bug #237058.
-
- 14 Nov 2008; Robin H. Johnson files/my.cnf:
- Bug #237058, use innodb_file_per_table by default to avoid innodb massive
- growth.
-
-*mysql-5.0.70 (14 Nov 2008)
-
- 14 Nov 2008; Robin H. Johnson +mysql-5.0.70.ebuild:
- Version bump using the straight patchset from 5.0.60 to aid security.
- Later revisions will contain new patches. Please note that
- FEATURES=usersandbox may cause very weird src_test failures.
-
- 05 Aug 2008; Ulrich Mueller metadata.xml:
- Add USE flag description to metadata wrt GLEP 56.
-
- 24 Jul 2008; Raúl Porcel mysql-5.0.60-r1.ebuild:
- alpha/ia64/x86 stable wrt security #220399
-
- 22 Jul 2008; Tobias Scherbaum
- mysql-5.0.60-r1.ebuild:
- ppc stable, bug #220399
-
- 22 Jul 2008; mysql-5.0.60-r1.ebuild:
- AMD64 stable keyword for 5.0.60-r1; for security bug #220399. Tested on
- hardened Opteron 2218 (hardened/amd64, gcc-3.4.6, glibc-2.6.1-r0,
- 2.6.24-hardened-r3 x86_64) and Core 2 Duo
- (default/linux/amd64/2008.0/developer, gcc-4.3.1, glibc-2.8_p20080602-r0,
- 2.6.26 x86_64). NDB fails tests on AMD64, discussed with robbat2, clear to
- proceed.
-
- 21 Jul 2008; Jeroen Roovers mysql-5.0.60-r1.ebuild:
- Stable for HPPA (bug #220399).
-
- 20 Jul 2008; Ferris McCormick mysql-5.0.60-r1.ebuild:
- Sparc stable, Security Bug #220399 (in use for 6 weeks now).
-
-*mysql-5.0.60-r1 (01 Jun 2008)
-
- 01 Jun 2008; Robin H. Johnson
- +mysql-5.0.60-r1.ebuild:
- mysql_config did not return correct output, per bug #224451. Revision bump
- with a fix.
-
- 29 May 2008; Robin H. Johnson mysql-4.0.27-r1.ebuild,
- mysql-4.1.22-r1.ebuild:
- Drop mips down to ~mips to make repoman happy.
-
- 29 May 2008; Robin H. Johnson mysql-5.0.26-r2.ebuild,
- mysql-5.0.32.ebuild, mysql-5.0.34.ebuild, mysql-5.0.38.ebuild,
- mysql-5.0.40.ebuild, mysql-5.0.42.ebuild, mysql-5.0.44.ebuild,
- mysql-5.0.44-r1.ebuild, mysql-5.0.44-r2.ebuild, mysql-5.0.54.ebuild,
- mysql-5.0.56.ebuild, mysql-5.0.60.ebuild:
- Convert all all FEATURES=userpriv tests to be UID -eq 0 to make Paludis et
- al happy.
-
-*mysql-5.0.60 (29 May 2008)
-
- 29 May 2008; Robin H. Johnson +mysql-5.0.60.ebuild:
- Version bump of MySQL finally.
-
- 10 Mar 2008; Robin H. Johnson mysql-4.0.27-r1.ebuild,
- mysql-4.1.22-r1.ebuild, mysql-4.1.23_alpha20070101-r61.ebuild,
- mysql-5.0.56.ebuild:
- Satisfy the never slumbering repoman.
-
-*mysql-5.0.56 (10 Mar 2008)
-
- 10 Mar 2008; Robin H. Johnson +mysql-5.0.56.ebuild:
- 5.0.56 release, just as a plain version bump from 5.0.54. More patches to
- follow in -r1.
-
- 28 Jan 2008; Jeroen Roovers mysql-5.0.54.ebuild:
- Stable for HPPA (bug #201669).
-
- 27 Jan 2008; Ferris McCormick mysql-5.0.54.ebuild:
- Sparc stable, Security Bug #201669 --- see the bug for details.
-
- 27 Jan 2008; Richard Freeman mysql-5.0.54.ebuild:
- amd64 stable - bug #201669
-
- 26 Jan 2008; Brent Baude mysql-5.0.54.ebuild:
- Marking mysql-5.0.54 ppc64 for bug 201669
-
- 26 Jan 2008; Tobias Scherbaum mysql-5.0.54.ebuild:
- ppc stable, bug #201669
-
- 26 Jan 2008; Raúl Porcel mysql-5.0.54.ebuild:
- alpha/ia64 stable wrt security #201669
-
- 25 Jan 2008; Christian Faulhammer
- mysql-3.23.58-r1.ebuild:
- shut up repoman about unqouted variables
-
- 25 Jan 2008; Christian Faulhammer mysql-5.0.54.ebuild:
- stable x86, security bug 201669
-
- 25 Jan 2008; Robin H. Johnson mysql-5.0.54.ebuild:
- Disable the subselect testcase on x86.
-
- 25 Jan 2008; Robin H. Johnson mysql-5.0.54.ebuild:
- Bump the mysql-extras.
-
-*mysql-5.0.54 (15 Jan 2008)
-
- 15 Jan 2008; Robin H. Johnson +mysql-5.0.54.ebuild:
- Add MySQL-5.0.54 to the tree. Unlike some of the intervening releases, this
- one actually works and passes both the testsuite and my own tests.
-
- 18 Nov 2007; Markus Rothe mysql-5.0.44-r2.ebuild:
- Stable on ppc64; bug #198988
-
- 18 Nov 2007; Tobias Scherbaum
- mysql-5.0.44-r2.ebuild:
- ppc stable, bug #198988
-
- 17 Nov 2007; Raúl Porcel mysql-5.0.44-r2.ebuild:
- alpha/ia64 stable wrt security #198988
-
- 16 Nov 2007; Robin H. Johnson mysql-5.0.44-r2.ebuild:
- Stable on amd64 per bug 198988, tested by me, approved by KingTaco.
-
- 16 Nov 2007; Jurek Bartuszek mysql-5.0.44-r2.ebuild:
- x86 stable (bug #198988)
-
- 16 Nov 2007; Jeroen Roovers mysql-5.0.44-r2.ebuild:
- Stable for HPPA (bug #198988).
-
- 16 Nov 2007; Ferris McCormick mysql-5.0.44-r2.ebuild:
- Sparc stable --- Security Bug #198988 --- looks good to me.
-
-*mysql-5.0.44-r2 (16 Nov 2007)
-
- 16 Nov 2007; Robin H. Johnson
- +mysql-5.0.44-r2.ebuild:
- Fix for bug #198988, DoS with InnoDB. Also fixes upstream TMPDIR bug 30287.
-
- 08 Nov 2007; Raúl Porcel mysql-5.0.44-r1.ebuild:
- alpha/ia64/x86 stable
-
- 28 Jul 2007; Steve Dibb mysql-5.0.44-r1.ebuild:
- amd64 stable, security bug 185333
-
- 17 Jul 2007; Gustavo Zacarias
- mysql-5.0.44-r1.ebuild:
- Stable on sparc wrt security #185333
-
- 16 Jul 2007; Jeroen Roovers mysql-5.0.44-r1.ebuild:
- Stable for HPPA (bug #185333).
-
- 16 Jul 2007; Tobias Scherbaum mysql-5.0.44.ebuild:
- ppc stable, bug #185333
-
- 16 Jul 2007; Markus Rothe mysql-5.0.44-r1.ebuild:
- Stable on ppc64; bug #185333
-
- 15 Jul 2007; Raúl Porcel mysql-5.0.44.ebuild:
- alpha/ia64/x86 stable wrt security #185333
-
-*mysql-5.0.44-r1 (15 Jul 2007)
-
- 15 Jul 2007; Robin H. Johnson
- +mysql-5.0.44-r1.ebuild:
- Cleanup of src_test code so that the enterprise and community ebuilds can be
- very similar. Note that upstream has changed the testing procedures such
- that they will always fail if you use FEATURES=-userpriv.
-
- 11 Jul 2007; Michael Sterrett mysql-5.0.44.ebuild:
- fix inherit order so DESCRIPTION is properly set
-
-*mysql-5.0.44 (11 Jul 2007)
-
- 11 Jul 2007; Robin H. Johnson +mysql-5.0.44.ebuild:
- Version bump for bug #184791. Includes patch for mysql_client_test per bug
- #160284, thanks to gabrielp@simnet.is.
-
- 09 Jun 2007; Tobias Scherbaum mysql-5.0.42.ebuild:
- ppc stable, bug #178860
-
- 08 Jun 2007; Raúl Porcel mysql-5.0.42.ebuild:
- alpha/ia64 stable wrt security #178860
-
- 08 Jun 2007; Jeroen Roovers mysql-5.0.42.ebuild:
- Stable for HPPA (bug #178860).
-
- 07 Jun 2007; Christian Faulhammer mysql-5.0.42.ebuild:
- stable x86, security bug 178860
-
- 07 Jun 2007; Gustavo Zacarias mysql-5.0.42.ebuild:
- Stable on sparc wrt security #178860
-
- 07 Jun 2007; Christoph Mende mysql-5.0.42.ebuild:
- Stable on amd64 wrt bug 178860
-
- 07 Jun 2007; Markus Rothe mysql-5.0.42.ebuild:
- Stable on ppc64; bug #178860
-
-*mysql-5.0.42 (07 Jun 2007)
-
- 07 Jun 2007; Robin H. Johnson +mysql-5.0.42.ebuild:
- Version bump, security bug #178860, should also fix #179398 DATE/DATETIME
- upstream regression.
-
- 31 May 2007; Christoph Mende mysql-5.0.40.ebuild:
- Stable on amd64 wrt security bug 177913
-
- 16 May 2007; Tobias Scherbaum mysql-5.0.40.ebuild:
- ppc stable, bug #177913
-
- 16 May 2007; Jose Luis Rivero mysql-5.0.40.ebuild:
- Stable on alpha wrt security bug #177913
-
- 14 May 2007; Gustavo Zacarias mysql-5.0.40.ebuild:
- Stable on sparc wrt security #177913 and #157408
-
- 14 May 2007; Jeroen Roovers mysql-5.0.40.ebuild:
- Stable for HPPA (bug #177913).
-
- 13 May 2007; Raúl Porcel mysql-5.0.40.ebuild:
- ia64 + x86 stable wrt security bug 177913
-
- 13 May 2007; Markus Rothe mysql-5.0.40.ebuild:
- Stable on ppc64; bug #177913
-
-*mysql-5.0.40 (11 May 2007)
-
- 11 May 2007; Robin H. Johnson +mysql-5.0.40.ebuild:
- Version bump. Fixes bugs 168931, 174790, 177913.
-
- 28 Apr 2007; Sven Wegener mysql-3.23.58-r1.ebuild:
- Fix *initd, *confd and *envd calls (#17388, #174266)
-
- 22 Apr 2007; Tobias Scherbaum mysql-5.0.38.ebuild:
- ppc stable, bug #171934
-
- 20 Apr 2007; Jose Luis Rivero mysql-5.0.38.ebuild:
- Stable on alpha wrt #144999
-
- 17 Apr 2007; Gustavo Zacarias mysql-5.0.38.ebuild:
- Stable on sparc wrt security #171934
-
- 16 Apr 2007; Jeroen Roovers mysql-5.0.38.ebuild:
- Stable for HPPA (bug #171934).
-
- 16 Apr 2007; Robin H. Johnson mysql-5.0.38.ebuild:
- Mark x86 as stable as requested of me by Ticho.
-
- 16 Apr 2007; Robin H. Johnson mysql-5.0.38.ebuild:
- The cluster tests fail when run as root, so block them when FEATURES=-userpriv.
-
- 15 Apr 2007; Raúl Porcel mysql-5.0.38.ebuild:
- ia64 stable wrt security bug 171934
-
- 15 Apr 2007; Peter Weller mysql-5.0.38.ebuild:
- Stable on amd64 wrt bug 171934
-
- 15 Apr 2007; Markus Rothe mysql-5.0.38.ebuild:
- Stable on ppc64; bug #171934
-
- 15 Apr 2007; Robin H. Johnson mysql-5.0.38.ebuild:
- Fix whitespace.
-
-*mysql-5.0.38 (15 Apr 2007)
-
- 15 Apr 2007; Robin H. Johnson +mysql-5.0.38.ebuild:
- Version bump, for two security bugs: #171934 and #170126.
-
- 06 Mar 2007; Luca Longinotti mysql-5.0.34.ebuild:
- Port libtool fix properly to mysql.eclass.
- Revert eclass-in-ebuild, fixes bug #169618.
-
- 06 Mar 2007; Robin H. Johnson mysql-5.0.34.ebuild:
- Bug #167758 - fix to support libtool-1.5.23b.
-
-*mysql-5.0.34 (04 Mar 2007)
-
- 04 Mar 2007; Francesco Riosa
- -mysql-5.0.34_alpha20070101-r61.ebuild, +mysql-5.0.34.ebuild:
- version bump
-
- 04 Mar 2007; Marius Mauch mysql-3.23.58-r1.ebuild:
- Replacing einfo with elog
-
- 12 Jan 2007; Luca Longinotti -files/logrotate.mysql,
- mysql-3.23.58-r1.ebuild, -mysql-4.0.25-r2.ebuild, mysql-4.0.27-r1.ebuild,
- -mysql-4.1.21.ebuild, mysql-4.1.22-r1.ebuild,
- mysql-4.1.23_alpha20070101-r61.ebuild, mysql-5.0.26-r2.ebuild,
- -mysql-5.0.30-r1.ebuild, mysql-5.0.32.ebuild,
- mysql-5.0.34_alpha20070101-r61.ebuild:
- Start cleanup.
-
-*mysql-5.0.32 (08 Jan 2007)
-
- 08 Jan 2007; Francesco Riosa +mysql-5.0.32.ebuild:
- version bump
-
-*mysql-5.0.34_alpha20070101-r61 (05 Jan 2007)
-*mysql-5.0.30-r1 (05 Jan 2007)
-*mysql-5.0.26-r2 (05 Jan 2007)
-*mysql-4.1.23_alpha20070101-r61 (05 Jan 2007)
-*mysql-4.1.22-r1 (05 Jan 2007)
-*mysql-4.0.27-r1 (05 Jan 2007)
-
- 05 Jan 2007; Francesco Riosa -files/mysql.conf.d,
- -files/mysql.rc6, -files/mysqlmanager.conf.d, -files/mysqlmanager.rc6,
- -mysql-4.0.27.ebuild, +mysql-4.0.27-r1.ebuild, -mysql-4.1.22.ebuild,
- +mysql-4.1.22-r1.ebuild, -mysql-4.1.23_alpha20070101-r60.ebuild,
- +mysql-4.1.23_alpha20070101-r61.ebuild, -mysql-5.0.26-r1.ebuild,
- +mysql-5.0.26-r2.ebuild, -mysql-5.0.30.ebuild, +mysql-5.0.30-r1.ebuild,
- -mysql-5.0.34_alpha20070101-r60.ebuild,
- +mysql-5.0.34_alpha20070101-r61.ebuild:
- force revision bump, needed to fix/discover bugs introuduced during last
- working days.
-
- 05 Jan 2007; Francesco Riosa mysql-4.0.25-r2.ebuild,
- mysql-4.0.27.ebuild, mysql-4.1.21.ebuild, mysql-4.1.22.ebuild,
- mysql-5.0.26-r1.ebuild, mysql-5.0.30.ebuild:
- bug #156301 => mysql_config has now stripped cflags (version 4.0.x and 4.1.21
- still unpatched)
- bug #160059 => WANT_AUTOCONF and WANT_AUTOMAKE are set to "latest"
-
- 04 Jan 2007; Francesco Riosa mysql-4.0.25-r2.ebuild,
- mysql-4.0.27.ebuild, mysql-4.1.21.ebuild, mysql-4.1.22.ebuild,
- mysql-4.1.23_alpha20070101-r60.ebuild, mysql-5.0.26-r1.ebuild,
- mysql-5.0.30.ebuild, mysql-5.0.34_alpha20070101-r60.ebuild:
- - moved $MY_EXTRAS_VER in ebuilds
- - fix bug #160023, added symlinking in src_install()
- - fix bug #159973, RDEPEND on sys-apps/mysql
-
-*mysql-5.0.34_alpha20070101-r60 (03 Jan 2007)
-*mysql-4.1.23_alpha20070101-r60 (03 Jan 2007)
-
- 03 Jan 2007; Francesco Riosa mysql-4.0.25-r2.ebuild,
- mysql-4.0.27.ebuild, mysql-4.1.21.ebuild, mysql-4.1.22.ebuild,
- +mysql-4.1.23_alpha20070101-r60.ebuild, mysql-5.0.26-r1.ebuild,
- mysql-5.0.30.ebuild, +mysql-5.0.34_alpha20070101-r60.ebuild:
- Better handling of test suite, added bitkeeper snapshot versions.
- Many changes in the eclass.
-
-*mysql-4.1.22 (10 Dec 2006)
-
- 10 Dec 2006; Francesco Riosa +mysql-4.1.22.ebuild:
- As everybody already know mysql is now splitted in community and enterprise
- to better serve their customers, both versions are still under the GPL
- umbrella
- and there is already a lot of information in internet aabout this.
- The "cs" and "en" sources are packaged as dev-db/mysql,
- dev-db/mysql-community.
- Now 4.1.22 homepage show it as community sources but it will appear here too,
- the motivations are listed below:
- - gentoo-team were told by upstream that {cs,en} split only apply to >= 5.0.27
- - comparing the sources with previous don't show differences in fex
- "mysql.info" file, the same file instead is different in 5.0.{27,28} and add
- an explanation of differences between the two releases.
-
- 10 Dec 2006; Francesco Riosa mysql-3.23.58-r1.ebuild,
- mysql-5.0.30.ebuild:
- add LinuxThread patch for mysql-3 after more than one year of brokeness
-
- 09 Dec 2006; Francesco Riosa mysql-5.0.30.ebuild:
- version bump, split of SRC_URIs outside the eclass
-
- 04 Dec 2006; Tim Yamin mysql-5.0.26-r1.ebuild:
- Stable on IA64; bug #144999.
-
- 24 Nov 2006; Markus Rothe mysql-5.0.26-r1.ebuild:
- Stable on ppc64; bug #144999
-
- 23 Nov 2006; Francesco Riosa
- -mysql-5.1.13_alpha20061018.ebuild:
- 5.1.13 is bitkeeper sources, I do assume these are to be considered community
-
- 17 Nov 2006; mysql-5.0.26-r1.ebuild:
- stable on amd64
-
- 08 Nov 2006; Jeroen Roovers mysql-5.0.26-r1.ebuild:
- Stable for HPPA (bug #144999).
-
- 07 Nov 2006; Gustavo Zacarias
- mysql-5.0.26-r1.ebuild:
- Stable on sparc wrt #144999
-
- 06 Nov 2006; nixnut mysql-5.0.26-r1.ebuild:
- Stable on ppc wrt bug 144999
-
- 05 Nov 2006; Christian Faulhammer
- mysql-5.0.26-r1.ebuild:
- stabled x86, bug #144999
-
- 01 Nov 2006; Francesco Riosa mysql-4.0.25-r2.ebuild,
- mysql-4.0.27.ebuild, mysql-4.1.21.ebuild, mysql-5.0.26-r1.ebuild,
- mysql-5.1.13_alpha20061018.ebuild:
- - Added warn to ARCHs to remember them to cvs update the eclasses too
- - converted 4.0.25 to use eclasses.
- - added "~sparc-fbsd" keywords to two dependancies
-
- 27 Oct 2006; Luca Longinotti
- files/digest-mysql-5.1.13_alpha20061018, Manifest:
- Fix digest... Eclasses, please update YOUR ECLASSES!
-
- 27 Oct 2006; Roy Marples mysql-5.0.26-r1.ebuild:
- Added ~sparc-fbsd keyword.
-
- 25 Oct 2006; Francesco Riosa mysql-5.0.26-r1.ebuild:
- Fix "trigger" test
-
-*mysql-5.0.26-r1 (21 Oct 2006)
-
- 21 Oct 2006; Luca Longinotti -mysql-5.0.26.ebuild,
- +mysql-5.0.26-r1.ebuild:
- Fix ABI breakage introduced in MySQL 5.0.26, thanks to Sean Finney for
- discovering this (Debian MySQL maintainer).
-
-*mysql-5.1.13_alpha20061018 (21 Oct 2006)
-
- 21 Oct 2006; Luca Longinotti -mysql-5.0.24-r1.ebuild,
- -mysql-5.1.7_beta.ebuild, +mysql-5.1.13_alpha20061018.ebuild:
- Add MySQL 5.1.13 for the 5.1 series, thanks a lot to vivo for working on 5.1
- support! Also remove old 5.0.24-r1 ebuild.
-
-*mysql-5.0.26 (13 Oct 2006)
-
- 13 Oct 2006; Luca Longinotti files/mysql.rc6,
- +mysql-5.0.26.ebuild:
- Update to MySQL 5.0.26, fix init-script bug.
-
- 10 Oct 2006; Francesco Riosa mysql-5.0.24-r1.ebuild:
- Added patch, fix bug #150458
-
- 30 Sep 2006; Luca Longinotti mysql-4.0.25-r2.ebuild:
- Fix bug #143429.
-
- 05 Sep 2006; Joshua Kinard mysql-4.1.21.ebuild:
- Marked stable on mips.
-
-*mysql-5.0.24-r1 (31 Aug 2006)
-
- 31 Aug 2006; Luca Longinotti mysql-4.0.27.ebuild,
- -mysql-4.1.20.ebuild, mysql-4.1.21.ebuild, -mysql-5.0.24.ebuild,
- +mysql-5.0.24-r1.ebuild, mysql-5.1.7_beta.ebuild:
- Add MySQL 5.0.24a as mysql-5.0.24-r1 (thanks to vivo for re-release support
- in the eclasses/ebuilds). This fixes some ABI breakage introduced by 5.0.24.
- Also cleanup old, unneeded versions.
-
- 28 Aug 2006; Francesco Riosa files/mysql.rc6,
- files/mysqlmanager.rc6:
- small corrections to init.d scripts, thanks robbat2, bug #144999 #c2
-
-*mysql-5.0.24 (08 Aug 2006)
-
- 08 Aug 2006; Luca Longinotti -mysql-5.0.22.ebuild,
- +mysql-5.0.24.ebuild:
- Version bump, fixes security bug #142815.
-
- 04 Aug 2006; Andrej Kacian mysql-4.1.21.ebuild:
- Stable on x86, security bug #142429.
-
- 04 Aug 2006; Thomas Cort mysql-4.1.21.ebuild:
- Stable on amd64 wrt security Bug #142429.
-
- 04 Aug 2006; Rene Nussbaumer mysql-4.1.21.ebuild:
- Stable on hppa. See bug #142429.
-
- 03 Aug 2006; Tobias Scherbaum