udav-0.3.2: several improvements

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1047 32389bae-6d03-0410-99cf-db05cde120eb

3 files changed, 34 insertions, 35 deletions

diff --git a/sci-visualization/udav/Manifest b/sci-visualization/udav/Manifest
index e482c5322..6ebe13a93 100644
--- a/sci-visualization/udav/Manifest
+++ b/sci-visualization/udav/Manifest
@@ -1,5 +1,5 @@
-AUX udav-fltk.patch 1015 RMD160 c9a00ab68fe01ba9ea6c1085f37362aa37235f49 SHA1 5612c721443be5ea64cf0ca5fa9603bdeb08056c SHA256 b2d5b455973f153947dc6b0ce3e62496b386a4e23c5f324996a37b32c0916600
+AUX udav-fltk.patch 935 RMD160 e396be0487f4a1f11599d8b70c4c1fc4e42e4c15 SHA1 4339750a765c6d267b44444de97733b0dd79c0d6 SHA256 170d1f522aee5c74e8ba10d4d17b5e1fc09285c056f2f880e277fa78ac07af59
 DIST udav-0.3.2.tgz 792044 RMD160 796ceb387896406511ea87c0e1e8aa55a0ef44c7 SHA1 597a190314920747e36d60d687ce51c70cbe0964 SHA256 b21b935bab264d018702cbb59dbde6e4ca0a0fc3840191c964b3c75c67b8ba91
-EBUILD udav-0.3.2.ebuild 1129 RMD160 f501ec8264289847953eba3d5c7599d6905b4df5 SHA1 cc936672e059a44e8ea00bce5a539ba96183b4aa SHA256 7549464d6914636595bacdfb96a390b3d8e3acfde2f1df49e5be69f6e463bb0d
+EBUILD udav-0.3.2.ebuild 1003 RMD160 f299a95bf382e961e5abbd2b5a45f3dd5eaa3b1c SHA1 7082cbb41284dbe0c7340c9cb23de9b4bca31c20 SHA256 4c9527b937e0b1e390f96bb4a2ce68b0936fa6e40792c941945051c324764eb1
 MISC ChangeLog 251 RMD160 9c1e4f257d789ff05a36dc4b4479f7ccaf350a9f SHA1 1f727f3e3c39e8a7481566e1fc911bc5eb15e4a8 SHA256 63662ba88cd002ad7144e80c8dbe008a4aae5a18b9df53e88a8cfe50ae7a7e84
 MISC metadata.xml 325 RMD160 bdc5fff2ae251a58a757532b6b9f566332f0fe4b SHA1 7823da33669f6ee889973afc5c2207f86ecd5447 SHA256 c5b8349fb607df04ecafdb2c05d4941d8b47c2ab31892a9a0ccb54b79298f75f
diff --git a/sci-visualization/udav/files/udav-fltk.patch b/sci-visualization/udav/files/udav-fltk.patch
index 0c0650fdb..8bf35d2d7 100644
--- a/sci-visualization/udav/files/udav-fltk.patch
+++ b/sci-visualization/udav/files/udav-fltk.patch
@@ -1,20 +1,24 @@
-diff -U2 --recursive udav-0.3.2.orig/configure.ac udav-0.3.2/configure.ac
---- udav-0.3.2.orig/configure.ac	2008-04-03 01:24:14.000000000 +0700
-+++ udav-0.3.2/configure.ac	2008-05-03 12:49:16.000000000 +0700
-@@ -18,6 +18,6 @@
+--- configure.ac.orig	2008-04-03 07:24:14.000000000 +1300
++++ configure.ac	2008-05-11 16:34:17.000000000 +1200
+@@ -17,10 +17,9 @@
+ 	[echo "Please install MathGL library (libmgl)"; exit],\
  	)
  
 -AC_CHECK_HEADERS([FL/Fl_Export.H],,[echo "Please install FLTK library"; exit])
 -AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="-lfltk -lfltk_images" AC_SUBST(FLTK_LIBS)], 
