Fix configure.in so that gdome2-conf --version works correctly, thanks to Daniel Westermann-Clark; bug 114542

Package-Manager: portage-2.1.2_rc2-r2

3 files changed, 15 insertions, 50 deletions

diff --git a/dev-libs/gdome2/Manifest b/dev-libs/gdome2/Manifest
index 0e59999b17cd..ca09bf4ab6f1 100644
--- a/dev-libs/gdome2/Manifest
+++ b/dev-libs/gdome2/Manifest
@@ -2,19 +2,23 @@ AUX gdome2-0.8.1-docs-destdir.patch 276 RMD160 b1e5687fb36a48a674133dceb0e553df9
 MD5 1d6bd642af9bab1cb3071e76cf892521 files/gdome2-0.8.1-docs-destdir.patch 276
 RMD160 b1e5687fb36a48a674133dceb0e553df9c89564f files/gdome2-0.8.1-docs-destdir.patch 276
 SHA256 acfa17bc85299f8395ca8ed571cfb335eeac44224948c873880ed54e58d7b75c files/gdome2-0.8.1-docs-destdir.patch 276
+AUX gdome2-0.8.1-gdome2-config.patch 417 RMD160 bfcc8343b99a19544c6844acf38ae3944479c12b SHA1 482b8184dbc81d1f3698118bdf0ea55ebf311472 SHA256 003d85ee32f236b6f68ae6606862decd995ecd32a94b1c496d0fcd8934d3390b
+MD5 fbfb3893a5260411bb1c80f000793ee5 files/gdome2-0.8.1-gdome2-config.patch 417
+RMD160 bfcc8343b99a19544c6844acf38ae3944479c12b files/gdome2-0.8.1-gdome2-config.patch 417
+SHA256 003d85ee32f236b6f68ae6606862decd995ecd32a94b1c496d0fcd8934d3390b files/gdome2-0.8.1-gdome2-config.patch 417
 DIST gdome2-0.8.1.tar.gz 518965 RMD160 5cc3ff29e0ed040e3bbd02cba4d95b9b634c4072 SHA1 e9a3e4140c873d8232635ad10bb135ef7803c408 SHA256 f4bb80a2ef8e5fd9397ab8aa36d059d0b32e98c4bcf185c7952a7e3874d1d543
-EBUILD gdome2-0.8.1-r1.ebuild 971 RMD160 b4d0856ad4a092d8505e10be2f3d0a4a6db5be5c SHA1 741de54a8ceb7ce3dc558638afb0bbea2dc682b9 SHA256 3f0c3f1f0371f43ffdabfbd629c66dc1da68e61cfa4a0ec1f780337e0acabb5a
-MD5 4109328146447963119eb0a648944776 gdome2-0.8.1-r1.ebuild 971
-RMD160 b4d0856ad4a092d8505e10be2f3d0a4a6db5be5c gdome2-0.8.1-r1.ebuild 971
-SHA256 3f0c3f1f0371f43ffdabfbd629c66dc1da68e61cfa4a0ec1f780337e0acabb5a gdome2-0.8.1-r1.ebuild 971
+EBUILD gdome2-0.8.1-r2.ebuild 1079 RMD160 6894de4edc93af5ee7d4511588afb4e1cc40ae85 SHA1 92407a0f62aca8e88109571033f650a3e8a9926b SHA256 b9105f25136c19af986db750ee5292de93c98f9f029280a0b46d2ae829bf03b3
+MD5 53b2165316b13bf353c7ae32065b13f4 gdome2-0.8.1-r2.ebuild 1079
+RMD160 6894de4edc93af5ee7d4511588afb4e1cc40ae85 gdome2-0.8.1-r2.ebuild 1079
+SHA256 b9105f25136c19af986db750ee5292de93c98f9f029280a0b46d2ae829bf03b3 gdome2-0.8.1-r2.ebuild 1079
 EBUILD gdome2-0.8.1.ebuild 625 RMD160 70c3a59c612a477d8e434996469ef21ad72affd7 SHA1 f345938c46a25551c751fa8378f5524c2f481ad6 SHA256 2beffea8483e369746f95fa06f3fced95699c19a6be1a6635a21c7e91aee90a5
 MD5 145361578d518500a08aab2a95ba869b gdome2-0.8.1.ebuild 625
 RMD160 70c3a59c612a477d8e434996469ef21ad72affd7 gdome2-0.8.1.ebuild 625
 SHA256 2beffea8483e369746f95fa06f3fced95699c19a6be1a6635a21c7e91aee90a5 gdome2-0.8.1.ebuild 625
