diff --git a/app-admin/eselect/eselect-1.4.ebuild b/app-admin/eselect/eselect-1.4.ebuild
index b1423d1da6ce..3f3280ff2e42 100644
--- a/app-admin/eselect/eselect-1.4.ebuild
+++ b/app-admin/eselect/eselect-1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.ebuild,v 1.7 2014/02/24 02:26:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.ebuild,v 1.8 2014/02/27 13:02:55 nimiux Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 6397b6e14c93..cf5adeadbe3e 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -2,3 +2,4 @@ DIST Rex-0.41.2.tar.gz 157094 SHA256 99c85458504d687b63a379bbd51141a64d69fe75a66
DIST Rex-0.41.3.tar.gz 157649 SHA256 de9ea5082fd0eab2e160e8cc7ded41c2aae1a2e40a228a78654f0aed3b8cb647 SHA512 5b37d0808ed89b630a6abd835e33578c6598959637d8f5de83e1312d4a3a3a421baec5aaa6697751ea63ab8d3560cdccccc16fa9a0fbbb160816558bc0d4e9a0 WHIRLPOOL 8a7dc1c46b08eb104549f640ae4fd722b3ee3677ead42e0973fb42a1b81fca38a8b1cc0c204e94697b68bb716db1c59ec291d53373c9af90de8c013b4f0771f1
DIST Rex-0.42.4.tar.gz 165506 SHA256 e54fce5fb1d7df79e4179de2f288a4e3f01fbeebfd4f6709484f6e52d896b6d1 SHA512 aaa5b3471b59960eb7d3b2d86855afedcca3ca1384cfb6734d82ff4f872528cea4ce5d6a052a420faa9cd195820e519719e0bc089b227386789521bcce21095d WHIRLPOOL c6e8a1f23aadc9a39cca7935133556768292fd38d208e281838b717c7f5326c87ffb51d4833d5b06fd98e41e99dafc7defcf72c4cf004953adaf742e6bd54022
DIST Rex-0.43.7.tar.gz 176608 SHA256 cfa5a18c5f1eaa343c0e5c82cc06304f6a3e3c6ffa5b2798446e67889ba28bea SHA512 4e97f157ca84ee2f91bf6871b122bb28ae7ef519b6e2e8af3608b0568a2b3b0441f9458355cca2ed0385b1eea6e92c3b9c6774d8555ca59090e9e81c580ea2bc WHIRLPOOL a78b9ac2bd97c0ffb3e5d75282c581f23d1ac0eb58df1d67accd6885da90c71b6952453449c3c41327335cdf958d4b5485465f1b7a0defd04c93f5c2de17d914
+DIST Rex-0.44.1.tar.gz 186665 SHA256 184ece78ab42e6cc0717d570c78b64810c6e76eac2f9b3cec08b2eedb630c991 SHA512 0e02de58b7ec5f285b586c1ae155c2c5ed9b41fe66da5dcbe5d75782bde09cd50d266b6fbe46495f634d95d60983e52af7578498f6d0f69383d484f96d9173c0 WHIRLPOOL f3fdf85acdb1b3c342a55bdc7528dc196c54baea46d78abe199b69dd151f3a04d5cb0044c27fc65206495f23d24f4f7a5c87547e69ce5a467a917656f4c77b88
diff --git a/app-admin/rex/rex-0.44.1.ebuild b/app-admin/rex/rex-0.44.1.ebuild
new file mode 100644
index 000000000000..270b01295f2e
--- /dev/null
+++ b/app-admin/rex/rex-0.44.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-0.44.1.ebuild,v 1.1 2014/02/28 03:07:47 patrick Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=JFRIED
+MODULE_VERSION=${PV}
+MY_P="Rex-${MODULE_VERSION}"
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-SSH2"
+DEPEND="${RDEPEND}
+ dev-perl/JSON-XS
+ dev-perl/XML-Simple
+ dev-perl/Digest-SHA1
+ dev-perl/Digest-HMAC
+ dev-perl/Expect
+ dev-perl/DBI
+ dev-perl/yaml
+ dev-perl/libwww-perl
+ dev-perl/String-Escape
+ dev-perl/List-MoreUtils"
+
+SRC_TEST="do"
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
new file mode 100644
index 000000000000..60616fa45dd6
--- /dev/null
+++ b/app-arch/lzlib/Manifest
@@ -0,0 +1 @@
+DIST lzlib-1.5.tar.gz 105488 SHA256 dde4812c40c210e1fd0c9ba54208a5120cc0030c01d12ff85d32deb4a0ba07c8 SHA512 d350690457ed41c8d850fa8181bc73a9dffc35a70afece70958ef7cfff2a4846b7ca8ecb8a7dfce2ca8bcb5ae04d2c5bb3f17c15114421d6dda197dd53e10dac WHIRLPOOL 122bde8ea15952f828c52095b8d61b1ddf79373e043d2b81aa1cd10770e3a670204c2782dc704b441051c8e5d8ebf0f2eddaed407700ff6c432dc6a57f5f20bf
diff --git a/app-arch/lzlib/lzlib-1.5.ebuild b/app-arch/lzlib/lzlib-1.5.ebuild
new file mode 100644
index 000000000000..e95a230b9433
--- /dev/null
+++ b/app-arch/lzlib/lzlib-1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzlib/lzlib-1.5.ebuild,v 1.1 2014/02/27 10:55:45 mgorny Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Library for lzip compression"
+HOMEPAGE="http://www.nongnu.org/lzip/lzlib.html"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+ # not autotools-based
+ ./configure \
+ --enable-shared \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CC="$(tc-getCC)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" LDCONFIG=: install
+ einstalldocs
+
+ # this sucking thing does not support disabling static libs
+ if ! use static-libs; then
+ rm "${ED%/}"/usr/$(get_libdir)/*.a || die
+ fi
+}
diff --git a/app-arch/lzlib/metadata.xml b/app-arch/lzlib/metadata.xml
new file mode 100644
index 000000000000..5cb9324943ab
--- /dev/null
+++ b/app-arch/lzlib/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mgorny@gentoo.org
+ Michał Górny
+
+
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index 228f5020bdfb..c32f7e555b34 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -1,2 +1,3 @@
DIST par2cmdline-0.4.tar.gz 239312 SHA256 9e32b7dbcf7bca8249f98824757d4868714156fe2276516504cd26f736e9f677 SHA512 ff504b1b8b1f1ca564b713b53c4fb9f085c7a7c7545b8a70e4a8342fa2224ac2c04a2eeec4b29a24b50b05f5b764bbb1dbffa380812cd7fab36228b527d53e2e WHIRLPOOL 63ce36cc511b858ebebfd7a9c7128421f3ac013e9bd16a0fe2e22cbe8b665bf4581dd45d2c4059cdfbb2971fc23a8d222d867921a4eb2bd8f5e54478ac352df9
DIST par2cmdline-0.6.3.tar.gz 822972 SHA256 903bff9d1720523683cb04db76d37169ebab3a5157f0ae1d5f9065f371929288 SHA512 c664a414ef89abf8a468b382680ba9ea97f90f6d107185ff17208cfed9c44b5aea1040632055baffa0e6bf64bd41807221c0e050e0d3d50413a6af5fa56c7f36 WHIRLPOOL 0ad5bfe1ca2d9654f9c518407fa05ea403960ed24fcf68896d12567adfc3383c57bb3fe81405f1038c7f2cae3e1cba0530dbdf7f67889f5dcc43561e5e473bd6
+DIST par2cmdline-0.6.5.tar.gz 1142005 SHA256 727d668fa932dda6a013248dc8b73e6c8805ccfa45fed6bf8d99b718bbaf44a1 SHA512 03cf4fbf9934cc9177d487849efb4eaa7e36b89c6c1fb24ce2fbd737ec86c4b3380bab856ea558c57072521076b02d680d02993d3c3be0d123162f88c5263c27 WHIRLPOOL 7e6c61ae28fe0cd280d5f2f178a3e38cce47d274b8dbf9e482613ec58e815c66925a28a691c942b5ca811c47962d7d7eb7596a64de8dba049e9f1d626c232688
diff --git a/app-arch/par2cmdline/metadata.xml b/app-arch/par2cmdline/metadata.xml
index 3fdb54c53b7a..aa2a3264b961 100644
--- a/app-arch/par2cmdline/metadata.xml
+++ b/app-arch/par2cmdline/metadata.xml
@@ -5,4 +5,8 @@
swegener@gentoo.org
Primary Maintainer
+
+ radhermit@gentoo.org
+ Tim Harder
+
diff --git a/app-arch/par2cmdline/par2cmdline-0.6.5.ebuild b/app-arch/par2cmdline/par2cmdline-0.6.5.ebuild
new file mode 100644
index 000000000000..0cbbc7acd16b
--- /dev/null
+++ b/app-arch/par2cmdline/par2cmdline-0.6.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.6.5.ebuild,v 1.1 2014/02/28 04:50:53 radhermit Exp $
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A PAR-2.0 file verification and repair tool"
+HOMEPAGE="http://github.com/BlackIkeEagle/par2cmdline"
+SRC_URI="http://github.com/BlackIkeEagle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
new file mode 100644
index 000000000000..c73842f68732
--- /dev/null
+++ b/app-arch/plzip/Manifest
@@ -0,0 +1 @@
+DIST plzip-1.1.tar.gz 71881 SHA256 77d935fc83ffe6a3e689edd67441291a94dbfc468653eba33524909ef5c71f63 SHA512 8a4c9de51edc085c6142cd507c3f29b35c7604d7663a299dfc2d5d22d8ef5020295823eaa6c19ed11c861b6fa79e7f687f048419f4c5206ccd2b6d9390bd3438 WHIRLPOOL 6a94a873f376cd9433b695127f922931e50fc238022950bdedf93d67bb946839ac36de60766eb658768dd39fb262be6a743d545cc5777f679b67cb2f38456a8b
diff --git a/app-arch/plzip/metadata.xml b/app-arch/plzip/metadata.xml
new file mode 100644
index 000000000000..5cb9324943ab
--- /dev/null
+++ b/app-arch/plzip/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ mgorny@gentoo.org
+ Michał Górny
+
+
diff --git a/app-arch/plzip/plzip-1.1.ebuild b/app-arch/plzip/plzip-1.1.ebuild
new file mode 100644
index 000000000000..b8e45411350e
--- /dev/null
+++ b/app-arch/plzip/plzip-1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/plzip/plzip-1.1.ebuild,v 1.1 2014/02/27 10:55:49 mgorny Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallel lzip compressor"
+HOMEPAGE="http://www.nongnu.org/lzip/plzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/lzlib"
+
+src_configure() {
+ # not autotools-based
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ CXX="$(tc-getCXX)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" || die
+}
diff --git a/app-arch/tardy/tardy-1.28.ebuild b/app-arch/tardy/tardy-1.28.ebuild
index 6e463f6ead41..c22bcf72cd99 100644
--- a/app-arch/tardy/tardy-1.28.ebuild
+++ b/app-arch/tardy/tardy-1.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.28.ebuild,v 1.2 2014/01/28 03:51:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tardy/tardy-1.28.ebuild,v 1.3 2014/02/27 12:53:16 nimiux Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tardy/${P}.D001.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
RDEPEND="app-arch/bzip2
app-arch/xz-utils
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 926e15a3287e..c0c076b67b2d 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1 +1,2 @@
DIST xfburn-0.4.3_p20121021.tar.xz 464084 SHA256 3c3541765da9263e435562188ec2c137fb31d19591dd169b6fb2ef2fefa01bc9 SHA512 5c7cf0e14f632769bc0e249c104207dbf3f2bbd9b9836e9aa409b55f44df735a6ddcf4cb41ab71072ab020b1be51f81e2f2b68ed5b04b52907df216bb68acf7d WHIRLPOOL 75bc723699a862e1a243b3bf0ab1a99b49607c25862da412a74d65bede95170e42a3917ca211cabbaf24c2f30ea37540eb7578cbcbd5817180b720b65ee7d16b
+DIST xfburn-0.5.0.tar.bz2 745720 SHA256 76fad0d4256481830d22d4c3d0da9feb1c26c93ad3ed31ab77b9ffdd9eb02ecb SHA512 f0d3fe7adeac280f2023f9a75129d48889f88c39c1e18695a9792f7181f34223f276974b14faa3cd5e08187d665be2b70ec4f2a365c043daba282734b911cf29 WHIRLPOOL 4499ed88be1fa1b82bbc118e9efdc7358534a4d72e67fb6c1eeb508cfa68f2ed069d0c7914ca726d3e1d8a3a1a443e7f07f4752a51eacf6dc3bf0c5ab7a33ee1
diff --git a/app-cdr/xfburn/xfburn-0.5.0.ebuild b/app-cdr/xfburn/xfburn-0.5.0.ebuild
new file mode 100644
index 000000000000..118132a2fda9
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.5.0.ebuild,v 1.1 2014/02/27 14:13:50 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug gstreamer +udev"
+
+RDEPEND=">=dev-libs/glib-2.30
+ >=dev-libs/libburn-0.4.2
+ >=dev-libs/libisofs-0.6.2
+ >=x11-libs/gtk+-2.24:2
+ >=xfce-base/exo-0.6
+ >=xfce-base/libxfce4ui-4.10
+ gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
+ udev? ( virtual/udev[gudev] )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable udev gudev)
+ $(use_enable gstreamer)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/app-emacs/auto-complete/auto-complete-1.3.1.ebuild b/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
index b45097891167..3df6c810f08c 100644
--- a/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
+++ b/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auto-complete/auto-complete-1.3.1.ebuild,v 1.1 2011/01/06 10:53:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/auto-complete/auto-complete-1.3.1.ebuild,v 1.2 2014/02/27 17:49:50 ulm Exp $
-EAPI=3
+EAPI=5
inherit elisp
@@ -11,7 +11,7 @@ HOMEPAGE="http://cx4a.org/software/auto-complete/
http://github.com/m2ym/auto-complete/"
SRC_URI="http://cx4a.org/pub/${PN}/${P}.tar.bz2"
-LICENSE="GPL-3 FDL-1.3"
+LICENSE="GPL-3+ FDL-1.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="linguas_ja"
@@ -23,12 +23,12 @@ src_install() {
# install dictionaries
insinto "${SITEETC}/${PN}"
- doins -r dict || die
+ doins -r dict
- dodoc README.txt TODO.txt etc/test.txt || die
+ dodoc README.txt TODO.txt etc/test.txt
cd doc
- dodoc index.txt manual.txt demo.txt changes.txt *.png || die
+ dodoc index.txt manual.txt demo.txt changes.txt *.png
if use linguas_ja; then
- dodoc index.ja.txt manual.ja.txt changes.ja.txt || die
+ dodoc index.ja.txt manual.ja.txt changes.ja.txt
fi
}
diff --git a/app-emacs/imaxima/imaxima-1.0-r3.ebuild b/app-emacs/imaxima/imaxima-1.0-r3.ebuild
index 07fa1352f133..6fa7b5820015 100644
--- a/app-emacs/imaxima/imaxima-1.0-r3.ebuild
+++ b/app-emacs/imaxima/imaxima-1.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r3.ebuild,v 1.1 2013/01/02 21:03:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r3.ebuild,v 1.2 2014/02/27 17:39:53 ulm Exp $
EAPI=5
@@ -16,22 +16,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="examples"
-DEPEND=""
RDEPEND="virtual/latex-base
app-text/ghostscript-gpl
dev-tex/mh
>=sci-mathematics/maxima-5.29"
S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-1.03.patch ${P}-mlabel.patch"
+ELISP_REMOVE="imaxima.info" # remove broken Info file (will be recreated)
SITEFILE="50${PN}-gentoo.el"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-1.03.patch
- epatch "${FILESDIR}"/${P}-mlabel.patch
- # Remove broken Info file (will be recreated)
- rm imaxima.info
-}
-
src_configure() {
econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
}
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 60df316c45f6..85132720ae1f 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -1,3 +1,2 @@
DIST jde-2.4.0.1.tar.bz2 3719643 SHA256 1481962464e18a11e6dc52a175200d726b0731cca5e09367f510266a424f822a SHA512 ed7957c5ec7a0fb9cdfc87d2f227f7850627e494a4d85712dfb401f4dbb64bad764b104ce41cbd363d4779c404997cd9adb2fa32a33bba4bc644ac1a5aee9ff1 WHIRLPOOL 9f71e0527b2af496c60c4e5549838cb907af4257e07a857eaa00b4ffe8d2a9be2b3d91340b5352c7a55bf540c225d8a621c811df29f095a630f80f11e89ac45f
-DIST jde-2.4.1_pre20110622.tar.gz 3813917 SHA256 ed565e4c644ade7d30d2f7c3e811d9c10df9e86b1aa1ebc81a8d66d62537b5f8 SHA512 b3b653eb396059d7d3de50f9f35869920c901580b18529c5cd4e8c52629bab81a253f0792369c63137570554b44d29417ff42299b8fcf6e2e86941164a1b7498 WHIRLPOOL 961ed023d2af3cdbb5166bb4fdfb32dd176eda18d750180dfec397c6278edb7c914c7925e59ffd5aeeac62ea4baf12dac7fe371b6f89931aa2b6a75e4829c2ac
DIST jdee-2.4.1.tar.xz 2742232 SHA256 24241376837361e23a2c181775423ac248e441e3ced513e21cbef30529cbeb43 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359 WHIRLPOOL c20988fc59fdd453e9942b53d444605dd3738a9978e2bd6a67d30b550e5510926056bc0b7734a9fdf4fd7c4ac09a2bbd1baaf35b92bc94438b378d722ab76a37
diff --git a/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch b/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
deleted file mode 100644
index cafcc5ae9c4d..000000000000
--- a/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-semantic-add-minor-mode accepts two arguments only.
-http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/100114
-
---- jdee-orig/lisp/jde-bug.el
-+++ jdee/lisp/jde-bug.el
-@@ -570,7 +570,7 @@
-
- (run-hook-with-args 'jde-bug-minor-mode-hook jde-bug-minor-mode))
-
--(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug" jde-bug-mode-map)
-+(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug")
-
- ;; (fmakunbound 'jde-bug-key-bindings)
- (defcustom jde-bug-key-bindings
---- jdee-orig/lisp/jde-jdb.el
-+++ jdee/lisp/jde-jdb.el
-@@ -1830,7 +1830,7 @@
- (if (featurep 'xemacs)
- (easy-menu-remove jde-jdb-xemacs-menu-spec))))
-
--(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb" jde-jdb-mode-map)
-+(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb")
-
-
- ;; (fmakunbound 'jde-jdb-key-bindings)
---- jdee-orig/lisp/jde-plugins.el
-+++ jdee/lisp/jde-plugins.el
-@@ -194,7 +194,7 @@
- (easy-menu-add menu-spec jde-plugin-mode-map)
- (easy-menu-remove menu-spec))))))
-
--(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin" jde-plugin-mode-map)
-+(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin")
-
-
- (provide 'jde-plugins)
diff --git a/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild b/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
deleted file mode 100644
index 7e6d0599b7dd..000000000000
--- a/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild,v 1.1 2013/05/06 12:49:46 sera Exp $
-
-EAPI=4
-NEED_EMACS=23
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 elisp eutils
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-# taken from: http://jdee.svn.sourceforge.net/viewvc/jdee/trunk/jdee/?view=tar&pathrev=254
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/jdk-1.3
- app-emacs/elib
- virtual/emacs-cedet
- dev-java/bsh:0
- dev-java/junit:0
- dev-util/checkstyle:0"
-DEPEND="${RDEPEND}
- dev-java/ant-contrib:0"
-
-S="${WORKDIR}/jdee"
-SITEFILE="70${PN}-gentoo.el"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- elisp_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
- epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
- epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
- epatch "${FILESDIR}/${PN}-2.4.1-semantic-emacs-24.patch"
-
- local bshjar csjar
- bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
- csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
- sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
- -e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
-
- cd java/lib || die
- java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
- java-pkg_jar-from junit
- java-pkg_jar-from bsh
-}
-
-src_compile() {
- ANT_TASKS="ant-contrib" \
- eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
- bindist $(usex doc source-doc "")
-}
-
-src_install() {
- local dist="dist/jdee-${PV%_*}"
-
- java-pkg_dojar ${dist}/java/lib/jde.jar
- insinto "${JAVA_PKG_SHAREPATH}"
- doins -r java/bsh-commands
-
- use source && java-pkg_dosrc java/src/*
- use doc && java-pkg_dojavadoc ${dist}/doc/java/api
-
- elisp-install ${PN} ${dist}/lisp/*.{el,elc} || die
- elisp-site-file-install "${SITEFILE}" || die
-
- dobin ${dist}/lisp/jtags
-
- dohtml -r doc/html/*
-}
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index 30d1e00832e8..ce2d6447eac4 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -1,2 +1,2 @@
-DIST popwin-0.3.tar.gz 10394 SHA256 bdeea5f66cd8b0b842347ee1127fc18ec88eb7b6e1c2cc1eac7c8588bdcc50de SHA512 8e672788459406d50cd5d77810ffb5fff7dc0d8d305dc9564054424962931abec65204131561bc4b8a160f7fe05066f946d57949dc300189787f8ff471447558 WHIRLPOOL bfb6900594660af1f910bcc863d8e4b4ff26d6d86d52aa130f55aaca2fe9441740de6476021fb929bf095443c2d8e3df6257efdd4255ce7e36fe09b84b9d08cd
DIST popwin-0.5.1.tar.gz 15700 SHA256 2f3033052d15538049b21c19b7a7114986599ab94a5234038b704e930956b474 SHA512 401dbcf1ee84014f24972facef4ccd9f2b80eb318e6bbdb3c51278d4fc86711b60a2d29a1c8d481ec01172b225981bccd7bcbd136c9c5a49e63bf03f617cbf16 WHIRLPOOL 81c6fe7aa01d3950abbb368a0a160bc00f6a5a8e455f462ffbfc42174ffcc5300b192ead80ed1be471426c4ea144845e4f7a8607ebe982c1d1e424818fea9bc8
+DIST popwin-0.6.2.tar.gz 16821 SHA256 77069e5c642ccee21788f462dc2bdc30ac4789d658585da950cf7097fa41d6e9 SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108 WHIRLPOOL 2739efa75f9e88296f28ab2df93990dac5630a4e6b3a7d094fed1b0ee23066c51f2ff42301cbefec9dff132ec2ddbdab2c532bd49b6f7e20903f382d9f4aa208
diff --git a/app-emacs/popwin/files/popwin-0.3-emacs24.patch b/app-emacs/popwin/files/popwin-0.3-emacs24.patch
deleted file mode 100644
index 0aa7cb2d8ca6..000000000000
--- a/app-emacs/popwin/files/popwin-0.3-emacs24.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/popwin.el b/popwin.el
-index 22f64f0..a5bafeb 100644
---- a/popwin.el
-+++ b/popwin.el
-@@ -4,7 +4,7 @@
-
- ;; Author: Tomohiro Matsuyama
- ;; Keywords: convenience
--;; Version: 0.3
-+;; Version: 0.4
-
- ;; This program is free software; you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
-@@ -69,7 +69,19 @@
-
-
-
--;;; Common API
-+;;; Common
-+
-+(defmacro popwin:save-selected-window (&rest body)
-+ "Evaluate BODY saving the selected window."
-+ `(with-selected-window (selected-window) ,@body))
-+
-+(defun popwin:switch-to-buffer (buffer-or-name &optional norecord)
-+ "Call `switch-to-buffer' forcing BUFFER-OF-NAME be displayed in
-+the selected window."
-+ (with-no-warnings
-+ (if (>= emacs-major-version 24)
-+ (switch-to-buffer buffer-or-name norecord t)
-+ (switch-to-buffer buffer-or-name norecord))))
-
- (defun popwin:last-selected-window ()
- "Return currently selected window or lastly selected window if
-@@ -82,6 +94,12 @@ minibuffer window is selected."
- "Return t if BUFFER might be thought of as a buried buffer."
- (eq (car (last (buffer-list))) buffer))
-
-+(defun popwin:called-interactively-p ()
-+ (with-no-warnings
-+ (if (>= emacs-major-version 23)
-+ (called-interactively-p 'any)
-+ (called-interactively-p))))
-+
- (defvar popwin:empty-buffer nil
- "Marker buffer of indicating a window of the buffer is being a
- popup window.")
-@@ -142,7 +160,7 @@ horizontal factor HFACTOR, and vertical factor VFACTOR."
- (cdr node)
- (popwin:adjust-window-edges window edges hfactor vfactor)
- (with-selected-window window
-- (switch-to-buffer buffer t))
-+ (popwin:switch-to-buffer buffer t))
- (when selected
- (select-window window)))
- (destructuring-bind (dir edges . windows) node
-@@ -221,7 +239,8 @@ window-configuration."
- (root-win (popwin:last-selected-window))
- (hfactor 1)
- (vfactor 1))
-- (delete-other-windows root-win)
-+ (popwin:save-selected-window
-+ (delete-other-windows root-win))
- (let ((root-width (window-width root-win))
- (root-height (window-height root-win)))
- (when adjust
-@@ -238,7 +257,7 @@ window-configuration."
- (popwin:create-popup-window-1 root-win size position)
- ;; Mark popup-win being a popup window.
- (with-selected-window popup-win
-- (switch-to-buffer (popwin:empty-buffer) t))
-+ (popwin:switch-to-buffer (popwin:empty-buffer) t))
- (popwin:replicate-window-config master-win root hfactor vfactor)
- (list master-win popup-win)))))
-
-@@ -410,7 +429,7 @@ BUFFER."
- popwin:selected-window (selected-window))
- (popwin:start-close-popup-window-timer))))
- (with-selected-window popwin:popup-window
-- (switch-to-buffer buffer))
-+ (popwin:switch-to-buffer buffer))
- (setq popwin:popup-buffer buffer
- popwin:popup-window-stuck-p stick)
- (if noselect
-@@ -438,6 +457,10 @@ be closed by `popwin:close-popup-window'."
-
- ;;; Special Display
-
-+(defmacro popwin:without-special-display (&rest body)
-+ "Evaluate BODY without special displaying."
-+ `(let (display-buffer-function special-display-function) ,@body))
-+
- (defcustom popwin:special-display-config
- '(("*Help*")
- ("*Completions*" :noselect t)
-@@ -481,13 +504,19 @@ buffers will be shown at the left of the frame with width 80."
-
- (defun popwin:original-display-buffer (buffer &optional not-this-window)
- "Call `display-buffer' for BUFFER without special displaying."
-- (let (display-buffer-function special-display-function)
-- ;; Close the popup window here so that the popup window won't to
-- ;; be splitted.
-- (when (and (eq (selected-window) popwin:popup-window)
-- (not (same-window-p (buffer-name buffer))))
-- (popwin:close-popup-window))
-- (display-buffer buffer not-this-window)))
-+ (popwin:without-special-display
-+ ;; Close the popup window here so that the popup window won't to
-+ ;; be splitted.
-+ (when (and (eq (selected-window) popwin:popup-window)
-+ (not (same-window-p (buffer-name buffer))))
-+ (popwin:close-popup-window))
-+ (if (and (>= emacs-major-version 24)
-+ (boundp 'action)
-+ (boundp 'frame))
-+ ;; Use variables ACTION and FRAME which are formal parameters
-+ ;; of DISPLAY-BUFFER.
-+ (display-buffer buffer action frame)
-+ (display-buffer buffer not-this-window))))
-
- (defun* popwin:display-buffer-1 (buffer-or-name &key default-config-keywords if-buffer-not-found if-config-not-found)
- "Display BUFFER-OR-NAME, if possible, in a popup
-@@ -548,9 +577,9 @@ usual. This function can be used as a value of
- (popwin:display-buffer-1
- buffer-or-name
- :if-config-not-found
-- (unless (interactive-p)
-- (lambda (buffer-or-name)
-- (popwin:original-display-buffer buffer-or-name not-this-window)))))
-+ (unless (popwin:called-interactively-p)
-+ (lambda (buffer)
-+ (popwin:original-display-buffer buffer not-this-window)))))
-
- (defun popwin:special-display-popup-window (buffer &rest ignore)
- "The `special-display-function' with a popup window."
diff --git a/app-emacs/popwin/popwin-0.5.1.ebuild b/app-emacs/popwin/popwin-0.5.1.ebuild
index 81aa94f588eb..1c316095990c 100644
--- a/app-emacs/popwin/popwin-0.5.1.ebuild
+++ b/app-emacs/popwin/popwin-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.5.1.ebuild,v 1.1 2012/09/08 08:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.5.1.ebuild,v 1.2 2014/02/27 18:00:00 ulm Exp $
EAPI=4
NEED_EMACS=22
@@ -11,10 +11,9 @@ DESCRIPTION="Popup window manager for Emacs"
HOMEPAGE="https://github.com/m2ym/popwin-el/"
SRC_URI="https://github.com/m2ym/popwin-el/tarball/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
SITEFILE="50${PN}-gentoo.el"
DOCS="README.md NEWS.md"
diff --git a/app-emacs/popwin/popwin-0.3-r1.ebuild b/app-emacs/popwin/popwin-0.6.2.ebuild
similarity index 50%
rename from app-emacs/popwin/popwin-0.3-r1.ebuild
rename to app-emacs/popwin/popwin-0.6.2.ebuild
index 3df9bbd83744..640459c635df 100644
--- a/app-emacs/popwin/popwin-0.3-r1.ebuild
+++ b/app-emacs/popwin/popwin-0.6.2.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.3-r1.ebuild,v 1.2 2011/10/21 19:19:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.6.2.ebuild,v 1.1 2014/02/27 18:00:00 ulm Exp $
-EAPI=3
+EAPI=5
NEED_EMACS=22
inherit elisp eutils
DESCRIPTION="Popup window manager for Emacs"
HOMEPAGE="https://github.com/m2ym/popwin-el/"
-SRC_URI="https://github.com/m2ym/popwin-el/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/m2ym/${PN}-el/tarball/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
SITEFILE="50${PN}-gentoo.el"
-DOCS="README.markdown"
-ELISP_PATCHES="${P}-emacs24.patch"
+DOCS="README.md NEWS.md"
src_unpack() {
unpack ${A}
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index 6914b0ebcf26..e37811636c07 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1 +1,2 @@
DIST vhdl-mode-3.33.28.tar.gz 323627 SHA256 47420c4c89e2297684f43cc1d6dd8b209d143bfd2676078df396a538122d388a SHA512 106db906459b609d6733d219a32b2e0277452d0bae3c4943b615d4caf68392ac9e63ca7d95b55889947107fd87209c166b206b2d5f4b7f656da6411680254d93 WHIRLPOOL 419b1569a93d14623b088faa5d67ad9e39798b0ad8eee85513c38266cf8049fe59990641fa461be6a60e649e0939de4928d80115fe2bd65a20294d349161ed19
+DIST vhdl-mode-3.34.2.tar.gz 313856 SHA256 83f5fdb56652bc328698584cf2cbd80f09f9b901e7085dc0a181bcaf6984431c SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f WHIRLPOOL 23df41f11a0fb2df36333b39f83d3f54bd9e5066a83fdeef6b5416af0ac91e23c32759a3779a42c70f1e3e31b4d7479fadd44af9d3eaf4bc05d3110925c51f7b
diff --git a/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el b/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el
index a1780f83cb71..eaf968096ab9 100644
--- a/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el
+++ b/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el
@@ -1,2 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
(autoload 'vhdl-mode "vhdl-mode" "VHDL Mode" t)
(add-to-list 'auto-mode-alist '("\\.vhdl?\\'" . vhdl-mode))
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild
index 957f2102939f..cca42ac6cd93 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.33.28.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/vhdl-mode/vhdl-mode-3.33.28.ebuild,v 1.4 2011/01/08 00:53:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.33.28.ebuild,v 1.5 2014/02/27 18:11:39 ulm Exp $
EAPI=3
@@ -10,7 +10,7 @@ DESCRIPTION="VHDL-mode for Emacs"
HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
new file mode 100644
index 000000000000..b28ae5a07b7e
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild,v 1.1 2014/02/27 18:11:39 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+ elisp_src_install
+ doinfo vhdl-mode.info
+}
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 6cc24623a289..edc17778f8a0 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,2 +1,3 @@
DIST fcitx-unikey-0.2.0.tar.xz 70944 SHA256 152da48ffeb665fc5d88202f6491fa5f4d11284792c2ef079bea4a94c8b125e1 SHA512 10c5c2c5b7e4f40710daccc485b220ed4cdadc6e866636032873a86f9f8489490a42671c9d02aedbbda78a94e40801dd888efc9b692d26ff81fe6d1fe2e10fa7 WHIRLPOOL d6dfd445bd5aa98ec28ab0bd9668f288d67f27874ecdd079f78956172f3d5695fd990ce9e70f190a26edd1eab4f48a8263efc8682fe93679a85fc1db2f6745be
DIST fcitx-unikey-0.2.2.tar.xz 71612 SHA256 d9f6f634aed376d230f0cbea1ccde1eea92760d442af05a00884fa5527b0e378 SHA512 71a0773222b1172943f80bce904da77c136225981a0580d937327829c8d734fc65d9c4afa5275bd210ca837d7a7b9d8bfb18df96f62710068b9883a22499fbfb WHIRLPOOL 4be68ab5f5326f63d8434fe316544b03abdb1a4fe5187a5bea9c812ae42d604f92897de0d653234006c4e46501a458d2d8b8681763c63d9c25a9fcde12d4e6ca
+DIST fcitx-unikey-0.2.3.tar.xz 71628 SHA256 e5c943de52cd892e55d7dee05ebfdd431f921fdade85266043ac99b93e6888ac SHA512 5826022312ad307d8a070cd3ab77a206a5f73d6ce5337cdac4c75ec9a436b055ca0e28fcc7baf2f1512b2cb92c779002a8fc41ac01cdedc3dc669355d825a0aa WHIRLPOOL 74d1d5dad7f4d37242edb787af060e448db6174700878b0bb46b55036282b73eba2071d1b22e0deda9e44a086c82b1dc6b508e766aa04dbc426b6e19986b5cd9
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild
new file mode 100644
index 000000000000..9e6f963e4d4f
--- /dev/null
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-unikey/fcitx-unikey-0.2.3.ebuild,v 1.1 2014/02/27 10:41:48 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Vietnamese Unikey module for Fcitx"
+HOMEPAGE="http://fcitx-im.org/"
+SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt4"
+
+RDEPEND=">=app-i18n/fcitx-4.2.8[qt4?]"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable qt4 QT)
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index c7b1784c85cc..7f1811837468 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,3 @@
-DIST gnote-3.10.1.tar.xz 3038896 SHA256 8466343c43cb5fb223a7abfe43e6e963f64403f96a3c823f5a37474e83d5e1a0 SHA512 f9713a2cced90e00d4aadc3d57a4e946f0d16f41ff72823e36c65ad56a8c0e2d112fe3bc82c487974f089daff962d69b40a04fd5ff3600c569a265fa1fbe8203 WHIRLPOOL e7075b00145145285a41da539666c4db4349e1d5f96075aba49506306533623e559ac3fa348cf0cc9f54194749bd6b2949e2ca8641ac80849520a7233c6260b9
DIST gnote-3.10.2.tar.xz 3042052 SHA256 0311fb5cf4311e8db50628b4773bfc891c8cb843d655911888d48b1ff94aa220 SHA512 00dac283ccfb93d0d33131b5acb15e8b7c1d096810b652e98142722aff696c3a2967ad79c3c3952721a3f012d8df1a54051e94b1bc0bf4e11e0f87ab7177f849 WHIRLPOOL dc99c3bf86e05edbafe39ae5c19b2fdad5d4f693daa479f877c0991df0d48b986270883d3af910821e55958d9bbd68e7ef24086485498a2a1b7f8a5762106b06
+DIST gnote-3.10.3.tar.xz 3047920 SHA256 02e3c60dc49f3b040d86f0bb8c86af563dec91fcae1037bfda05a33a2cb8c5fd SHA512 9bb4ad2167bdcfcdb2df9f81b7e13863dc511ad0608f5f6601802a001cdb8cf37e43cc278c335bde13879e61700c43eeb63442f6c9435c47791d978f9cb6218f WHIRLPOOL 4f3b3e1658cc3f0a7e9c0043bede5007375a5914296faff772662d0ae9779ffc3386f5e862ef91d07be714c4d47b71518a43c99d5b9aeab4675a6fe1ae613df5
DIST gnote-3.8.1.tar.xz 2632020 SHA256 35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa SHA512 e8e320246522aba5311d60c4f9d2b90032f873f2fd0397fa03568dca0c86b9738cf52765f8779206ecd9d9b4a7b732f4bb64daabfda5e35dee49ec08e52dc51e WHIRLPOOL 3af01a5ed06c6bd9769e332769ede49733209a01ed13526af606830bdcc13b5d3d024cb35266f90b2cf777a17ae73ac76744fe450d5588db30bd1e95a7cf6267
diff --git a/app-misc/gnote/gnote-3.10.1.ebuild b/app-misc/gnote/gnote-3.10.3.ebuild
similarity index 88%
rename from app-misc/gnote/gnote-3.10.1.ebuild
rename to app-misc/gnote/gnote-3.10.3.ebuild
index b129a811eefa..a5fb5f434a21 100644
--- a/app-misc/gnote/gnote-3.10.1.ebuild
+++ b/app-misc/gnote/gnote-3.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.10.1.ebuild,v 1.1 2013/12/24 15:36:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.10.3.ebuild,v 1.1 2014/02/27 20:59:37 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
inherit gnome2 readme.gentoo
DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
diff --git a/app-misc/subsurface/Manifest b/app-misc/subsurface/Manifest
index 6df1cc5ab98f..cc61f5023471 100644
--- a/app-misc/subsurface/Manifest
+++ b/app-misc/subsurface/Manifest
@@ -1,4 +1,2 @@
DIST Subsurface-4.0.tgz 2365792 SHA256 99b1a9bcc34c720703bf866f1e51b0487e15e8c63ad02dd162596879dcb1a7f6 SHA512 b501c9506fbc591e89635614d08317684160e4bb524dfad248e35134f0ea2f0c044f0a1a11405a2d7b2c2317657049a70363884eb533c3ee30a476b9c85e41de WHIRLPOOL b69f62a47b1e772301887bba6e86978ce8f1669b99642435450823bc01e6d60704723c1fb5eeff0a38915c883c9eadeaf096ec96e4bf4d7d1eff395808f8ba48
-DIST subsurface-3.0.2.tar.gz 984274 SHA256 41dbb3ca00313019d53b259973f18c6e4cc62b9a9a1a8c5cd5e0d5b911be65c2 SHA512 607d71bd74b2bb9c6ca544de43d2e60ab5468482681f4f4df0e82555a5a6a7b5211ba3ad6463cfaac87b1566dd3cc76b8592d08bd56a8774b67d4eea6bba70bc WHIRLPOOL 536aebd2f23677813f7fb840123b8cdc79519e168bb88c2ff5ec82e2f0150535341a6c9c652954512786a1c292d21f948f6a74d8fcd78125a378043236179cfe
DIST subsurface-3.1.1.tar.gz 1143335 SHA256 3bbd490871c3ea476943e320e6d7cebdcaebc393503c32ac811cc52c6dfee17b SHA512 b53cd797f803219449cc497b3486660bf873e5c29b2f4e15653c5ae06e1a1884b1a4e2aa79ed67998539dc0c5fd413b1b19f8ad52d8234f74700575cc577b615 WHIRLPOOL 84e123c2bb7a3529e311b35035f3668d70d8913ba08e1460e8f6e6531403b69c03f5993c01a29c284ac9deb5b2c62a614182b0ed209483735b5236a4bc454083
-DIST subsurface-3.1.tar.gz 1126173 SHA256 94283ffbacc84c7ef09fd6b9d11a15e178a9fcf64b439cd390fd1dca544c0735 SHA512 718b17436cf6360646a6e91b54c5e6423fa80f89ee86f2222d6e68982e29ae154101933ce3341f5ee4129e161537029091ecf0383777348bb5a5fbd6e76a0bf9 WHIRLPOOL 4ec3dcb973ef276bf499a653a718b66fa092e550a1a580c0045e968c14749ad0fbd8335ea505f8b367ed6d145762d257ecc7192d59f1f593dee5fc35de3d64c8
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index d64ad3680e42..33336362e59c 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -16,10 +16,8 @@
An open source dive log program.
diff --git a/app-misc/subsurface/subsurface-3.0.2-r1.ebuild b/app-misc/subsurface/subsurface-3.0.2-r1.ebuild
deleted file mode 100644
index f94db95d0425..000000000000
--- a/app-misc/subsurface/subsurface-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-3.0.2-r1.ebuild,v 1.1 2013/04/03 21:16:11 tomwij Exp $
-
-EAPI="5"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
- GIT_ECLASS="git-2"
- LIBDC_V="0.3.0"
-else
- SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- LIBDC_V="0.3.0"
-fi
-
-inherit eutils gnome2-utils ${GIT_ECLASS}
-
-LINGUAS="bg bg_BG de de_DE de_CH es es_ES fi fi_FI fr fr_FR hr hr_HR it it_IT
- nb nb_NO nl nl_NL nn no ru ru_RU sk sk_SK sv sv_SE"
-
-DESCRIPTION="An open source dive log program"
-HOMEPAGE="http://subsurface.hohndel.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc map usb"
-for LINGUA in ${LINGUAS}; do
- IUSE+=" linguas_${LINGUA}"
-done
-
-RDEPEND="dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/libzip
- gnome-base/gconf:2
- map? ( sci-geosciences/osm-gps-map )
- net-libs/libsoup:2.4
- sys-libs/glibc
- virtual/libusb
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/pango
-"
-DEPEND="${RDEPEND}
- >=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
- virtual/pkgconfig
- doc? ( app-text/asciidoc )
-"
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- git-2_src_unpack
- elif [[ "${SRC_URI}" == *git* ]]; then
- unpack ${A}
- mv subsurface-v${PV}-* ${P} || die "Failed to mv the failes to ${P}."
- else
- mkdir "${P}" && cd "${P}" || die "Failed to create/change to ${P}."
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Don't hardcode gcc.
- sed -i 's|CC\=gcc||' Makefile || die "Failed to fix gcc hardcode issues."
-
- # Don't hardcode CFLAGS.
- sed -i 's|CFLAGS\=.*||' Makefile || die "Failed to fix hardcoded CFLAGS."
-
- # Don't call gtk_update_icon_cache.
- sed -i -e "s|\$(gtk_update_icon_cache)|:|" Makefile || die "Failed to disable gtk_update_icon_cache call."
-}
-
-src_compile() {
- emake CC=$(tc-getCC)
-
- if use doc; then
- emake doc
- fi
-}
-
-src_install() {
- default
-
- # Remove unwanted linguas
- local del
- for LANG in $(ls "${D}/usr/share/locale"); do
- del=1
- for LINGUA in ${LINGUAS}; do
- if [[ ${LANG/.UTF-8/} == ${LINGUA} ]]; then
- if use linguas_${LINGUA}; then
- del=0
- fi
- break
- fi
- done
- if [[ ${del} == 1 ]]; then
- rm -r "${D}/usr/share/locale/${LANG}" || die "Removing language ${LANG} failed."
- fi
- done
-
- if use doc; then
- dohtml -r "${S}/Documentation/"
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-misc/subsurface/subsurface-3.1.ebuild b/app-misc/subsurface/subsurface-3.1.ebuild
deleted file mode 100644
index 90105dd9937f..000000000000
--- a/app-misc/subsurface/subsurface-3.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-3.1.ebuild,v 1.1 2013/05/20 14:24:57 tomwij Exp $
-
-EAPI="5"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
- GIT_ECLASS="git-2"
- LIBDC_V="0.4.0"
-else
- SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- LIBDC_V="0.4.0"
- S="${WORKDIR}/${P/s/S}"
-fi
-
-inherit eutils gnome2-utils ${GIT_ECLASS}
-
-LINGUAS="bg bg_BG br ca ca_ES da_DK de de_CH de_DE dk ee es es_ES et_EE fi fi_FI fr fr_FR gsw hr
- hr_HR it it_IT nb nb_NO nl nl_NL nn no pl pl_PL pt pt_BR pt_PT ru ru_RU sk sk_SK sv sv_SE"
-
-DESCRIPTION="An open source dive log program"
-HOMEPAGE="http://subsurface.hohndel.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc usb"
-for LINGUA in ${LINGUAS}; do
- IUSE+=" linguas_${LINGUA}"
-done
-
-RDEPEND="dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/libzip
- gnome-base/gconf:2
- sci-geosciences/osm-gps-map
- net-libs/libsoup:2.4
- sys-libs/glibc
- virtual/libusb
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/pango
-"
-DEPEND="${RDEPEND}
- >=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
- virtual/pkgconfig
- doc? ( app-text/asciidoc )
-"
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- git-2_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare() {
- # Don't hardcode gcc.
- sed -i 's|CC\=gcc||' Makefile || die "Failed to fix gcc hardcode issues."
-
- # Don't hardcode CFLAGS.
- sed -i 's|CFLAGS\=.*||' Makefile || die "Failed to fix hardcoded CFLAGS."
-
- # Don't call gtk_update_icon_cache.
- sed -i -e "s|\$(gtk_update_icon_cache)|:|" Makefile || die "Failed to disable gtk_update_icon_cache call."
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-
- if use doc; then
- cd "Documentation" && emake user-manual.xhtml
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" CC="$(tc-getCC)" install
-
- # Remove unwanted linguas
- local del
- for LANG in $(ls "${D}/usr/share/locale"); do
- del=1
- for LINGUA in ${LINGUAS}; do
- if [[ ${LANG/.UTF-8/} == ${LINGUA} ]]; then
- if use linguas_${LINGUA}; then
- del=0
- fi
- break
- fi
- done
- if [[ ${del} == 1 ]]; then
- rm -r "${D}/usr/share/locale/${LANG}" || die "Removing language ${LANG} failed."
- fi
- done
-
- if use doc; then
- dohtml -r "${S}/Documentation/"
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-misc/subsurface/subsurface-4.0.ebuild b/app-misc/subsurface/subsurface-4.0.ebuild
index 2c8112e5c3bc..416e616ee1f2 100644
--- a/app-misc/subsurface/subsurface-4.0.ebuild
+++ b/app-misc/subsurface/subsurface-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-4.0.ebuild,v 1.1 2013/12/23 16:57:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-4.0.ebuild,v 1.2 2014/02/27 11:55:10 pinkbyte Exp $
EAPI="5"
@@ -30,6 +30,7 @@ IUSE="debug doc usb"
RDEPEND="dev-db/sqlite:3
dev-libs/glib:2
+ >=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
dev-libs/libxml2
dev-libs/libxslt
dev-libs/libzip
@@ -40,7 +41,6 @@ RDEPEND="dev-db/sqlite:3
kde-base/marble
"
DEPEND="${RDEPEND}
- >=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
virtual/pkgconfig
doc? ( app-text/asciidoc )
"
diff --git a/app-misc/subsurface/subsurface-9999.ebuild b/app-misc/subsurface/subsurface-9999.ebuild
index 98ba505828ff..35868139b8f2 100644
--- a/app-misc/subsurface/subsurface-9999.ebuild
+++ b/app-misc/subsurface/subsurface-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.4 2013/12/23 16:57:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.5 2014/02/27 11:55:10 pinkbyte Exp $
EAPI="5"
@@ -30,6 +30,7 @@ IUSE="debug doc usb"
RDEPEND="dev-db/sqlite:3
dev-libs/glib:2
+ >=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
dev-libs/libxml2
dev-libs/libxslt
dev-libs/libzip
@@ -40,7 +41,6 @@ RDEPEND="dev-db/sqlite:3
kde-base/marble
"
DEPEND="${RDEPEND}
- >=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
virtual/pkgconfig
doc? ( app-text/asciidoc )
"
diff --git a/app-portage/conf-update/Manifest b/app-portage/conf-update/Manifest
index 5a6dd5bca7c1..76130464779e 100644
--- a/app-portage/conf-update/Manifest
+++ b/app-portage/conf-update/Manifest
@@ -1,3 +1 @@
-DIST conf-update-1.0.1.tar.bz2 17612 SHA256 7490ee4c593e3f9236fe782cc2bf7d5a777f151494c5644c4e2400875a027596 SHA512 8caf718b7369a4b1aeec8d72ef879434379fecd3132b88edafdd4de0eee32be7e41527ebe74657946a8c259321205e59fdb9b29c1248b1d133c51ce039745ee4 WHIRLPOOL 4bbe14d31a96ac9e20a1ec35669bd2949a7735d7dbd8254f4c3e2de5fd491501fea45e934df93951bc508a7e738945134ae005e27c1a7158f7277aa805526ddc
DIST conf-update-1.0.2.tar.bz2 18243 SHA256 1246b83d8927e4333cfcb535217e5f055bc9aa0290f617c2ab1bb97dbeb3de9c SHA512 8611b30e58a9222a024e19d67e957a63d9c44627067a241e4ee5e761f1950ae7f1aa1491f055ba267be65f813ee7da1a8703028736b65dfd2c4ef79ace906f49 WHIRLPOOL 139e07105eed7d8ee5246c24833ecc110c92a5361892a5ee98ea2eee5d30199cbee788f47497d5d32c95c387bbf2df16589faa79c2dbf00b5ca5d347d7483c9e
-DIST conf-update-1.0.tar.bz2 17344 SHA256 6fce628b31bdcce6756f8ee747600af931b4bb44f1839aaf46e5a81118dd6ee9 SHA512 d8157e12951a2d55a6999982e9780aa5a8f4489df160d0f9398905987cd40da46f3923c849783f9dd610fb7c5a39cc911729077ea8b7810b082d42c44564b30b WHIRLPOOL 3f137e87a302bcb05b72295da4aa5d6660d0a79106e1332a436f9b3799991c4b6c3276146f8f3fa66a441b797a749e37a7c97053fc64a20df87b8635adebad29
diff --git a/app-portage/conf-update/conf-update-1.0-r1.ebuild b/app-portage/conf-update/conf-update-1.0-r1.ebuild
deleted file mode 100644
index 487f1cda1f30..000000000000
--- a/app-portage/conf-update/conf-update-1.0-r1.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-portage/conf-update/conf-update-1.0-r1.ebuild,v 1.7 2012/09/30 18:01:12 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="${PN} is a ncurses-based config management utility"
-HOMEPAGE="gopher://blubb.ch/11/software/conf-update"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="colordiff"
-
-RDEPEND=">=dev-libs/glib-2.6
- dev-libs/openssl
- colordiff? ( app-misc/colordiff )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-asneeded.patch \
- "${FILESDIR}"/${P}-regex-classes.patch
- sed -i -e "s/\$Rev:.*\\$/${PVR}/" conf-update.h || die 'version-sed failed'
-
- # -Wno-pointer-sign is gcc-4.1 only
- sed -i -e "s:-Wno-pointer-sign::g" \
- -e "s: -g::" Makefile || die 'gcc-sed failed'
-
- if use colordiff ; then
- sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf || \
- die 'colordiff-sed failed'
- fi
-}
-
-src_compile() {
- emake CC=$(tc-getCC) || die 'emake failed'
-}
-
-src_install() {
- into /usr
- dosbin ${PN} || die 'dosbin failed'
-
- insinto /etc
- doins ${PN}.conf
-
- doman ${PN}.1
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.12.0"
- previous_less_than_0_12_0=$?
-}
-
-pkg_postinst() {
- if [[ $previous_less_than_0_12_0 = 0 ]] ; then
- ewarn "Note that the format for /etc/conf-update.conf changed in this"
- ewarn "version. You should merge the update of that file with e.g."
- ewarn "etc-update."
- fi
-}
diff --git a/app-portage/conf-update/conf-update-1.0.1.ebuild b/app-portage/conf-update/conf-update-1.0.1.ebuild
deleted file mode 100644
index aa3245096254..000000000000
--- a/app-portage/conf-update/conf-update-1.0.1.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/conf-update/conf-update-1.0.1.ebuild,v 1.7 2012/09/30 18:01:12 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="${PN} is a ncurses-based config management utility"
-HOMEPAGE="http://conf-update.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="colordiff"
-
-RDEPEND=">=dev-libs/glib-2.6
- dev-libs/openssl
- colordiff? ( app-misc/colordiff )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- sed -i -e "s/\$Rev:.*\\$/${PVR}/" conf-update.h || die 'version-sed failed'
-
- # -Wno-pointer-sign is gcc-4.1 only
- sed -i -e "s:-Wno-pointer-sign::g" \
- -e "s: -g::" Makefile || die 'gcc-sed failed'
-
- if use colordiff ; then
- sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf || \
- die 'colordiff-sed failed'
- fi
-}
-
-src_compile() {
- emake CC=$(tc-getCC) || die 'emake failed'
-}
-
-src_install() {
- into /usr
- dosbin ${PN} || die 'dosbin failed'
-
- insinto /etc
- doins ${PN}.conf
-
- doman ${PN}.1
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.12.0"
- previous_less_than_0_12_0=$?
-}
-
-pkg_postinst() {
- if [[ $previous_less_than_0_12_0 = 0 ]] ; then
- ewarn "Note that the format for /etc/conf-update.conf changed in this"
- ewarn "version. You should merge the update of that file with e.g."
- ewarn "etc-update."
- fi
-}
diff --git a/app-portage/conf-update/conf-update-1.0.ebuild b/app-portage/conf-update/conf-update-1.0.ebuild
deleted file mode 100644
index 07edf719a222..000000000000
--- a/app-portage/conf-update/conf-update-1.0.ebuild
+++ /dev/null
@@ -1,64 +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/conf-update/conf-update-1.0.ebuild,v 1.10 2012/09/30 18:01:12 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="${PN} is a ncurses-based config management utility"
-HOMEPAGE="gopher://blubb.ch/11/software/conf-update"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="colordiff"
-
-RDEPEND=">=dev-libs/glib-2.6
- dev-libs/openssl
- colordiff? ( app-misc/colordiff )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-asneeded.patch
- sed -i -e "s/\$Rev:.*\\$/${PVR}/" conf-update.h || die 'version-sed failed'
-
- # -Wno-pointer-sign is gcc-4.1 only
- sed -i -e "s:-Wno-pointer-sign::g" \
- -e "s: -g::" Makefile || die 'gcc-sed failed'
-
- if use colordiff ; then
- sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf || \
- die 'colordiff-sed failed'
- fi
-}
-
-src_compile() {
- emake CC=$(tc-getCC) || die 'emake failed'
-}
-
-src_install() {
- into /usr
- dosbin ${PN} || die 'dosbin failed'
-
- insinto /etc
- doins ${PN}.conf
-
- doman ${PN}.1
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.12.0"
- previous_less_than_0_12_0=$?
-}
-
-pkg_postinst() {
- if [[ $previous_less_than_0_12_0 = 0 ]] ; then
- ewarn "Note that the format for /etc/conf-update.conf changed in this"
- ewarn "version. You should merge the update of that file with e.g."
- ewarn "etc-update."
- fi
-}
diff --git a/app-portage/conf-update/files/conf-update-1.0-asneeded.patch b/app-portage/conf-update/files/conf-update-1.0-asneeded.patch
deleted file mode 100644
index c50cbc5dbeaf..000000000000
--- a/app-portage/conf-update/files/conf-update-1.0-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig 2009-01-04 15:50:20.457840024 +0100
-+++ Makefile 2009-01-04 15:49:52.019837225 +0100
-@@ -19,7 +19,7 @@
- conf-update.h: core.h helpers.h index.h modified.h config.h
-
- conf-update: core.o helpers.o conf-update.o index.o modified.o config.o
-- $(CC) $$(pkg-config --libs glib-2.0) -lncurses -lmenu -lcrypto $(LDFLAGS) -o conf-update config.o core.o helpers.o conf-update.o index.o modified.o
-+ $(CC) $(LDFLAGS) -o conf-update config.o core.o helpers.o conf-update.o index.o modified.o $$(pkg-config --libs glib-2.0) -lncurses -lmenu -lcrypto
-
- .PHONY: clean
-
diff --git a/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch b/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch
deleted file mode 100644
index 58c27647317a..000000000000
--- a/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- conf-update-1.0/conf-update.c.orig 2006-10-09 13:23:33.000000000 +0200
-+++ conf-update-1.0/conf-update.c 2010-09-23 08:58:54.982551103 +0200
-@@ -133,12 +133,12 @@
- esc_myfile = g_shell_quote(myfile);
- highest = get_highest_update(protected, protected[i]);
- esc_highest = g_shell_quote(highest);
-- cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
-+ cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
- strcpy(cmd, "diff -Nu ");
- strcat(cmd, esc_myfile);
- strcat(cmd, " ");
- strcat(cmd, esc_highest);
-- strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\"");
-+ strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\"");
-
- free(myfile);
- free(esc_myfile);
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 961f090392f8..0ee843b51c23 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/metadata.xml
@@ -8,6 +8,10 @@
conf-update is a ncurses-based config managment tool
+
+ conf-update es una herramienta de gestión de la configuración
+ basada en ncurses
+