Version bump which fixes compilation errors on gcc > 3.3, bug #72000.

(Portage version: 2.1_pre4-r1)

5 files changed, 199 insertions, 6 deletions

diff --git a/app-office/gbib/ChangeLog b/app-office/gbib/ChangeLog
index eca037778b3d..d2d0905c044f 100644
--- a/app-office/gbib/ChangeLog
+++ b/app-office/gbib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gbib
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/ChangeLog,v 1.6 2005/03/07 19:30:51 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/ChangeLog,v 1.7 2006/02/21 18:53:59 ehmsen Exp $
+
+*gbib-0.1.3_rc1 (21 Feb 2006)
+
+  21 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/gbib-0.1.3_rc1-Makefile.patch, +gbib-0.1.3_rc1.ebuild:
+  Version bump thanks to Alex Linke <incubation.11@freenet.de> which fixes 
+  compilation errors on gcc > 3.3, bug #72000.
 
   07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gbib-0.1.2.ebuild:
   Stable on sparc
diff --git a/app-office/gbib/Manifest b/app-office/gbib/Manifest
index 3c25c075a12d..cafbfa85862f 100644
--- a/app-office/gbib/Manifest
+++ b/app-office/gbib/Manifest
@@ -1,5 +1,24 @@
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 13954c77e7a61feff9e972191f23d2ef gbib-0.1.2.ebuild 1193
-MD5 bb387bf3639772f7778f0d18acbd661b ChangeLog 707
-MD5 0ceb1e8222c34d072cc89b137d119fbd files/gbib-gentoo.patch 12670
+MD5 35870c83906fbcd7ba0918d4954f083a ChangeLog 975
+RMD160 9318cce37702d3dc8534ddca4fc5bf4c0331419f ChangeLog 975
+SHA256 a2aae883f3dbb1e20390fabbfb09be270e6df24245625fbc31a1f509377d251c ChangeLog 975
 MD5 7bfe9650fdddf48a274cf10b0430e7ba files/digest-gbib-0.1.2 62
