move gnome-common-2* to SLOT 3. change gnome-autogen.sh name for gnome-common-1. fixes #139517

Package-Manager: portage-2.1.1_pre4-r4

7 files changed, 83 insertions, 21 deletions

diff --git a/gnome-base/gnome-common/ChangeLog b/gnome-base/gnome-common/ChangeLog
index bfcff2d0f2c4..9ad601e2fd2c 100644
--- a/gnome-base/gnome-common/ChangeLog
+++ b/gnome-base/gnome-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-common
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.36 2006/08/15 14:20:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.37 2006/08/15 14:28:00 allanonjl Exp $
+
+*gnome-common-1.2.4-r4 (15 Aug 2006)
+
+  15 Aug 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +gnome-common-1.2.4-r4.ebuild, gnome-common-2.8.0.ebuild,
+  gnome-common-2.12.0.ebuild:
+  move gnome-common-2* to SLOT 3. change gnome-autogen.sh name for
+  gnome-common-1. fixes #139517
 
   15 Aug 2006; Markus Rothe <corsair@gentoo.org>
   gnome-common-1.2.4-r3.ebuild:
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index 33ea6f01f009..c8d5f436813a 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,29 +1,36 @@
-DIST gnome-common-1.2.4.tar.bz2 155757
+DIST gnome-common-1.2.4.tar.bz2 155757 RMD160 87da0646f1a98d3526e1006abd91186baa8c628a SHA1 342539784d4272d8e262a4527b4d243dd69dabc5 SHA256 24ed474d907647a694a9a678809577368fe50e60fe6ba261b195dab64f1fb0c5
 DIST gnome-common-2.12.0.tar.bz2 60283 RMD160 cbd83180027c69b88737b02bef2f2b99e4c2968c SHA1 5483bad8bcded040946f776c655507caf05946af SHA256 adee3a981eb7b09291ee4dead5df9317f598b50d8516c7ed1a15a397bbaf51b5
 DIST gnome-common-2.8.0.tar.bz2 58694 RMD160 f9983e110d6fe5a9939dcca42a3b14c777c34c02 SHA1 0d6953df51a3aabe9bf7c1668731fb2b25dc5393 SHA256 7e12aca405c1ea4408ad19dec92d3730e3fdd4640fba588ac189469760bab8aa
 EBUILD gnome-common-1.2.4-r3.ebuild 1053 RMD160 6f585e7471a7ca460d9253038075309f120af9fd SHA1 5364cba0b07632197fbc98f15739a0aad07820d9 SHA256 b94f0d6fe8f4d6e17c52612a85e78a3355d0b0bcae59d2f40c240cff495ef7ec
 MD5 a8ce97a78294728603e15faa3f2e9a2d gnome-common-1.2.4-r3.ebuild 1053
 RMD160 6f585e7471a7ca460d9253038075309f120af9fd gnome-common-1.2.4-r3.ebuild 1053
 SHA256 b94f0d6fe8f4d6e17c52612a85e78a3355d0b0bcae59d2f40c240cff495ef7ec gnome-common-1.2.4-r3.ebuild 1053
