dev-db/pgadmin3: Moved into main tree

svn path=/testing/; revision=91

4 files changed, 7 insertions, 80 deletions

diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index 784c74f..e5401bf 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.26 2006/02/20 11:14:57 nakano Exp $
 
+  23 Sep 2006; Tiziano Müller <gentoo@dev-zero.ch> -pgadmin3-1.4.3.ebuild:
+  Moved into main tree
+
   23 Sep 2006; Tiziano Müller <gentoo@dev-zero.ch>
   +pgadmin3-1.6.0_beta1.ebuild:
   Version bump.
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 84190cc..e10b9bf 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,24 +1,16 @@
-DIST pgadmin3-1.4.3.tar.gz 6786185 RMD160 5b5127b7596484e0da8935ceb49351f33ac8757e SHA1 ef6c8625aab2b2c79d4f6966cd6faaefe78df3de SHA256 77a6368dbc748a0164d543d0f660d21d31746677f84553ecbea1e2fffa30a352
 DIST pgadmin3-1.6.0-beta1.tar.gz 7604684 RMD160 cd6ab23f7fbb6399546139ba162f89b74523eba9 SHA1 7d7a4e81d27e6b04bbee4f4a5fef5f4c8cc5d339 SHA256 f199d4378b49c22b6d81af7deb19e41fc65b3e5bc80ec436f8a64da466814c6d
-EBUILD pgadmin3-1.4.3.ebuild 1458 RMD160 fd270b8866fba62629129d1c544851fbf4cb98f8 SHA1 405d46b87ac7e3da8ec77e72be796800649f0013 SHA256 acab390c2066b081ea747e0f4f47b491f523c8b4fc96cef8343e8fbb76c65bea
-MD5 b3b64313244c652a9383e17c147c0633 pgadmin3-1.4.3.ebuild 1458
-RMD160 fd270b8866fba62629129d1c544851fbf4cb98f8 pgadmin3-1.4.3.ebuild 1458
-SHA256 acab390c2066b081ea747e0f4f47b491f523c8b4fc96cef8343e8fbb76c65bea pgadmin3-1.4.3.ebuild 1458
 EBUILD pgadmin3-1.6.0_beta1.ebuild 1481 RMD160 1d4e8b0e5e29b82627147e9b35d26c53f429f867 SHA1 a2d0cedece14fc127e3c7969e1820ea2031ee169 SHA256 577427aa04982b5033bcccebf68d6b7978fa268c2c4b07353e62b05d49b1dc0a
 MD5 7649056f233d4743632c586f677afa08 pgadmin3-1.6.0_beta1.ebuild 1481
 RMD160 1d4e8b0e5e29b82627147e9b35d26c53f429f867 pgadmin3-1.6.0_beta1.ebuild 1481
 SHA256 577427aa04982b5033bcccebf68d6b7978fa268c2c4b07353e62b05d49b1dc0a pgadmin3-1.6.0_beta1.ebuild 1481
-MISC ChangeLog 4529 RMD160 82529a8379f58acca3ac6becceb9b4d63442cff9 SHA1 a99cd8e3c2cadaea84a65cc15e32c3b11c6253c5 SHA256 c7ea1183ff7503fcc453d7c8493d267060e4dbf49b312d359a5b74cca6404924
-MD5 a20b990fa81fd44ea266338c7d171742 ChangeLog 4529
-RMD160 82529a8379f58acca3ac6becceb9b4d63442cff9 ChangeLog 4529
-SHA256 c7ea1183ff7503fcc453d7c8493d267060e4dbf49b312d359a5b74cca6404924 ChangeLog 4529
+MISC ChangeLog 4629 RMD160 7df1c383830eb7dcc94015ae7481e9f166eb4c81 SHA1 26e2bcd493c0ac8c8df83671feb01294e1e108fe SHA256 5e346e9765c51bcc8d84dfb152d408b21c23aea59a7c0c9afb58e5dcbfbe37da
+MD5 97079acb5afb05cf36efc8e523d4eeb8 ChangeLog 4629
+RMD160 7df1c383830eb7dcc94015ae7481e9f166eb4c81 ChangeLog 4629
+SHA256 5e346e9765c51bcc8d84dfb152d408b21c23aea59a7c0c9afb58e5dcbfbe37da ChangeLog 4629
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
 SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b metadata.xml 164
-MD5 3fc3e78c0f61e709951e95a9ecc31dab files/digest-pgadmin3-1.4.3 247
-RMD160 60393e6acfb632ffd3711218301e216ebf74a97f files/digest-pgadmin3-1.4.3 247
-SHA256 16f325e2057437761ebca4d2f828e111fdd158541e0c6e1a2d4afc2c1433afc7 files/digest-pgadmin3-1.4.3 247
 MD5 4245919efe8628e5f79fac9f29e7793b files/digest-pgadmin3-1.6.0_beta1 265
 RMD160 4faacb48dcb2b53a194eb3c2c3bd944e8e53e9d1 files/digest-pgadmin3-1.6.0_beta1 265
 SHA256 164b3036adac211c6da1b2d3aa13481ca93559177c7f99496e5906f6ff4c2bb2 files/digest-pgadmin3-1.6.0_beta1 265
diff --git a/dev-db/pgadmin3/files/digest-pgadmin3-1.4.3 b/dev-db/pgadmin3/files/digest-pgadmin3-1.4.3
deleted file mode 100644
index dd1e45e..0000000
--- a/dev-db/pgadmin3/files/digest-pgadmin3-1.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 28388816f867cd8723a4c0a460cf26b4 pgadmin3-1.4.3.tar.gz 6786185
-RMD160 5b5127b7596484e0da8935ceb49351f33ac8757e pgadmin3-1.4.3.tar.gz 6786185
-SHA256 77a6368dbc748a0164d543d0f660d21d31746677f84553ecbea1e2fffa30a352 pgadmin3-1.4.3.tar.gz 6786185
diff --git a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
deleted file mode 100644
index 8d7664e..0000000
--- a/dev-db/pgadmin3/pgadmin3-1.4.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DESCRIPTION="wxWidgets GUI for PostgreSQL."
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="=x11-libs/wxGTK-2.6*
-		>=dev-db/libpq-7.4
-		>=dev-libs/libxml2-2.5
-		>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	export WX_GTK_VER=2.6
-	export WX_HOME=/usr
-	need-wxwidgets unicode
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# --debug=yes/no for wx_config is only needed if wxGTK debug and
-	# release versions are installed aside. Which is not possible
-	# on Gentoo at the moment.
-	sed -i \
-		-e 's/--debug=[yesno]* //g' \
-		acinclude.m4 || die "sed failed"
-	eautoreconf
-}
-
-src_compile() {
-	cd "${S}"
-
-	# pgadmin3 inserts WX_HOME before the WX_CONFIG path below, so we have to strip "/usr" from it
-	econf \
-		--with-wx-config=${WX_CONFIG/\/usr} \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"
-
-	einstall || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/src/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/src/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-}