diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
commit | c5283d322accc6097afec74eab24550829788bab (patch) | |
tree | b99ce668128d82a026eaa31461643f9173f9b77b /dev-db/pgadmin3 | |
parent | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff) |
gentoo resync : 23.03.2018
Diffstat (limited to 'dev-db/pgadmin3')
-rw-r--r-- | dev-db/pgadmin3/Manifest | 6 | ||||
-rw-r--r-- | dev-db/pgadmin3/files/pgadmin3-desktop.patch | 16 | ||||
-rw-r--r-- | dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild | 45 | ||||
-rw-r--r-- | dev-db/pgadmin3/pgadmin3-1.22.2.ebuild | 4 |
5 files changed, 3 insertions, 127 deletions
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest index c341433170cf..98397804065b 100644 --- a/dev-db/pgadmin3/Manifest +++ b/dev-db/pgadmin3/Manifest @@ -1,9 +1,5 @@ AUX pgadmin3-desktop-r1.patch 512 BLAKE2B feba83e9311785f2bd47f76328d5ec25fb8dbd6686207ecf22cbcf22bb863850ed6ee87f051ae8c709901b4d06e99742b8fa9a5d74a0758632eb29a89f8c9a7f SHA512 8a3253318ad6b98136b8fd4539dffc030d9625a256d7f802a399e972b9a5cf3440a3c602bde8ee21091eed4aae8c736643b9a15246dfd3bae56c8dbd80847ae6 -AUX pgadmin3-desktop.patch 533 BLAKE2B 43922049414c54ae18151f435c35e4d056442bb5c055b31b7ffec55eeb09f2e6f9ed9c56923ad7da92b6418d2ff186fdb95cc7032d97b4af959e521d37cf2f9f SHA512 f36c3b3ce8dd384b32bf096de4ea95b3a7d63f82514512615f8e7cc3a0ac3f892390114ba65b66ebb69db1cce5415afd517941622cf2a6939a58d7792b362557 AUX pgadmin3-gcc6-null-pointer.patch 421 BLAKE2B 8e3c27ce3c80a01e4536253086eb2e6d4bb41e487db3084052acf5ba96a185ad186373d5ca9d5fe3a864cfdfa728350be8a44b66e04c3565e1bb0995f0b6e6a0 SHA512 c0fe3d3cc5c1c29f69f3b81b0c78fbe2cf6e484e3ace9e35a3352d93246fc8227047c7c59a168bedfdc7b4f67d3db800c8b1d7cd962d7952436e080a2ea1e083 -DIST pgadmin3-1.22.1.tar.gz 14667770 BLAKE2B 3222b1a13ebe42e08b1e2aa9a5d893725eb9a352fadb6bec2a06cd05d77a9cafe82d7defca5542a2428924ff0d3705f2233005b03b462006f2b776fd170b7cef SHA512 f190e82317e10b75cb0ebd7cc0c878c4be9c392e33aba44a1356446e4cac92735834a32b1d65999ffc3e36ed130d4cfcc1c25ad5faa3c745e884fccd797331e0 DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd -EBUILD pgadmin3-1.22.1-r1.ebuild 1232 BLAKE2B cead84fe90bc24b0b900f8686b907d54b8408709df3bd0fda134391bde0c22b0f154fdcde8a5d8907771cb525a92ca19f4da0b81ec849040732a27f809e1e293 SHA512 b062550f8bc6856906984eef98cdf57ec191c7008a0b70f12f10a89811b98125d3a690cb48bf419990b4f6bcc9346517e518bb8975cb10c18a9f151d890028eb -EBUILD pgadmin3-1.22.1-r2.ebuild 918 BLAKE2B 1badd757ff29baf2b42a8f6ffc50bb4f742dbda4405674ab50947bf4b9db0d7a304ba5f37ba628b6c3c7e16929d77b1bd271227938436f6d0fb4e9690dc5c6f4 SHA512 029c492b94913695c6d1ee1ce5508e284ebe112ecb960a5dcae7eeb8a8b7e48b6ba8af8ecf00fbd80ff2a9bed8867faa04b26b05d9ee3c4b828b378edaa55739 -EBUILD pgadmin3-1.22.2.ebuild 980 BLAKE2B 31e9759ca5ea056bf6055ecbf729e46daa6db759668c27b43374e0d2b379d78b7b5f51beed3de052459403445b792148c2fb08726917b65b950a8cc7697e03e0 SHA512 1a96f9f11be6f4fcde54491112f73b41ec0e9899db6981a3c51a269ef77ae96bd5e610d0cede0fb5ba0ca9d07003b0e20009c7bfb2e79788dda394d931a82078 +EBUILD pgadmin3-1.22.2.ebuild 982 BLAKE2B 5751d698310aafd745c8678a8e409b77ee6eb0f1e3bb298c89d503191612c10a4e8950726ad42d534a93bfd2f9d78c9f00ad2151b7f2988aa85c47751b3e816c SHA512 da97cc8230205221db85badf2508e778e40099464c76494699e1b90453b440372fca112f406b01f08db1128132134a10df0718ca794bd848226fad08db5f4f3e MISC metadata.xml 368 BLAKE2B ea267a284f54ca0becf05f4a7579a167ee591178e17e3922d1c493bdb24fcd63400f2146625108a0d42f7816c75bdd7b1c836c8c354f2058c4fad15c8a0f2a6b SHA512 435f2da400e35d133390ec90860cfe1dd135281156ae1ed6c28e32b4e9f67d93cdb5e7e9ffa183244984e689a131838e6301a50d5366216bccc2df5cd97b54ea diff --git a/dev-db/pgadmin3/files/pgadmin3-desktop.patch b/dev-db/pgadmin3/files/pgadmin3-desktop.patch deleted file mode 100644 index 0453d8d7e4b3..000000000000 --- a/dev-db/pgadmin3/files/pgadmin3-desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop ---- a/pkg/pgadmin3.desktop 2013-02-22 12:21:19.000000000 -0500 -+++ b/pkg/pgadmin3.desktop 2015-02-04 15:36:34.845312953 -0500 -@@ -2,9 +2,9 @@ - Encoding=UTF-8 - Name=pgAdmin III - Exec=/usr/bin/pgadmin3 --Icon=/usr/share/pgadmin3/pgAdmin3.png -+Icon=/usr/share/pixmaps/pgadmin3.png - Type=Application --Categories=Application;Development; --MimeType=text/html -+Categories=Development; -+MimeType=text/html; - DocPath=/usr/share/pgadmin3/docs/en_US/index.html - Comment=PostgreSQL Tools diff --git a/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild deleted file mode 100644 index f2ebdc7e46e5..000000000000 --- a/dev-db/pgadmin3/pgadmin3-1.22.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib versionator wxwidgets - -DESCRIPTION="wxWidgets GUI for PostgreSQL" -HOMEPAGE="http://www.pgadmin.org/" -SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz" - -LICENSE="POSTGRESQL" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -SLOT="0" -IUSE="debug +databasedesigner" - -DEPEND=" - x11-libs/wxGTK:3.0=[X] - >=dev-db/postgresql-8.4.0:= - >=dev-libs/libxml2-2.6.18 - >=dev-libs/libxslt-1.1" -RDEPEND="${DEPEND}" - -pkg_setup() { - local pgslot=$(postgresql-config show) - - if [[ ${pgslot//.} < 84 ]] ; then - eerror "PostgreSQL slot must be set to 8.4 or higher." - eerror " postgresql-config set 8.4" - die "PostgreSQL slot is not set to 8.4 or higher." - fi -} - -src_prepare() { - epatch "${FILESDIR}/pgadmin3-desktop.patch" - - epatch_user -} - -src_configure() { - WX_GTK_VER="3.0" - - setup-wxwidgets - - econf --with-wx-version=${WX_GTK_VER} \ - $(use_enable debug) \ - $(use_enable databasedesigner) -} - -src_install() { - emake DESTDIR="${D}" install - - newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png - - domenu "${S}/pkg/pgadmin3.desktop" - - # Fixing world-writable files - fperms -R go-w /usr/share -} diff --git a/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild deleted file mode 100644 index 27d932986e32..000000000000 --- a/dev-db/pgadmin3/pgadmin3-1.22.1-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils wxwidgets - -DESCRIPTION="wxWidgets GUI for PostgreSQL" -HOMEPAGE="https://www.pgadmin.org/" -SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz" - -LICENSE="POSTGRESQL" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -SLOT="0" -IUSE="debug +databasedesigner" - -DEPEND=" - >=dev-db/postgresql-8.4.0:= - >=dev-libs/libxml2-2.6.18 - >=dev-libs/libxslt-1.1 - x11-libs/wxGTK:3.0=[X]" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-desktop-r1.patch" ) - -src_configure() { - WX_GTK_VER="3.0" - - setup-wxwidgets - - econf --with-wx-version=${WX_GTK_VER} \ - $(use_enable debug) \ - $(use_enable databasedesigner) -} - -src_install() { - default - - newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png - - domenu "${S}/pkg/pgadmin3.desktop" - - # Fixing world-writable files - fperms -R go-w /usr/share -} diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild index 1b88ffbace4b..c4ced109cba1 100644 --- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild +++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.pgadmin.org/" SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz" LICENSE="POSTGRESQL" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" +KEYWORDS="amd64 ppc x86 ~x86-fbsd" SLOT="0" IUSE="debug +databasedesigner" @@ -21,7 +21,7 @@ DEPEND=" >=dev-libs/libxslt-1.1" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/pgadmin3-{desktop,gcc6-null-pointer}.patch ) +PATCHES=( "${FILESDIR}"/pgadmin3-{desktop-r1,gcc6-null-pointer}.patch ) src_configure() { WX_GTK_VER="3.0" |