From 8b9a7843c20c2493855182fe2888c1894608217d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 4 Apr 2022 20:32:23 +0100 Subject: Bump postgresql stable version to 12, include DB servers as dev tool deps, make pacemaker optional for postgresql --- virtual/miller-dev/Manifest | 2 +- virtual/miller-dev/miller-dev-10.4.1.ebuild | 135 +++++++++++++++++++++ virtual/miller-dev/miller-dev-10.4.ebuild | 130 -------------------- virtual/miller-postgresql/Manifest | 4 +- .../miller-postgresql-12.1.ebuild | 13 -- .../miller-postgresql-13.0.ebuild | 13 ++ .../miller-postgresql-14.0-r1.ebuild | 13 ++ .../miller-postgresql-14.0.ebuild | 13 -- 8 files changed, 164 insertions(+), 159 deletions(-) create mode 100644 virtual/miller-dev/miller-dev-10.4.1.ebuild delete mode 100644 virtual/miller-dev/miller-dev-10.4.ebuild delete mode 100644 virtual/miller-postgresql/miller-postgresql-12.1.ebuild create mode 100644 virtual/miller-postgresql/miller-postgresql-13.0.ebuild create mode 100644 virtual/miller-postgresql/miller-postgresql-14.0-r1.ebuild delete mode 100644 virtual/miller-postgresql/miller-postgresql-14.0.ebuild diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest index aa13da6..165b370 100644 --- a/virtual/miller-dev/Manifest +++ b/virtual/miller-dev/Manifest @@ -1,2 +1,2 @@ EBUILD miller-dev-10.3.4.ebuild 2478 BLAKE2B d636c77c36f14213757c5aa0b50d4360c48b317794a20a190c53b64c4c499ea4fa3d6e6c2fb7d4c46a4309a02f8de73490e386fe475c87f651945c17f40dd0fb SHA512 a5e7059c630a064a50e84c6ddc4ad914b1b6628958addc952ddaff1032daa693b4097b5c29fafc4961b157c4a88d2fc6b12e7db56cf41860212a428bc7b37f51 -EBUILD miller-dev-10.4.ebuild 2638 BLAKE2B d611490b86e9003753f0ecc0209d9fb393c1a9ce95eaa3a141c0e47e9c00dcdbee7366b42537e73a89a0d52438897fcee9326549bb9e7af8e732e28e1b608287 SHA512 d2177cb6c8aecfdaa32a94acd80f5fc00987e56fc67d47dad28b9df603efcd76fbbffe948206f8ada0c07b7965daeb0ce24bcf2286170159cdf2694962eb52c0 +EBUILD miller-dev-10.4.1.ebuild 2715 BLAKE2B 02fa31ed8a5a566b29e81cc5bca5f51bcf39cb705205f3f97040866141073811de9f2dd5d033945eece5abd9aa4eace8e51f18b59547f7d8ca8784d12acc53e6 SHA512 b23a318fb4bbe6c97fe7812025979e32b442bb5e71f8e0f8d1a6a6bda03c7ff3546040a6fcc2768b9361d06ba0432c870d8379d8c23c3e38cba9276517b16d01 diff --git a/virtual/miller-dev/miller-dev-10.4.1.ebuild b/virtual/miller-dev/miller-dev-10.4.1.ebuild new file mode 100644 index 0000000..fb0233e --- /dev/null +++ b/virtual/miller-dev/miller-dev-10.4.1.ebuild @@ -0,0 +1,135 @@ +EAPI="7" +DESCRIPTION="Virtual for Miller development workstations" + +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="X dotnet odbc mysql postgres cxx vnc" + +RDEPEND=" + =net-misc/unison-2.51* + virtual/miller-base + app-editors/ghostwriter + app-vim/nerdtree + app-vim/json + app-vim/vim-javascript + app-vim/vim-spell-en + app-vim/nerdcommenter + app-vim/youcompleteme + app-vim/surround + app-vim/syntastic + app-vim/gitgutter + app-vim/alternate + app-vim/xsl-syntax + www-client/lynx + app-admin/webapp-config + postgres? ( + virtual/miller-postgresql + dev-db/apgdiff + dev-db/pg_activity + dev-db/postgresql_autodoc + dev-libs/libdbpp-postgresql + mysql? ( dev-db/postgresql-fdw-mysql ) + odbc? ( + dev-db/psqlodbc + dev-libs/libdbpp-odbc + ) + ) + mysql? ( + virtual/miller-mysql + dev-libs/libdbpp-mysql + odbc? ( dev-db/mariadb-connector-odbc ) + ) + dev-util/uncrustify + dev-util/cproto + dev-util/ctags + dev-db/pgFormatter + net-nds/shelldap + sys-devel/gdb + dev-util/valgrind + dev-util/lcov + app-text/htmltidy + app-doc/doxygen + app-benchmarks/wrk + dev-libs/stb + media-libs/libsdl2 + sys-fs/inotify-tools + net-misc/shmux + app-misc/jq + cxx? ( + dev-util/ccache + dev-util/cppcheck + sys-devel/clang[static-analyzer] + dev-util/splint + =sys-devel/gcc-10* + =sys-devel/gcc-11* + dev-util/bloaty + dev-util/include-what-you-use + dev-cpp/benchmark + ) + media-fonts/freefont + media-fonts/hack + media-fonts/roboto-mono + app-vim/vcscommand + dev-vcs/git + dev-vcs/git-extras + sys-devel/distcc + dev-util/patchutils + || ( + net-misc/iputils[arping] + net-analyzer/arping + ) + dev-libs/libadhocutil + dev-libs/icetray[ut] + www-misc/icespider + net-misc/gentoobrowse-api + dev-libs/fcgi + dev-libs/Ice + dev-libs/slice-parser + dev-cpp/glibmm + dev-cpp/libxmlpp:3.0 + dev-util/libabigail + dev-util/unifdef + net-libs/libesmtp + www-apache/mod_fcgid + www-apache/apache-mod-markdown + media-gfx/imagemagick + app-shells/gentoo-bashcomp + app-arch/rar + net-ftp/ftp + media-video/ffmpeg + net-misc/youtube-dl + www-servers/apache + X? ( + || ( www-client/google-chrome ( www-client/chromium www-plugins/chrome-binary-plugins ) ) + || ( www-client/firefox www-client/firefox-bin ) + vnc? ( || ( + net-misc/tigervnc + net-misc/vnc + ) ) + x11-misc/xdotool + net-misc/rdesktop + media-gfx/gimp + kde-apps/kruler + net-analyzer/wireshark + x11-apps/xhost + dev-db/squirrel-sql + app-editors/okteta + dev-util/kdbg + kde-apps/dolphin-plugins-git + net-analyzer/nmap + dotnet? ( + dev-util/monodevelop + || ( + >=dev-util/monodevelop-4 + ( + dev-util/monodevelop-database + dev-util/monodevelop-debugger-gdb + ) + ) + ) + dev-db/pgadmin4 + kde-apps/kcachegrind + app-editors/gvim + dev-util/hotspot + )" + diff --git a/virtual/miller-dev/miller-dev-10.4.ebuild b/virtual/miller-dev/miller-dev-10.4.ebuild deleted file mode 100644 index b8b20d5..0000000 --- a/virtual/miller-dev/miller-dev-10.4.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -EAPI="7" -DESCRIPTION="Virtual for Miller development workstations" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="X dotnet odbc mysql postgres cxx vnc" - -RDEPEND=" - =net-misc/unison-2.51* - virtual/miller-base - app-editors/ghostwriter - app-vim/nerdtree - app-vim/json - app-vim/vim-javascript - app-vim/vim-spell-en - app-vim/nerdcommenter - app-vim/youcompleteme - app-vim/surround - app-vim/syntastic - app-vim/gitgutter - app-vim/alternate - app-vim/xsl-syntax - www-client/lynx - app-admin/webapp-config - postgres? ( - dev-db/apgdiff - dev-db/pg_activity - dev-db/postgresql_autodoc - mysql? ( dev-db/postgresql-fdw-mysql ) - ) - dev-util/uncrustify - dev-util/cproto - dev-util/ctags - dev-db/pgFormatter - net-nds/shelldap - sys-devel/gdb - dev-util/valgrind - dev-util/lcov - app-text/htmltidy - app-doc/doxygen - app-benchmarks/wrk - dev-libs/stb - media-libs/libsdl2 - sys-fs/inotify-tools - net-misc/shmux - app-misc/jq - cxx? ( - dev-util/ccache - dev-util/cppcheck - sys-devel/clang[static-analyzer] - dev-util/splint - =sys-devel/gcc-10* - =sys-devel/gcc-11* - dev-util/bloaty - dev-util/include-what-you-use - dev-cpp/benchmark - ) - media-fonts/freefont - media-fonts/hack - media-fonts/roboto-mono - app-vim/vcscommand - dev-vcs/git - dev-vcs/git-extras - sys-devel/distcc - dev-util/patchutils - || ( - net-misc/iputils[arping] - net-analyzer/arping - ) - dev-libs/libadhocutil - dev-libs/libdbpp-postgresql - dev-libs/libdbpp-mysql - dev-libs/icetray[ut] - www-misc/icespider - net-misc/gentoobrowse-api - dev-libs/fcgi - dev-libs/Ice - dev-libs/slice-parser - dev-cpp/glibmm - dev-cpp/libxmlpp:3.0 - dev-util/libabigail - dev-util/unifdef - net-libs/libesmtp - www-apache/mod_fcgid - www-apache/apache-mod-markdown - media-gfx/imagemagick - app-shells/gentoo-bashcomp - app-arch/rar - net-ftp/ftp - media-video/ffmpeg - odbc? ( - mysql? ( dev-db/mariadb-connector-odbc ) - postgres? ( dev-db/psqlodbc ) - ) - net-misc/youtube-dl - www-servers/apache - X? ( - || ( www-client/google-chrome ( www-client/chromium www-plugins/chrome-binary-plugins ) ) - || ( www-client/firefox www-client/firefox-bin ) - vnc? ( || ( - net-misc/tigervnc - net-misc/vnc - ) ) - x11-misc/xdotool - net-misc/rdesktop - media-gfx/gimp - kde-apps/kruler - net-analyzer/wireshark - x11-apps/xhost - dev-db/squirrel-sql - app-editors/okteta - dev-util/kdbg - kde-apps/dolphin-plugins-git - net-analyzer/nmap - dotnet? ( - dev-util/monodevelop - || ( - >=dev-util/monodevelop-4 - ( - dev-util/monodevelop-database - dev-util/monodevelop-debugger-gdb - ) - ) - ) - dev-db/pgadmin4 - kde-apps/kcachegrind - app-editors/gvim - dev-util/hotspot - )" - diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest index 651b466..ef893ac 100644 --- a/virtual/miller-postgresql/Manifest +++ b/virtual/miller-postgresql/Manifest @@ -1,2 +1,2 @@ -EBUILD miller-postgresql-12.1.ebuild 247 BLAKE2B 249054b35b3508f6f21aa1df9ee4a2b639bd302b5f58043aebd2b1585e18fcbc3d0aaf0b411e318a00e00d6754cca3df57433aea150328cb5f040b5464467bf0 SHA512 c2c819d25111b7161a199198172baf8a0453f3599fd6d637c385222e5a3db7d75a452f3d06288b5c173ac697f3ef5d710a306c68dbc33af302d3de6cdc51e75b -EBUILD miller-postgresql-14.0.ebuild 279 BLAKE2B 59faf98d3888bc193c089090b26261351b5b4b0f6f39283947d9d4b8c3ae9448d01fb9c8b7011177202fb5067b543491eca817d0b5d4e00619569e59374ccdad SHA512 9579afb0b29f7a8df31c6e61a30a4afea55a7f3a30f65feda1c22b5078421e7843a2d93d8cd2e866c3eccee993039405bbe86927642b1ff5040c64da927732b9 +EBUILD miller-postgresql-13.0.ebuild 247 BLAKE2B 02532c64796926e103aaf3251f2dc75603958faef938de36a45fb5b93a308d9bf5342c3601cb7a17e45ea69581baefb657852064c2f92b79636a806d11bf4bb7 SHA512 602ddfccfd2faa630a9dbca4c805591ff65af56e65de02c553f6ce0c149dd091095e047f71c5ddfd6c91ffb2dfbcff0558f9f4e31c387d30a3473b8f73631471 +EBUILD miller-postgresql-14.0-r1.ebuild 314 BLAKE2B e8b7603d60e76464462dc56b28fe7828285d1378a61154e27d17c60a1ecc1263c9518a8f542ad76aca138efd5f7ca6629748d19412240c5cbb3128367287a06d SHA512 24d3dcb8704408ec65ee038324cd03da703eb95851f81a02a24e118a99704c8f6e8ba684c7292e6c398044858b66b9a9921851fc09a2941feab7f0b4126ba154 diff --git a/virtual/miller-postgresql/miller-postgresql-12.1.ebuild b/virtual/miller-postgresql/miller-postgresql-12.1.ebuild deleted file mode 100644 index 1831616..0000000 --- a/virtual/miller-postgresql/miller-postgresql-12.1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -EAPI="7" -DESCRIPTION="Virtual for Miller PostgreSQL servers" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="" - -RDEPEND=" - virtual/miller-base - dev-db/pg_activity - =dev-db/postgresql-12*[server] -" - diff --git a/virtual/miller-postgresql/miller-postgresql-13.0.ebuild b/virtual/miller-postgresql/miller-postgresql-13.0.ebuild new file mode 100644 index 0000000..d699010 --- /dev/null +++ b/virtual/miller-postgresql/miller-postgresql-13.0.ebuild @@ -0,0 +1,13 @@ +EAPI="7" +DESCRIPTION="Virtual for Miller PostgreSQL servers" + +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="" + +RDEPEND=" + virtual/miller-base + dev-db/pg_activity + =dev-db/postgresql-13*[server] +" + diff --git a/virtual/miller-postgresql/miller-postgresql-14.0-r1.ebuild b/virtual/miller-postgresql/miller-postgresql-14.0-r1.ebuild new file mode 100644 index 0000000..e19df5a --- /dev/null +++ b/virtual/miller-postgresql/miller-postgresql-14.0-r1.ebuild @@ -0,0 +1,13 @@ +EAPI="7" +DESCRIPTION="Virtual for Miller PostgreSQL servers" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="pacemaker" + +RDEPEND=" + virtual/miller-base + dev-db/pg_activity + =dev-db/postgresql-14*[server] + pacemaker? ( sys-cluster/resource-agents-paf ) +" diff --git a/virtual/miller-postgresql/miller-postgresql-14.0.ebuild b/virtual/miller-postgresql/miller-postgresql-14.0.ebuild deleted file mode 100644 index feb43e3..0000000 --- a/virtual/miller-postgresql/miller-postgresql-14.0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -EAPI="7" -DESCRIPTION="Virtual for Miller PostgreSQL servers" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="" - -RDEPEND=" - virtual/miller-base - dev-db/pg_activity - sys-cluster/resource-agents-paf - =dev-db/postgresql-14*[server] -" -- cgit v1.2.3