+RMD160 022f536df4966b59473a782b6adb875d724e500e files/digest-gbib-0.1.2 62
+SHA256 dcae898b2ddefc611b456f013926557dbc682e5c1d56ddee989a905f8e6981cd files/digest-gbib-0.1.2 62
+MD5 c1ae958317e56f5c7ff5b56667a3f89b files/digest-gbib-0.1.3_rc1 241
+RMD160 38da86141f4b08cc107417318f184275470dc730 files/digest-gbib-0.1.3_rc1 241
+SHA256 9de73984d00f5724e9bca1f25eada3e0a5cbc8e12027320cd68491d199d495fc files/digest-gbib-0.1.3_rc1 241
+MD5 28895dfd2a5c162570581697b7e19774 files/gbib-0.1.3_rc1-Makefile.patch 4268
+RMD160 11d0d1e6f52ff950352d21f6b9023ac4c8034f8a files/gbib-0.1.3_rc1-Makefile.patch 4268
+SHA256 21e87525b80a6e6bd50604489c7bf806c348d3892758838c9b05f6f6a4f7d489 files/gbib-0.1.3_rc1-Makefile.patch 4268
+MD5 0ceb1e8222c34d072cc89b137d119fbd files/gbib-gentoo.patch 12670
+RMD160 cd8ac152a0360c3e868a0dd7449d9ce05365a1dd files/gbib-gentoo.patch 12670
+SHA256 53698579d29cc28da31b3cdfe306ead8ea56aeff8326ef9cbbc02e28c8903d22 files/gbib-gentoo.patch 12670
+MD5 13954c77e7a61feff9e972191f23d2ef gbib-0.1.2.ebuild 1193
+RMD160 902c3e10fe8142730fcf7ee18b2a442f8816ec66 gbib-0.1.2.ebuild 1193
+SHA256 b4ffbbfb3282162bac1fc50dacdb27c0acad820dc833ab6311255c5b941c1eb2 gbib-0.1.2.ebuild 1193
+MD5 29314b4914fa6bdfb2cf2690c18eb2de gbib-0.1.3_rc1.ebuild 1197
+RMD160 a1c331cc69b3e7a7d2411f6a6ea42da05a1406d4 gbib-0.1.3_rc1.ebuild 1197
+SHA256 e7b6814d08ccac934d1b53cd3226c13cfd86ee24a5537078a732f3c694c9b776 gbib-0.1.3_rc1.ebuild 1197
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
diff --git a/app-office/gbib/files/digest-gbib-0.1.3_rc1 b/app-office/gbib/files/digest-gbib-0.1.3_rc1
new file mode 100644
index 000000000000..be924866f997
--- /dev/null
+++ b/app-office/gbib/files/digest-gbib-0.1.3_rc1
@@ -0,0 +1,3 @@
+MD5 116b1bf80d867f04ec10f4488159b552 gbib-0.1.3rc1.tar.gz 133279
+RMD160 52cf0bf90d9074e559fb48956be1d06a2ef9206c gbib-0.1.3rc1.tar.gz 133279
+SHA256 7d1b8e5c062b9981240a3144536cce1d5296fb28fa3eab7ebc4131c071488cf1 gbib-0.1.3rc1.tar.gz 133279
diff --git a/app-office/gbib/files/gbib-0.1.3_rc1-Makefile.patch b/app-office/gbib/files/gbib-0.1.3_rc1-Makefile.patch
new file mode 100644
index 000000000000..71a5b0ae0d82
--- /dev/null
+++ b/app-office/gbib/files/gbib-0.1.3_rc1-Makefile.patch
@@ -0,0 +1,113 @@
+diff -ru gbib-0.1.3rc1.orig/Makefile.in gbib-0.1.3rc1/Makefile.in
+--- gbib-0.1.3rc1.orig/Makefile.in	2004-04-02 23:23:47.000000000 +0200
++++ gbib-0.1.3rc1/Makefile.in	2005-04-06 16:03:37.509969408 +0200
+@@ -57,12 +57,12 @@
+ 
+ 
+ install: gbib
+-	$(PROGINST) -d -m 0755 $(ROOTDIR)$(LIBDIR)
+-	$(PROGINST) gbib.rc $(ROOTDIR)$(LIBDIR)
+-	$(PROGINST) lyx.xpm $(ROOTDIR)$(LIBDIR)
+-	$(PROGINST) gbib48.xpm $(ROOTDIR)$(LIBDIR)
+-	$(PROGINST) -d -m 0755 $(ROOTDIR)$(DESTDIR)/bin
+-	$(PROGINST) gbib $(ROOTDIR)$(DESTDIR)/bin
++	$(PROGINST) -d -m 0755 $(DESTDIR)/$(LIBDIR)
++	$(PROGINST) gbib.rc $(DESTDIR)/$(LIBDIR)
++	$(PROGINST) lyx.xpm $(DESTDIR)/$(LIBDIR)
++	$(PROGINST) gbib48.xpm $(DESTDIR)/$(LIBDIR)
++	$(PROGINST) -d -m 0755 $(DESTDIR)/usr/bin
++	$(PROGINST) gbib $(DESTDIR)/usr/bin
+ 	$(MAKE) -C intl install
+ 	$(MAKE) -C po install
+ 
+diff -ru gbib-0.1.3rc1.orig/intl/Makefile.in gbib-0.1.3rc1/intl/Makefile.in
+--- gbib-0.1.3rc1.orig/intl/Makefile.in	2004-04-02 23:23:47.000000000 +0200
++++ gbib-0.1.3rc1/intl/Makefile.in	2005-04-06 15:38:23.000000000 +0200
+@@ -114,26 +114,26 @@
+ 	if test "$(PACKAGE)" = "gettext" \
+ 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ 	  if test -r $(MKINSTALLDIRS); then \
+-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
++	    $(MKINSTALLDIRS) $(DESTDIR)/$(libdir) $(DESTDIR)/$(includedir); \
+ 	  else \
+-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
++	    $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir) $(DESTDIR)/$(includedir); \
+ 	  fi; \
+-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++	  $(INSTALL_DATA) intlh.inst $(DESTDIR)/$(includedir)/libintl.h; \
++	  $(INSTALL_DATA) libintl.a $(DESTDIR)/$(libdir)/libintl.a; \
+ 	else \
+ 	  : ; \
+ 	fi
+ install-data: all
+ 	if test "$(PACKAGE)" = "gettext"; then \
+ 	  if test -r $(MKINSTALLDIRS); then \
+-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
++	    $(MKINSTALLDIRS) $(DESTDIR)/$(gettextsrcdir); \
+ 	  else \
+-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++	    $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(gettextsrcdir); \
+ 	  fi; \
+-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
++	  $(INSTALL_DATA) VERSION $(DESTDIR)/$(gettextsrcdir)/VERSION; \
+ 	  dists="$(DISTFILES.common)"; \
+ 	  for file in $$dists; do \
+-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
++	    $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)/$(gettextsrcdir)/$$file; \
+ 	  done; \
+ 	else \
+ 	  : ; \
+diff -ru gbib-0.1.3rc1.orig/po/Makefile.in.in gbib-0.1.3rc1/po/Makefile.in.in
+--- gbib-0.1.3rc1.orig/po/Makefile.in.in	2004-04-02 23:23:47.000000000 +0200
++++ gbib-0.1.3rc1/po/Makefile.in.in	2005-04-06 16:09:00.739831000 +0200
+@@ -18,9 +18,9 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @prefix@/usr
+-datadir = $(prefix)/usr/@DATADIRNAME@
+-localedir = $(datadir)/usr/locale
+-gnulocaledir = $(prefix)/usr/share/locale
++datadir = $(prefix)/@DATADIRNAME@
++localedir = /usr/locale
++gnulocaledir = /usr/share/locale
+ gettextsrcdir = $(prefix)/usr/share/gettext/po
+ subdir = po
+ 
+@@ -111,16 +111,16 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)/$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)/$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)/$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
+@@ -153,12 +153,12 @@
+ 	done
+ 	if test "$(PACKAGE)" = "gettext"; then \
+ 	  if test -r "$(MKINSTALLDIRS)"; then \
+-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
++	    $(MKINSTALLDIRS) $(DESTDIR)/$(gettextsrcdir); \
+ 	  else \
+-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(gettextsrcdir); \
+ 	  fi; \
+ 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+-			  $(gettextsrcdir)/Makefile.in.in; \
++			  $(DESTDIR)/$(gettextsrcdir)/Makefile.in.in; \
+ 	else \
+ 	  : ; \
+ 	fi
diff --git a/app-office/gbib/gbib-0.1.3_rc1.ebuild b/app-office/gbib/gbib-0.1.3_rc1.ebuild
new file mode 100644
index 000000000000..124b15fe786d
--- /dev/null
+++ b/app-office/gbib/gbib-0.1.3_rc1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/gbib-0.1.3_rc1.ebuild,v 1.1 2006/02/21 18:54:00 ehmsen Exp $
+
+inherit eutils
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="user-friendly editor and browser for BibTeX bibliographic databases"
+HOMEPAGE="http://gbib.seul.org/"
+SRC_URI="http://gbib.seul.org/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~sparc"
+IUSE="nls"
+
+RDEPEND="=x11-libs/gtk+-1.2*
+	=gnome-base/gnome-libs-1.4*"
+DEPEND="${RDEPEND}
+	virtual/tetex"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-Makefile.patch || die
+}
+
+src_compile() {
+	econf `use_with nls` || die "could not configure"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+	dodoc ABOUT-NLS AUTHORS CHANGES INSTALL README TODO || die
+	make_desktop_entry gbib	"gBib BibTeX Editor" \
+		/usr/share/gbib/gbib48.xpm "Application;Office;"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To insert citations in a LyX document, verify that LyX"
+	einfo "is running before clicking on the lyx button."
+	einfo "The LyX server must be enabled, just add in your"
+	einfo "lyxrc this line:"
+	einfo
+	einfo "	\serverpipe \"/YOUR_HOME_DIR/.lyxpipe\""
+	einfo
+}