-EBUILD gnome-common-2.12.0.ebuild 588 RMD160 79aefb1d1271ca676af9427c924b207f48499efd SHA1 40e7d0cc26f4504a9f885451ed8ff3d15d0a2e1c SHA256 7d8a39542aa6451943fa5875cec7fc7d6fd057799891bd69daec275356342d79
-MD5 57bfad9ff2ad7b904b8242c211f5a493 gnome-common-2.12.0.ebuild 588
-RMD160 79aefb1d1271ca676af9427c924b207f48499efd gnome-common-2.12.0.ebuild 588
-SHA256 7d8a39542aa6451943fa5875cec7fc7d6fd057799891bd69daec275356342d79 gnome-common-2.12.0.ebuild 588
-EBUILD gnome-common-2.8.0.ebuild 585 RMD160 e3f301ac6d5b662c2d6096c2fc01af75f0bc2bcb SHA1 a4acd3fbb078722661b7155b08f7101017a44a39 SHA256 42bcce3fd78178732ad35551cf61a73045d677844f11ba1ba3e783799d96bbe3
-MD5 767d42d93f6f89529dccefce17129b7d gnome-common-2.8.0.ebuild 585
-RMD160 e3f301ac6d5b662c2d6096c2fc01af75f0bc2bcb gnome-common-2.8.0.ebuild 585
-SHA256 42bcce3fd78178732ad35551cf61a73045d677844f11ba1ba3e783799d96bbe3 gnome-common-2.8.0.ebuild 585
-MISC ChangeLog 4012 RMD160 c920e8ddb4de6d918aac93a11ecb8932941502ee SHA1 23a2156284416912bf5f69861d83f0daeb53817d SHA256 49c9b5f76acf4beec8a7e37e60a691d5c788dea89ac374205fa69ae704053d0d
-MD5 a00775d01d37a931d11869e4ea5cd0ee ChangeLog 4012
-RMD160 c920e8ddb4de6d918aac93a11ecb8932941502ee ChangeLog 4012
-SHA256 49c9b5f76acf4beec8a7e37e60a691d5c788dea89ac374205fa69ae704053d0d ChangeLog 4012
+EBUILD gnome-common-1.2.4-r4.ebuild 1146 RMD160 cf7ad84ccb417403f6835d664d7ee5c343f3b2d2 SHA1 e156cdabcb2633dcfa5af4042612c54732e24974 SHA256 9a0e327ac7cd1ab673aef2ed81e8c8cb05ee7f6bd46ef2186c4643ce953c86d5
+MD5 b900d6dc4c23b627b7065eb22346d95a gnome-common-1.2.4-r4.ebuild 1146
+RMD160 cf7ad84ccb417403f6835d664d7ee5c343f3b2d2 gnome-common-1.2.4-r4.ebuild 1146
+SHA256 9a0e327ac7cd1ab673aef2ed81e8c8cb05ee7f6bd46ef2186c4643ce953c86d5 gnome-common-1.2.4-r4.ebuild 1146
+EBUILD gnome-common-2.12.0.ebuild 593 RMD160 95322696d071da2a979989031e0f7601d1038f17 SHA1 49953ccff82f7c3aca8085c2612958c8471c9efd SHA256 9c55603a8cc2896ac2847187761bdf20c13bf29e39de60384785268fe6412b4f
+MD5 31eb4b03fa207602ec753f8b4b0c718f gnome-common-2.12.0.ebuild 593
+RMD160 95322696d071da2a979989031e0f7601d1038f17 gnome-common-2.12.0.ebuild 593
+SHA256 9c55603a8cc2896ac2847187761bdf20c13bf29e39de60384785268fe6412b4f gnome-common-2.12.0.ebuild 593
+EBUILD gnome-common-2.8.0.ebuild 588 RMD160 8b12d2f957b907565a06519818ee261f43a4fa23 SHA1 7e84f06e30484a873482faf6bd22c825279bb2d9 SHA256 ad57b48198d14c7a8e4f69f7c428400fc1805c04d935e1d24069f0ffc3c57a34
+MD5 e89469cdf23e3fd722a157fa575e69f7 gnome-common-2.8.0.ebuild 588
+RMD160 8b12d2f957b907565a06519818ee261f43a4fa23 gnome-common-2.8.0.ebuild 588
+SHA256 ad57b48198d14c7a8e4f69f7c428400fc1805c04d935e1d24069f0ffc3c57a34 gnome-common-2.8.0.ebuild 588
+MISC ChangeLog 4298 RMD160 6bb8b8b017742da795f01f28cc51d7d03449974e SHA1 9f8cce6ff4a1ead9f164f755a8fa69278df1f3ce SHA256 29f9aabd0c4ca3698f0b164d54b21f3e77fdfac10917ff518b61199d221d6edb
+MD5 1c523f3ead0cdd084e74e1ab2598cde5 ChangeLog 4298
+RMD160 6bb8b8b017742da795f01f28cc51d7d03449974e ChangeLog 4298
+SHA256 29f9aabd0c4ca3698f0b164d54b21f3e77fdfac10917ff518b61199d221d6edb ChangeLog 4298
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 3bc13d6705b8399b69cf981e230f92ad files/digest-gnome-common-1.2.4-r3 71
-RMD160 e83f041bef3156e4ba99398967f6db39de5e3eb3 files/digest-gnome-common-1.2.4-r3 71
-SHA256 21716960caa06a711a79fab199b646687e452ec2d342ee3e4e8b99a5ccea4be8 files/digest-gnome-common-1.2.4-r3 71
+MD5 1e8654a7086624ed3a616384900279cc files/digest-gnome-common-1.2.4-r3 259
+RMD160 401afba72a00e05138753a103b9c0678406a1814 files/digest-gnome-common-1.2.4-r3 259
+SHA256 229e9011c1fcc6626ee2bba8f8b2ac9a12cc5ba0f9714f595d259afb570dcb2d files/digest-gnome-common-1.2.4-r3 259
+MD5 1e8654a7086624ed3a616384900279cc files/digest-gnome-common-1.2.4-r4 259
+RMD160 401afba72a00e05138753a103b9c0678406a1814 files/digest-gnome-common-1.2.4-r4 259
+SHA256 229e9011c1fcc6626ee2bba8f8b2ac9a12cc5ba0f9714f595d259afb570dcb2d files/digest-gnome-common-1.2.4-r4 259
 MD5 70f9442f9849aaff48c50da56f878423 files/digest-gnome-common-2.12.0 259
 RMD160 5d9b8ae808a29f4bf7fe30db0af4c8f0a8ac9c88 files/digest-gnome-common-2.12.0 259
 SHA256 07bf1e779cf3f83c48fe8e59de0842aeb45f010eb47b7d3213166bd567abc8ae files/digest-gnome-common-2.12.0 259
