4 files changed, 30 insertions, 72 deletions
diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index f7e62c1c3b1b..64c1786573c3 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgadmin3
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.49 2010/08/30 20:18:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.50 2010/09/21 08:59:43 scarabeus Exp $
+
+*pgadmin3-1.12.0 (21 Sep 2010)
+
+  21 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pgadmin3-1.10.3.ebuild, -pgadmin3-1.10.5.ebuild, +pgadmin3-1.12.0.ebuild:
+  Version bump. Drop older.
 
 *pgadmin3-1.10.5 (30 Aug 2010)
 
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 69d12a970b86..835f559a9a6f 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.8.2-as_needed_ssl_detect_broken.patch 317 RMD160 08ec52c3f550444e84f58f0ccd4a1c0875178102 SHA1 2a70ecf74a47c65068fcdf77e2217dc645346c91 SHA256 7f3521c928e0d14118fc30a45c66ccc21722c839f63bfffce4fd40cf7ae4928d
 DIST pgadmin3-1.10.2.tar.gz 12091611 RMD160 1d81739eafda0afb6077f79a755a675ad09205f6 SHA1 8fefde8e22a40b7f3009203a90088bd1eb3ab846 SHA256 958dcd69b55597504d82299435321fe18af7ab5fa06dfb3649af625dccaa1695
-DIST pgadmin3-1.10.3.tar.gz 12098537 RMD160 8db5b45c946fb4ed990f8386cb193f56c9a0cca9 SHA1 d5895ca8be9cccf0faa626b2b7be0049dd4abf92 SHA256 787321b5a4ff0af9668a254e9547f5269374bd127ddc0b238e34a6d40ec3540e
-DIST pgadmin3-1.10.5.tar.gz 12099249 RMD160 a7324a085d207ba35ea73c6068631c3d4b26aae9 SHA1 8bfff88a8535a0ee942abb46f1fc236df0b05b02 SHA256 114b977770ebc90a1beaaee42e43e3728b5864ec6b46c2edfb130864c80e31df
+DIST pgadmin3-1.12.0.tar.gz 13258032 RMD160 d14b4cf0b9ff409e6e054187e0f34b00c8a90806 SHA1 edceaa1556db4e894a9337309248cb7a32e83602 SHA256 59824bcb4bae5311b69e932dc46e6f831c228951fbd5ddcb2adb92330b95a85e
 DIST pgadmin3-1.8.2.tar.gz 7951378 RMD160 302039687dac63e221844c21c0dfae8f042f3d92 SHA1 dc3117fb84dc77f13a2cf0518e46cd6067eaed15 SHA256 f86b84911b27e835810182443b20cf7826fe30af199d9abb2668502a7f10ec8f
 EBUILD pgadmin3-1.10.2.ebuild 1219 RMD160 9175d617f6dd849472d8f3b19d992eb49a4b3027 SHA1 5f8df813a05f93ada2278a1df8995cdd378323d7 SHA256 510f240cefbfb2b3eb59265d5c0eac65d0f6ebb56326eda9c87ddd4be35d56fa
-EBUILD pgadmin3-1.10.3.ebuild 1223 RMD160 7a448f50a96980b30a90cb4bf7c47bcbdaf0ea21 SHA1 792f74370d73e3ebf3c76d25e0d9bd9db3146598 SHA256 b251b5621b4e7a4867fa7efc74d551a0c2d4ff1a5a7d25fda32edf1e17843d38
-EBUILD pgadmin3-1.10.5.ebuild 1223 RMD160 5b2ae05a43d93ac098eff4a3b24a30cb007ec9d4 SHA1 94c82e2d99819ca9ea9500b0bce5c3ba186b67f5 SHA256 0f9238410656fb35166fece5a39e458d47ebd5ebe8282b2bbe4e2a33c778991e
+EBUILD pgadmin3-1.12.0.ebuild 1127 RMD160 6a879a2ab54c9b4cc62909c3e0917e27468edba2 SHA1 a30680b466d3d0d4a560a286fe5eed426ffaeea6 SHA256 5c49efe9145470fc1c8b9b0531f944cc3d17315174f6d2c951ff3db0beb701e2
 EBUILD pgadmin3-1.8.2.ebuild 1190 RMD160 221b35821a7379835aecd524f3f77a5e6d975760 SHA1 fcac92a653e957c0395c8929f5a4f3c5ffc049a4 SHA256 011b01bab8432815fec85740adb06b8561ff5b3ce1972c8d4013593f5f26aeb3
-MISC ChangeLog 6864 RMD160 f2b32078bc86bdefd9779d70a202d56ee3590a98 SHA1 18ea76eea5e540af25c02707251abb713e0af3e9 SHA256 1abe7225056d6c0b2bf5a21c8be4383df29a79dfceb8bfc8fc04fcccba1f43b3
+MISC ChangeLog 7059 RMD160 eb1aa5db76f979e5af235c1584c9a8294f191454 SHA1 a476cdfc89bd08de3fb20281036c1733cfe27dfe SHA256 95ce29abfc6f094d021a872ef5dcda8a5f7fe15e0a077d2021325eadf09a5f0c
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyYc/UACgkQHB6c3gNBRYeMfgCfZzSH92/w5DFVk/aAhZg0kwr+
+nVQAoM4KcOnNFrmG9T7Uaw7bb8lKCL7h
+=4gc1
+-----END PGP SIGNATURE-----
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild b/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild
deleted file mode 100644
index fc03e03d971d..000000000000
--- a/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.5.ebuild,v 1.1 2010/08/30 20:18:21 patrick Exp $
-
-EAPI="2"
-
-WX_GTK_VER="2.8"
-
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-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.8[X]
-	dev-db/postgresql-base
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/libxslt-1.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-wx-version=2.8 \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "einstall failed"
-
-	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
-
-	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
-
-	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
-}
diff --git a/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild
index 6bddd4fbff35..a83ce97ec835 100644
--- a/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.10.3.ebuild,v 1.2 2010/07/05 20:18:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.12.0.ebuild,v 1.1 2010/09/21 08:59:43 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 WX_GTK_VER="2.8"
 
-inherit wxwidgets eutils autotools
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+inherit wxwidgets
 
 DESCRIPTION="wxWidgets GUI for PostgreSQL."
 HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
+SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
+
 LICENSE="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug"
 
@@ -23,11 +23,6 @@ DEPEND="x11-libs/wxGTK:2.8[X]
 	>=dev-libs/libxslt-1.1"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/1.8.2-as_needed_ssl_detect_broken.patch"
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		--with-wx-version=2.8 \
@@ -38,14 +33,14 @@ src_install() {
 	emake DESTDIR="${D}" install || die "einstall failed"
 
 	insinto /usr/share/pixmaps
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+	newins "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png || die
 
 	insinto /usr/share/pgadmin3
-	newins "${S}/pgadmin/include/images/elephant48.xpm" pgadmin3.xpm
+	newins "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png || die
 
 	insinto /usr/share/applications
-	doins "${S}/pkg/pgadmin3.desktop"
+	doins "${S}/pkg/pgadmin3.desktop" || die
 
 	# Fixing world-writable files
-	chmod -R go-w "${D}/usr/share"
+	chmod -R go-w "${D}/usr/share" || die
 }