-+AC_CHECK_HEADERS([@FLTK_H@FL/Fl_Export.H],,[echo "Please install FLTK library"; exit])
-+AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="@FLTK_LIBS@" AC_SUBST(FLTK_LIBS)], 
- 	[echo "Please install FLTK library (libfltk)"; exit],\
- 	)
-diff -U2 --recursive udav-0.3.2.orig/src/Makefile.am udav-0.3.2/src/Makefile.am
---- udav-0.3.2.orig/src/Makefile.am	2008-04-03 01:24:14.000000000 +0700
-+++ udav-0.3.2/src/Makefile.am	2008-05-03 12:51:08.000000000 +0700
-@@ -8,3 +8,3 @@
+-	[echo "Please install FLTK library (libfltk)"; exit],\
+-	)
++AC_PATH_PROG(FLTKCONFIG,fltk-config)
++CXXFLAGS="`$FLTKCONFIG --cflags` $CXXFLAGS"
++LDFLAGS="`$FLTKCONFIG --use-images --ldflags` $LDFLAGS"
+ 
+ 
+ AC_OUTPUT(Makefile src/Makefile)
+--- src/Makefile.am.orig	2008-05-11 16:39:57.000000000 +1200
++++ src/Makefile.am	2008-05-11 16:40:28.000000000 +1200
+@@ -7,4 +7,4 @@
+ data.cpp     Fl_Table.cxx  main.cpp  option.cpp  table.cpp
  
  udav_LDADD = $(MGL_LIBS) $(FLTK_LIBS)
 -udav_CPPFLAGS = -O2 -DDOC_DIR=\"$(docdir)/\"
-+udav_CPPFLAGS = $(CPPFLASGS) @FLTK_FLAGS@ -DDOC_DIR=\"$(docdir)/\"
++udav_CPPFLAGS = $(CPPFLASGS) -DDOC_DIR=\"$(docdir)/\"
diff --git a/sci-visualization/udav/udav-0.3.2.ebuild b/sci-visualization/udav/udav-0.3.2.ebuild
index 111dbd6bb..9bdd07ded 100644
--- a/sci-visualization/udav/udav-0.3.2.ebuild
+++ b/sci-visualization/udav/udav-0.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-inherit eutils autotools
+inherit eutils autotools fdo-mime
 
 DESCRIPTION="Universal Data Array Visualization"
 HOMEPAGE="http://udav.sourceforge.net/"
@@ -17,32 +17,27 @@ DEPEND="sci-libs/mathgl x11-libs/fltk"
 RESTRICT=mirror
 
 src_unpack() {
-	local FLTK_FLAGS,FLTK_LIBS,FLTK_H
-
 	unpack ${A}
 	cd "${S}"
-
-	FLTK_FLAGS=`fltk-config --cxxflags`
-	FLTK_LIBS=`fltk-config --use-images --ldflags`
-	FLTK_H=`echo ${FLTK_FLAGS} | sed -e 's:-I/usr/include/::'`
-	[ -n "${FLTK_H}" ] && FLTK_H="${FLTK_H}"/
-
 	epatch "${FILESDIR}"/${PN}-fltk.patch
-	sed -e "s:@FLTK_H@:${FLTK_H}:g" \
-		-e "s:@FLTK_LIBS@:${FLTK_LIBS}:g" \
-		-i configure.ac
-	sed -e "s:@FLTK_FLAGS@:${FLTK_FLAGS}:g" \
-		-i src/Makefile.am
-
 	eautoreconf
 }
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -rf "${D}"usr/share/doc/udav/pics/.svn
 	dodoc README AUTHORS || die "dodoc failed"
+
+	make_desktop_entry ${PN}
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doins xpm/${PN}.xpm
+	dosym /usr/share/icons/hicolor/48x48/apps/${PN}.xpm /usr/share/pixmaps/${PN}.xpm
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
 }