From 83438cb5afe23e5a0c583e070451d3a8da0bb5c4 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Fri, 25 Sep 2009 22:24:23 +0000 Subject: sci-chemistry/bist: Fixed installation of plugins, help files, molecule library, internationalization, man page, desktop file, and icon. svn path=/sunrise/; revision=9294 --- sci-chemistry/bist/ChangeLog | 7 ++ sci-chemistry/bist/Manifest | 7 +- sci-chemistry/bist/bist-0.5.1-r1.ebuild | 30 ++++++++ sci-chemistry/bist/bist-0.5.1.ebuild | 42 ------------ sci-chemistry/bist/files/bist-0.5.1-bracket.patch | 11 +++ sci-chemistry/bist/files/bist-0.5.1-install.patch | 80 ++++++++++++++++++++++ .../bist/files/wrap_bracket_dialog-amd64.patch | 11 --- 7 files changed, 132 insertions(+), 56 deletions(-) create mode 100644 sci-chemistry/bist/bist-0.5.1-r1.ebuild delete mode 100644 sci-chemistry/bist/bist-0.5.1.ebuild create mode 100644 sci-chemistry/bist/files/bist-0.5.1-bracket.patch create mode 100644 sci-chemistry/bist/files/bist-0.5.1-install.patch delete mode 100644 sci-chemistry/bist/files/wrap_bracket_dialog-amd64.patch (limited to 'sci-chemistry') diff --git a/sci-chemistry/bist/ChangeLog b/sci-chemistry/bist/ChangeLog index 7ffc5d486..f58367672 100644 --- a/sci-chemistry/bist/ChangeLog +++ b/sci-chemistry/bist/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Sep 2009; Andreas K. Huettel (dilfridge) + +bist-0.5.1-r1.ebuild, +files/bist-0.5.1-bracket.patch, + -files/wrap_bracket_dialog-amd64.patch, -bist-0.5.1.ebuild, + +files/bist-0.5.1-install.patch: + Fixed installation of plugins, help files, molecule library, + internationalization, man page, desktop file, and icon. + 21 Sep 2009; Andreas K. Huettel (dilfridge) -bist-0.4.7.ebuild, +bist-0.5.1.ebuild: Version bump and upgrade of the ebuild to EAPI=2 diff --git a/sci-chemistry/bist/Manifest b/sci-chemistry/bist/Manifest index c0b733625..329dfdf6e 100644 --- a/sci-chemistry/bist/Manifest +++ b/sci-chemistry/bist/Manifest @@ -1,5 +1,6 @@ -AUX wrap_bracket_dialog-amd64.patch 379 RMD160 4d9d835a8c189862ec53f069862069a005b4c4ff SHA1 7c6ec5afb2bf2f1d6bc4ed931c5dbf03fe2abb98 SHA256 3fd94f204a237d3b00c2fd86b45259f65ac31606ebfe7ab076c3e24f8f855671 +AUX bist-0.5.1-bracket.patch 379 RMD160 4d9d835a8c189862ec53f069862069a005b4c4ff SHA1 7c6ec5afb2bf2f1d6bc4ed931c5dbf03fe2abb98 SHA256 3fd94f204a237d3b00c2fd86b45259f65ac31606ebfe7ab076c3e24f8f855671 +AUX bist-0.5.1-install.patch 4074 RMD160 35136ca7aa40e34c543efae3def45ced6d9d2886 SHA1 fc69c1a111ca724409674a35b40d7bc342b99388 SHA256 b94add3bed813222d29f4156668668c3296f6d817eb8f097709fcabd37d5ae67 DIST bist-0.5.1.tar.gz 766731 RMD160 a848cf778c9096239ca964dce352eeeab1ee4dc2 SHA1 22fd8186ef3a4fcc2776a3cf5b57ca78bfb4ab69 SHA256 78809230e2bcfffefaf8f95d85740d94cf2d10b4dd0d746f28cf1e82e4fc6cd5 -EBUILD bist-0.5.1.ebuild 918 RMD160 9174b371613117366dba8e7451367353fc5765a4 SHA1 b5b1fa35b42796f3503bb3058d0157f8e6980ca3 SHA256 34a034782d24375964986571a792a1555862e7d45aff6adbc43c3a72e0a53b73 -MISC ChangeLog 732 RMD160 026046a67156a8cc8d2d816dca7e9ebc16205aac SHA1 240e8cd515229c8fe90e4b2fbc88926e369087ad SHA256 0a43f8d20cc988703744c83d37dfa07b13f43381ca1dc4f24def55ea42dcf741 +EBUILD bist-0.5.1-r1.ebuild 694 RMD160 d8247b4ac7301f093b28dcae1da95ba5714a850b SHA1 b1a61cbacbbf790f44e029195eadd1ca1c5d0182 SHA256 8475df36b5c6bc73cb1515973f7c1ae58990fd1b312a6ff0637e03da9904f7e9 +MISC ChangeLog 1075 RMD160 8bbb9e40fda56a69355b2801ee81e15442aa54af SHA1 cc87f66660c678b9698161c870feaec4f7d57edf SHA256 e5c29dd85ddbc147b071ad95e13b6e5bcaf2c347e02935d9a9e1505303849fba MISC metadata.xml 1166 RMD160 76b030166aeba9413714da9cca53f83600e9a5b0 SHA1 45918e9272f8db5a4e81ecbed7ae8279539e934b SHA256 6cbbb060eb3c2f018811815dd82e0f6bd2e57f0cf152b8ce66aaaf70e744dcc4 diff --git a/sci-chemistry/bist/bist-0.5.1-r1.ebuild b/sci-chemistry/bist/bist-0.5.1-r1.ebuild new file mode 100644 index 000000000..a954fe0fc --- /dev/null +++ b/sci-chemistry/bist/bist-0.5.1-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils base + +DESCRIPTION="Bist, the chemical drawing tool" +HOMEPAGE="http://www.autistici.org/interzona/index.php?mod=03_Bist" +SRC_URI="http://www.autistici.org/interzona/ftrack.php?url=sections/06_Download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="net-misc/curl + dev-libs/expat + >=x11-libs/fltk-1.1.7:1.1 + sci-libs/gsl + >=sci-chemistry/openbabel-2.2.0 + >=media-libs/plotutils-2.5" + +DEPEND="${RDEPEND}" + +src_prepare() { + use amd64 && epatch "${FILESDIR}/${P}-bracket.patch" + epatch "${FILESDIR}/${P}-install.patch" +} diff --git a/sci-chemistry/bist/bist-0.5.1.ebuild b/sci-chemistry/bist/bist-0.5.1.ebuild deleted file mode 100644 index b028cd386..000000000 --- a/sci-chemistry/bist/bist-0.5.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="Bist, the chemical drawing tool" -HOMEPAGE="http://www.autistici.org/interzona/index.php?mod=03_Bist" -SRC_URI="http://www.autistici.org/interzona/ftrack.php?url=sections/06_Download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="net-misc/curl - dev-libs/expat - >=x11-libs/fltk-1.1.7:1.1 - sci-libs/gsl - >=sci-chemistry/openbabel-2.2.0 - >=media-libs/plotutils-2.5" - -DEPEND="${RDEPEND}" - -src_prepare() { - use amd64 && epatch "${FILESDIR}/wrap_bracket_dialog-amd64.patch" -} - -src_install() { - dobin bist || die "bist install failed" - - #install bist plug-ins - insinto /usr/lib/bist/plugin - doins plugin/*.so || die "make plugin failed" - - dodoc AUTHORS TODO || die - cd doc - doman man/bist.1 || die - dohtml *.html *.png *jpg || die -} diff --git a/sci-chemistry/bist/files/bist-0.5.1-bracket.patch b/sci-chemistry/bist/files/bist-0.5.1-bracket.patch new file mode 100644 index 000000000..86a587e6a --- /dev/null +++ b/sci-chemistry/bist/files/bist-0.5.1-bracket.patch @@ -0,0 +1,11 @@ +--- pluginclude/wrap_bracket_dialog.hpp.orig 2008-09-30 10:45:56.000000000 +0200 ++++ pluginclude/wrap_bracket_dialog.hpp 2008-09-30 10:46:07.000000000 +0200 +@@ -10,7 +10,7 @@ + #if SIZEOF_INT_P == 8 + #define WRAP_BRACKET_SIZE_USER_DATA_MENU long int + #else +-#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned int ++#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned long + #endif + + diff --git a/sci-chemistry/bist/files/bist-0.5.1-install.patch b/sci-chemistry/bist/files/bist-0.5.1-install.patch new file mode 100644 index 000000000..b349b0d5b --- /dev/null +++ b/sci-chemistry/bist/files/bist-0.5.1-install.patch @@ -0,0 +1,80 @@ +diff -r -u bist-0.5.1.orig/Makefile.in bist-0.5.1/Makefile.in +--- bist-0.5.1.orig/Makefile.in 2009-04-04 12:04:44.000000000 +0200 ++++ bist-0.5.1/Makefile.in 2009-09-23 23:59:37.000000000 +0200 +@@ -16,12 +16,7 @@ + + SRC_DIR =./src/ + INC_DIR=./include/ +-LIB_DIR=@LIB_DIR_CONFIG_PATH@ +-LIB_DIR_DEBIAN=@LIB_DIR_CONFIG@ +- +-ifneq ($(strip ${exec_prefix}),) +-LIB_DIR=${LIB_DIR_DEBIAN} +-endif ++LIB_DIR=@libdir@ + + + +@@ -186,33 +181,29 @@ + rm -f *.o + rm -f plugin/*.so + install: +- install -D -o root -g root -m 0755 -s $(ELF) $(prefix)/bin/$(ELF) +- install -D -o root -g root -m 0644 bist.png $(prefix)/share/pixmap/bist.png +- install -D -o root -g root -m 0644 bist.desktop $(prefix)/share/applications/bist.desktop ++ install -D -o root -g root -m 0755 -s $(ELF) $(DESTDIR)/$(prefix)/bin/$(ELF) ++ install -D -o root -g root -m 0644 bist.png $(DESTDIR)/$(prefix)/share/pixmaps/bist.png ++ install -D -o root -g root -m 0644 bist.desktop $(DESTDIR)/$(prefix)/share/applications/bist.desktop + find rings -type d -exec install -D -o root \ +- -g root -m 0755 -d $(prefix)/share/$(ELF)-$(VERSION)/\{\} \; ++ -g root -m 0755 -d $(DESTDIR)/$(prefix)/share/$(ELF)-$(VERSION)/\{\} \; + find rings ! -type d -exec install -D -o root -g root \ +- -m 0644 \{\} $(prefix)/share/$(ELF)-$(VERSION)/\{\} \; +- install -D -o root -g root -m 0755 -d $(prefix)/share/doc/$(ELF)-$(VERSION) +- install -D -o root -g root -m 0644 doc/*.* $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 TODO $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 BUGS $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 README $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- ./mkinstalldirs $(LIB_DIR)/$(ELF)-$(VERSION)/plugin +- install -D -o root -g root -m 0644 plugin/*.so $(LIB_DIR)/$(ELF)-$(VERSION)/plugin/ +- ./mkinstalldirs $(prefix)/share/locale/$(ELF)-$(VERSION) +- cp -R po/* $(prefix)/share/locale/$(ELF)-$(VERSION)/ +- ./mkinstalldirs $(prefix)/share/man/man1/ ++ -m 0644 \{\} $(DESTDIR)/$(prefix)/share/$(ELF)-$(VERSION)/\{\} \; ++ install -D -o root -g root -m 0755 -d $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION) ++ install -D -o root -g root -m 0644 doc/*.* $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 TODO $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 BUGS $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 README $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ ./mkinstalldirs $(DESTDIR)/$(LIB_DIR)/$(ELF)-$(VERSION)/plugin ++ install -D -o root -g root -m 0644 plugin/*.so $(DESTDIR)/$(LIB_DIR)/$(ELF)-$(VERSION)/plugin/ ++ ./mkinstalldirs $(DESTDIR)/$(prefix)/share/locale ++ find po -name "*.po" -exec rm -v \{\} \; ++ rm -v po/LINGUAS po/bist.pot ++ cp -R po/* $(DESTDIR)/$(prefix)/share/locale/ ++ ./mkinstalldirs $(DESTDIR)/$(prefix)/share/man/man1/ + gzip -c --best ./doc/man/$(ELF).1 > ./doc/man/$(ELF).1.gz +- install -D -o root -g root -m 0644 ./doc/man/$(ELF).1.gz $(prefix)/share/man/man1/ ++ install -D -o root -g root -m 0644 ./doc/man/$(ELF).1.gz $(DESTDIR)/$(prefix)/share/man/man1/ + rm -f ./doc/man/$(ELF).1.gz + +-uninstall: +- rm -Rf $(prefix)/bin/$(ELF)-$(VERSION) +- rm -Rf $(prefix)/share/$(ELF)-$(VERSION) +- rm -Rf $(prefix)/share/doc/$(ELF)-$(VERSION) +- rm -Rf $(LIB_DIR)/$(ELF)-$(VERSION)/ +- rm -f $(prefix)/share/man/man1/$(ELF).1.gz + dist: distclean + ./rmcvs.py + cd .. ; tar -c $(ELF) | gzip --best > $(TARNAME)-$(VERSION).tar.gz +diff -r -u bist-0.5.1.orig/include/config_path.h.in bist-0.5.1/include/config_path.h.in +--- bist-0.5.1.orig/include/config_path.h.in 2009-04-04 12:04:42.000000000 +0200 ++++ bist-0.5.1/include/config_path.h.in 2009-09-23 23:29:35.000000000 +0200 +@@ -12,6 +12,6 @@ + #define VERSION "@VERSION@" + + #define PLUGIN_PATH_HOME "/.bist/plugin/" +-#define PLUGIN_PATH_SHARED "@LIB_DIR_CONFIG_PATH@/@ELF@-@VERSION@/plugin/" ++#define PLUGIN_PATH_SHARED "@libdir@/@ELF@-@VERSION@/plugin/" + + #define ELF_ABS_PATH "@prefix@/bin/@ELF@" diff --git a/sci-chemistry/bist/files/wrap_bracket_dialog-amd64.patch b/sci-chemistry/bist/files/wrap_bracket_dialog-amd64.patch deleted file mode 100644 index 86a587e6a..000000000 --- a/sci-chemistry/bist/files/wrap_bracket_dialog-amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pluginclude/wrap_bracket_dialog.hpp.orig 2008-09-30 10:45:56.000000000 +0200 -+++ pluginclude/wrap_bracket_dialog.hpp 2008-09-30 10:46:07.000000000 +0200 -@@ -10,7 +10,7 @@ - #if SIZEOF_INT_P == 8 - #define WRAP_BRACKET_SIZE_USER_DATA_MENU long int - #else --#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned int -+#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned long - #endif - - -- cgit v1.2.3-65-gdbad