Merged PC and Laptop

8 files changed, 252 insertions, 25 deletions

diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
new file mode 100644
index 0000000..e4fa142
--- /dev/null
+++ b/app-office/texmaker/Manifest
@@ -0,0 +1,3 @@
+AUX texmaker-1.71-hunspell.patch 1701 RMD160 23feb35af205ad2439a994ceed3a041461de318e SHA1 589ee8691da9a8daf2a4c4ff76209db70eccd3e7 SHA256 0e0cf0106209f320c68b7c3670504d6f71f0b9d36f75bd87854a3df9dace9eb9
+DIST texmaker-1.7.1.tar.bz2 1522280 RMD160 37bca67d049fb064b45e09cfbb3453d4cb8bb8da SHA1 055aabf865e8d9baafe2762594469cd2b7d75183 SHA256 e814c68c20663792ca56ba3fb9600841e390463f96dac4f1ba034a35ec454a90
+EBUILD texmaker-1.71-r1.ebuild 1802 RMD160 11a76f1f342ef6b4404d1c2bd63af46fcee124fc SHA1 a88cfa279dd376252245120500278edb14b820b3 SHA256 69fda436a3dc7bdfb848f6fb91f3b3f3106b92ec00d53a516b2c5109eb138723
diff --git a/app-office/texmaker/files/texmaker-1.71-hunspell.patch b/app-office/texmaker/files/texmaker-1.71-hunspell.patch
new file mode 100644
index 0000000..2845196
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-1.71-hunspell.patch
@@ -0,0 +1,67 @@
+diff -r 9450ca28545a spellerdialog.h
+--- a/spellerdialog.h	Fri Jun 27 20:29:16 2008 +0200
++++ b/spellerdialog.h	Fri Jun 27 20:39:29 2008 +0200
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff -r 9450ca28545a texmaker.pro
+--- a/texmaker.pro	Fri Jun 27 20:29:16 2008 +0200
++++ b/texmaker.pro	Fri Jun 27 20:39:29 2008 +0200
+@@ -1,7 +1,8 @@
+ TEMPLATE	= app
+ LANGUAGE	= C++
+ TARGET	 = texmaker
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ ###############################
+ HEADERS	+= texmaker.h \
+ 	symbollistwidget.h \
+@@ -32,22 +33,7 @@
+ 	webpublishdialog.h \
+ 	spellerdialog.h \
+ 	pstrickslistwidget.h \
+-	blockdata.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 
++	blockdata.h 
+ SOURCES	+= main.cpp \
+ 	texmaker.cpp \
+ 	symbollistwidget.cpp \
+@@ -77,16 +63,7 @@
+ 	aboutdialog.cpp \
+ 	webpublishdialog.cpp \
+ 	spellerdialog.cpp \
+-	pstrickslistwidget.cpp \
+-	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
++	pstrickslistwidget.cpp 
+ RESOURCES += texmaker.qrc
+ FORMS   += findwidget.ui\
+ 	gotolinedialog.ui \
diff --git a/app-office/texmaker/texmaker-1.71-r1.ebuild b/app-office/texmaker/texmaker-1.71-r1.ebuild
new file mode 100644
index 0000000..a9fc618
--- /dev/null
+++ b/app-office/texmaker/texmaker-1.71-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.71-r1.ebuild,v 1.1 2008/05/13 20:34:18 aballier 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 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.3.0:4 )
+	>=app-text/hunspell-1.2.2"
+
+RDEPEND="${DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	virtual/ghostscript
+	media-libs/netpbm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-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"
+
+	make_desktop_entry texmaker Texmaker "/usr/share/pixmaps/texmaker/texmaker48x48.png" Office
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "/usr/share/${PN}/usermanual_en.html"
+	elog
+}
diff --git a/sys-fs/fur/Manifest b/sys-fs/fur/Manifest
deleted file mode 100644
index 4b28b7b..0000000
--- a/sys-fs/fur/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST FUR-0.4.3.tar.gz 65323 RMD160 3a033b0ac5a0876ba158837e2bd0f7a6db816a82 SHA1 9300f087ff843a0b975e6c351f655a439dae45f3 SHA256 6a7e8df720d412f73c98fe0ec355b7f3526fe08ef2143cd1da58b5972476d6cc
-EBUILD fur-0.4.3.ebuild 540 RMD160 4819bd94b9a9aa21c2ece7d37a0a5ce49331e046 SHA1 1113178db2f34b91ad9edc89ad1450fc12a8b60b SHA256 8c040440fef6cd67566bf37456d4cf75b19238e1bce25e6420595e5392ae0ec3
diff --git a/sys-fs/fur/fur-0.4.3.ebuild b/sys-fs/fur/fur-0.4.3.ebuild
deleted file mode 100644
index e282a37..0000000
--- a/sys-fs/fur/fur-0.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_P=${P/fur/FUR}
-
-DESCRIPTION="Mount a Windows CE based device on your Linux file system using
-FUSE."
-HOMEPAGE="http://www.infis.univ.trieste.it/~riccardo/"
-SRC_URI="http://www.infis.univ.trieste.it/~riccardo/downloads/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="app-pda/synce-librapi2 app-pda/synce-libsynce sys-fs/fuse"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin ${S}/Fur
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
new file mode 100644
index 0000000..c9b6df8
--- /dev/null
+++ b/x11-misc/zim/Manifest
@@ -0,0 +1,3 @@
+AUX zim-0.25-disable-update-databases.patch 1176 RMD160 f84b1628e7f330634a08ea3f7c29b2fd734431f0 SHA1 4c78e4f44756f84489ce015740151988756fc92f SHA256 6d7008ab7f1d99cea871281d5946a96222cdf23ca5b846613b12d62e62ef3f37
+DIST Zim-0.25.tar.gz 693885 RMD160 d043ab386bc7300c87c785fcdcffd45797597505 SHA1 6af56fefdb7583c375e0e761d503c9a7100a76e5 SHA256 18c3913d5abfb21662137dfdf89e3739d7239332dd3fd9b2b646bb9f315a5d7c
+EBUILD zim-0.25.ebuild 1846 RMD160 da7d2f0d42cab2915a492227f1b0a3f9c0935179 SHA1 905c0a6ccb34288761d8ec11326b2d8658e68d27 SHA256 fb9e02d15324bdf15141362f15638265a21c7d9cc17d5bba2d28deb6ea8da7a8
diff --git a/x11-misc/zim/files/zim-0.25-disable-update-databases.patch b/x11-misc/zim/files/zim-0.25-disable-update-databases.patch
new file mode 100644
index 0000000..7866ab3
--- /dev/null
+++ b/x11-misc/zim/files/zim-0.25-disable-update-databases.patch
@@ -0,0 +1,35 @@
+--- Build.PL.old	2008-06-12 22:52:35.319329618 +0200
++++ Build.PL	2008-06-12 22:53:40.595080260 +0200
+@@ -187,19 +187,19 @@
+ sub ACTION_postinstall {
+ 	my $self = shift;
+ 	my $sharedir = $self->install_destination('share');
+-	my $mimedir = File::Spec->catdir($sharedir, 'mime');
+-	my $icon = File::Spec->catfile($sharedir, 'pixmaps', 'zim.png');
+-	for (
+-		['update-desktop-database'],
+-		['update-mime-database', $mimedir],
+-	#	[qw{xdg-icon-resource install --context apps --size 64},
+-	#		$icon],
+-		[qw{xdg-icon-resource install --context mimetypes --size 64},
+-			$icon, q{text-x-zim-notebook}],
+-	) {
+-		print "Trying: @$_\n";
+-		print system(@$_) == 0 ? "Ok\n\n" : "Failed\n\n" ;
+-	}
++#	my $mimedir = File::Spec->catdir($sharedir, 'mime');
++#	my $icon = File::Spec->catfile($sharedir, 'pixmaps', 'zim.png');
++#	for (
++#		['update-desktop-database'],
++#		['update-mime-database', $mimedir],
++#	#	[qw{xdg-icon-resource install --context apps --size 64},
++#	#		$icon],
++#		[qw{xdg-icon-resource install --context mimetypes --size 64},
++#			$icon, q{text-x-zim-notebook}],
++#	) {
++#		print "Trying: @$_\n";
++#		print system(@$_) == 0 ? "Ok\n\n" : "Failed\n\n" ;
++#	}
+ 
+ }
+ 
diff --git a/x11-misc/zim/zim-0.25.ebuild b/x11-misc/zim/zim-0.25.ebuild
new file mode 100644
index 0000000..0528405
--- /dev/null
+++ b/x11-misc/zim/zim-0.25.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.23.ebuild,v 1.1 2008/05/11 14:24:35 drac Exp $
+
+EAPI=1
+
+inherit fdo-mime perl-module
+
+MY_P=${P/z/Z}
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://www.zim-wiki.org"
+SRC_URI="http://www.zim-wiki.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex screenshot spell"
+
+DEPEND=">=dev-lang/perl-5.8
+	>=x11-libs/gtk+-2.10
+	virtual/perl-Storable
+	virtual/perl-File-Spec
+	>=dev-perl/File-BaseDir-0.03
+	>=dev-perl/File-MimeInfo-0.12
+	>=dev-perl/File-DesktopEntry-0.03
+	>=dev-perl/gtk2-perl-1.040
+	x11-misc/xdg-utils"
+
+RDEPEND="${DEPEND}
+	latex? ( virtual/latex-base app-text/dvipng )
+	screenshot? ( media-gfx/scrot )
+	spell? ( dev-perl/gtk2-spell )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.25-disable-update-databases.patch" )
+
+add_plugin() {
+	name=$1
+
+	sed -i -e "s/\(plugins=.*\)\$/\1,$name/" "${S}/share/zim/default.conf"
+}
+
+src_compile() {
+	add_plugin TrayIcon
+	use latex && add_plugin EquationEditor
+	use screenshot && add_plugin InsertScreenshot
+	use spell && add_plugin Spell
+
+	perl-module_src_compile
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	einfo "Adding icon resource ..."
+	xdg-icon-resource install --context mimetypes --size 64	"${ROOT}usr/share/pixmaps/zim.png" text-x-zim-notebook
+}
+
+pkg_postrm() {
+	perl-module_pkg_postrm
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	# XXX: for up-/downgrades postinst is run first
+	# thus we are then reverting the "xdg-icon-resource install" call and
+	# nothing gets installed =/
+	einfo "Removing icon resource ..."
+	xdg-icon-resource uninstall --context mimetypes --size 64 text-x-zim-notebook
+}