diff --git a/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r3 b/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r3
index 00e1796f2c6a..88e7a0242cf8 100644
--- a/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r3
+++ b/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r3
@@ -1 +1,3 @@
 MD5 4b430c6443860e01e4bd89cadf82649b gnome-common-1.2.4.tar.bz2 155757
+RMD160 87da0646f1a98d3526e1006abd91186baa8c628a gnome-common-1.2.4.tar.bz2 155757
+SHA256 24ed474d907647a694a9a678809577368fe50e60fe6ba261b195dab64f1fb0c5 gnome-common-1.2.4.tar.bz2 155757
diff --git a/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r4 b/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r4
new file mode 100644
index 000000000000..88e7a0242cf8
--- /dev/null
+++ b/gnome-base/gnome-common/files/digest-gnome-common-1.2.4-r4
@@ -0,0 +1,3 @@
+MD5 4b430c6443860e01e4bd89cadf82649b gnome-common-1.2.4.tar.bz2 155757
+RMD160 87da0646f1a98d3526e1006abd91186baa8c628a gnome-common-1.2.4.tar.bz2 155757
+SHA256 24ed474d907647a694a9a678809577368fe50e60fe6ba261b195dab64f1fb0c5 gnome-common-1.2.4.tar.bz2 155757
diff --git a/gnome-base/gnome-common/gnome-common-1.2.4-r4.ebuild b/gnome-base/gnome-common/gnome-common-1.2.4-r4.ebuild
new file mode 100644
index 000000000000..8eff6f820ef1
--- /dev/null
+++ b/gnome-base/gnome-common/gnome-common-1.2.4-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-1.2.4-r4.ebuild,v 1.1 2006/08/15 14:28:00 allanonjl Exp $
+
+inherit flag-o-matic gnome.org
+
+DESCRIPTION="Some Common files for Gnome2 applications"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
+IUSE=""
+RESTRICT="nostrip" # Do _NOT_ strip symbols in the build!
+
+RDEPEND=">=dev-libs/glib-2.0.0"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+src_compile() {
+	append-flags -g
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-debug=yes || die "configure failure"
+	emake || die "compile failure"
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		install || die "install failure"
+
+	dodoc AUTHORS ChangeLog README* INSTALL NEWS
+
+	# allow for slotted-ness
+	mv ${D}/usr/bin/gnome-autogen.sh ${D}/usr/bin/gnome1-autogen.sh
+}
diff --git a/gnome-base/gnome-common/gnome-common-2.12.0.ebuild b/gnome-base/gnome-common/gnome-common-2.12.0.ebuild
index b08dc904eafb..1e559eb5e515 100644
--- a/gnome-base/gnome-common/gnome-common-2.12.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-2.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-2.12.0.ebuild,v 1.7 2006/07/17 17:23:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-2.12.0.ebuild,v 1.8 2006/08/15 14:28:00 allanonjl Exp $
 
 inherit gnome2
 
@@ -8,7 +8,7 @@ DESCRIPTION="Common files for development of Gnome packages"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="3"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86"
 IUSE=""
 
diff --git a/gnome-base/gnome-common/gnome-common-2.8.0.ebuild b/gnome-base/gnome-common/gnome-common-2.8.0.ebuild
index e61070ee6d6e..d97ef921ba7c 100644
--- a/gnome-base/gnome-common/gnome-common-2.8.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-2.8.0.ebuild,v 1.12 2006/07/05 06:05:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-2.8.0.ebuild,v 1.13 2006/08/15 14:28:00 allanonjl Exp $
 
 inherit gnome2
 
@@ -8,7 +8,7 @@ DESCRIPTION="Common files for development of Gnome packages"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""