-MISC ChangeLog 2938 RMD160 ba093adf2470c043af0b3e516b30aa3c0f091b5d SHA1 5af351659cf464f17e380e9bd4d38af48b791f81 SHA256 95e7b2e101edd2712df7f20fc351b4313fc731a840416c1a89396c899c63cf1e
-MD5 566a67499d03405f054ad763e3771d72 ChangeLog 2938
-RMD160 ba093adf2470c043af0b3e516b30aa3c0f091b5d ChangeLog 2938
-SHA256 95e7b2e101edd2712df7f20fc351b4313fc731a840416c1a89396c899c63cf1e ChangeLog 2938
+MISC ChangeLog 3249 RMD160 6d010c7cfec418cfd21f657c96413801ca2f5bf2 SHA1 c191355152189daa5767ebebcd8b7cdf032bc73b SHA256 cfb7b9bf931f93ac355b74423b230e4eeabf1e53d713c9111df4a0637ef2fdc3
+MD5 c618922c0f6cfae377731987f0bc4d9b ChangeLog 3249
+RMD160 6d010c7cfec418cfd21f657c96413801ca2f5bf2 ChangeLog 3249
+SHA256 cfb7b9bf931f93ac355b74423b230e4eeabf1e53d713c9111df4a0637ef2fdc3 ChangeLog 3249
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -22,6 +26,6 @@ SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata
 MD5 ba089f5d35dbf9c290aaf3e98c617565 files/digest-gdome2-0.8.1 238
 RMD160 7fb861ded937f20b95ee2a1c3c4c20b99959ec46 files/digest-gdome2-0.8.1 238
 SHA256 3c35da960bf8983b6e5732deabd56a5c6d187f2218a0722335511df1cb25976d files/digest-gdome2-0.8.1 238
-MD5 ba089f5d35dbf9c290aaf3e98c617565 files/digest-gdome2-0.8.1-r1 238
-RMD160 7fb861ded937f20b95ee2a1c3c4c20b99959ec46 files/digest-gdome2-0.8.1-r1 238
-SHA256 3c35da960bf8983b6e5732deabd56a5c6d187f2218a0722335511df1cb25976d files/digest-gdome2-0.8.1-r1 238
+MD5 ba089f5d35dbf9c290aaf3e98c617565 files/digest-gdome2-0.8.1-r2 238
+RMD160 7fb861ded937f20b95ee2a1c3c4c20b99959ec46 files/digest-gdome2-0.8.1-r2 238
+SHA256 3c35da960bf8983b6e5732deabd56a5c6d187f2218a0722335511df1cb25976d files/digest-gdome2-0.8.1-r2 238
diff --git a/dev-libs/gdome2/files/digest-gdome2-0.8.1-r1 b/dev-libs/gdome2/files/digest-gdome2-0.8.1-r1
deleted file mode 100644
index e8102620f209..000000000000
--- a/dev-libs/gdome2/files/digest-gdome2-0.8.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfc114e59eec50cbda8e4ece751ff022 gdome2-0.8.1.tar.gz 518965
-RMD160 5cc3ff29e0ed040e3bbd02cba4d95b9b634c4072 gdome2-0.8.1.tar.gz 518965
-SHA256 f4bb80a2ef8e5fd9397ab8aa36d059d0b32e98c4bcf185c7952a7e3874d1d543 gdome2-0.8.1.tar.gz 518965
diff --git a/dev-libs/gdome2/gdome2-0.8.1-r1.ebuild b/dev-libs/gdome2/gdome2-0.8.1-r1.ebuild
deleted file mode 100644
index 1027c2a076e7..000000000000
--- a/dev-libs/gdome2/gdome2-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r1.ebuild,v 1.13 2006/09/09 05:18:32 matsuu Exp $
-
-inherit gnome2
-
-DESCRIPTION="The DOM C library for the GNOME project"
-HOMEPAGE="http://gdome2.cs.unibo.it/"
-SRC_URI="http://gdome2.cs.unibo.it/tarball/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.2.0
-	>=dev-libs/libxml2-2.4.26"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog INSTALL MAINTAINERS NEWS README*"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	echo -e '#!/bin/sh\npkg-config gdome2 $*' > gdome-config.in
-
-	# make docs honor DESTDIR
-	epatch "${FILESDIR}/${P}-docs-destdir.patch"
-
-	# prevent gtk-fixxref from running (will cause sandbox violation)
-	cd ${S}/gtk-doc
-	sed -e 's:gtkdoc-fixxref:#gtkdoc-fixxref:' -i Makefile.in
-}