diff options
Diffstat (limited to 'net-im')
20 files changed, 303 insertions, 750 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex 8fc8c971e764..71d79dd31436 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest deleted file mode 100644 index f44242275f73..000000000000 --- a/net-im/jabberd2/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX jabberd2-2.3.1.pamd 158 BLAKE2B f92e86a1df67595956537043f3dfe1f3d5241dd67f785a9cf5d8ac7958c9caedf9e09bdb630ebac0774c497fbdfe5f2e40308340eb5c8781b2da523b8682fa5a SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 -AUX jabberd2-2.3.2.init 1890 BLAKE2B 7c035f149bdca36e2f69a736b9a70e289e3fe57b51126c0824d12eb5347ed6966eb68b833cda05fab36448163cdd1ef5793047e6ada34ece1e3c9e1fff9d2246 SHA512 bfd6ae287f89714b79b4050656cb503b0ee8429413e5d307e1b7feecc6a5aed33d362b86f0877d2ab176c7f90697201b833ff564cb01e5bcd284fbae7ff3f1f2 -AUX jabberd2-2.3.2.logrotate 197 BLAKE2B fda6fbf48c70913229f5729606c069ee3bca78ba6235cc83e41ac5f2a304828c869611e30b2accc566928ee800ef9e1ddd0566bdb4c64a04653f0a730809a85a SHA512 1e3d74612dd08df2014af2ae0f0681e78c9902644dfbf37100369591803f2cf757d27967f7e9c99d3503cff8480ace7ce4b14303028d25866ebbd4ecf882d7c0 -AUX jabberd2-2.5.0.init 1906 BLAKE2B aec00b17bf41584a707d69745082abb33a4e9982a0027fad5956ea5ed6a1a5f49f27af9fef6457e04a088169bfa73733dca5eb2dcf67dea081f0593eeb869c8f SHA512 1d46b543f8b477a1db5cf1d23a57ba77cfae7e7752c6f4fdd98ba5ee42c0ba28422b7175ebce4383ec9de2f03655072d4892dac0429fe24fc85f27ff8bdb35f1 -DIST jabberd-2.3.3.tar.xz 1457340 BLAKE2B f5d7da31037cff543db5b622334e829b2de803056437f29d28d3fc413424454bddbb75e0a20a1ef35bb5a4bfa41013e7b6865ccac46aab746a23f2f1ee842683 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da -DIST jabberd-2.6.1.tar.xz 1542156 BLAKE2B e6c66cc7490772a496face76ff0d57d950cf66798b326c1abf849a4a1cb2cec1cf1055d18bd97313cdc375e853568df17649026876de314ef319aee602b3b027 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea -EBUILD jabberd2-2.3.3-r2.ebuild 4774 BLAKE2B f6cbce8265a10973c76c420a07315dda67a03f60285e14fa94483a5856f8987536c8cc22938c262376ebcf380b2048cd9f959169cc464889cce3ed516770a2b9 SHA512 871a4e298148851aab80a1bf810a0725c5107e07020bcafc99a15ab5b24290ca6aed10d74422c97b44de84aa185bc16b3101cfa99187f44d346af173f3a44d70 -EBUILD jabberd2-2.6.1.ebuild 5351 BLAKE2B c00ae4feb859365b3885ec830f2f8ab3862b2ece42ca827714d0f1c90f6ed5f7d837c91a024147f0da787473bc8b60463ef2fdf0cd263a69470828467c4b14b7 SHA512 ff81099795ba1b2e9c7a78054851317cd8d3c987d78f584b08aa0cd51cf133476a939973057142f6325cd797af1d0958cf0bdb1d8e9572d8246eb0f75bfb7871 -MISC metadata.xml 518 BLAKE2B d86b5ae0a12af23bc24ef841c9968ce8d5dee646412fd9240610403b9700bda781a8cb09cc2ecf0707c70b318a9a79f83e7891da45d27b8b202b1ad133d63a4a SHA512 bd66d981f192750c15e96c89c80dd6fa6f88dec6893dae286f71f8e569dfa117b01df0008d1a9995ed5f635c09824c70ae48127c4cb4570f8d5cd0939071b2df diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd deleted file mode 100644 index 2c5a5347ad6a..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.1.pamd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_nologin.so -auth include system-auth -account include system-auth -session include system-auth diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init deleted file mode 100644 index 4ef8aaea2c24..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.init +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent - -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable=/usr/bin/${service} - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec /usr/bin/${service} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent - -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - - einfo "Stopping Jabber Server" - stopJabberServices - -} diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate deleted file mode 100644 index fcec0f7a1d59..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log { - su jabber jabber - sharedscripts - missingok - postrotate - /etc/init.d/jabberd reload - endscript -} diff --git a/net-im/jabberd2/files/jabberd2-2.5.0.init b/net-im/jabberd2/files/jabberd2-2.5.0.init deleted file mode 100644 index a5579f7b6c0c..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.5.0.init +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable="/usr/bin/$(echo ${service} | cut -d '.' -f 1)" - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec ${executable} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - einfo "Stopping Jabber Server" - stopJabberServices -} diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild deleted file mode 100644 index 5a604d5489e3..000000000000 --- a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit db-use eutils flag-o-matic pam - -DESCRIPTION="Open Source Jabber Server" -HOMEPAGE="http://jabberd2.org" -SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd" -IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib" -REQUIRED_USE="memdebug? ( debug )" - -# broken -RESTRICT="test" - -DEPEND="dev-libs/expat - net-libs/udns - net-dns/libidn - virtual/gsasl - berkdb? ( >=sys-libs/db-4.1.25:* ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) - libressl? ( dev-libs/libressl ) - ) - sqlite? ( dev-db/sqlite:3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - >=net-im/jabber-base-0.01" -DEPEND="${DEPEND} - app-arch/xz-utils - virtual/pkgconfig - test? ( dev-libs/check )" - -DOCS=( AUTHORS README ) - -S=${WORKDIR}/jabberd-${PV} - -src_prepare() { - # Fix some default directory locations - sed -i \ - -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ - -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ - -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ - -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ - -e 's,@localstatedir@,/var/spool,g' \ - -e 's,@package@,jabber,g' \ - etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" - - # If the package wasn't merged with sqlite then default to use berkdb - use sqlite || - sed -i \ - -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ - etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" - - # avoid file collision with x11-misc/screen-message wrt #453994 - sed -i \ - -e 's/@jabberd_router_bin@/jabberd2-router/' \ - -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ - -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ - -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ - etc/jabberd*.in || die "fixing file collisions failed!" - - # rename pid files wrt #241472 - sed -i \ - -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ - -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ - -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ - -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ - etc/*.xml.dist.in || die "renaming pid files failed!" -} - -src_configure() { - # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 - # https://github.com/jabberd2/jabberd2/issues/34 - replace-flags -O[3s] -O2 - - # --enable-pool-debug is currently broken - econf \ - --sysconfdir=/etc/jabber \ - $(usex debug "--enable-debug" "") \ - $(usex memdebug "--enable-nad-debug" "") \ - $(use_enable ssl) \ - $(use_enable mysql) \ - $(use_enable postgres pgsql) \ - $(use_enable sqlite) \ - $(use_enable berkdb db) \ - $(use_enable ldap) \ - $(use_enable pam) \ - --enable-pipe \ - --enable-anon \ - --enable-fs \ - $(use_enable experimental) \ - $(use_enable test tests) \ - $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ - $(use_with zlib) -} - -src_install() { - local i - - default - prune_libtool_files --modules - - keepdir /var/spool/jabber/{fs,db} - fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ - /var/spool/jabber/{fs,db} - fperms 770 /var/spool/jabber/{fs,db} - fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} - - # avoid file collision with x11-misc/screen-message wrt #453994 - for i in router sm c2s s2s ; do - einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die - done - - newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd - newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd - - docompress -x /usr/share/doc/${PF}/tools - docinto tools - dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ - tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} - - # remove useless upstart files wrt #498900 - rm -rf "${ED%/}"/usr/etc -} - -pkg_postinst() { - if use pam; then - echo - ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' - ewarn 'be in the form of "contactname@jabberdomain". This behavior' - ewarn 'is likely to change in future versions of jabberd-2. It may' - ewarn 'be advisable to avoid PAM authentication for the time being.' - echo - fi - - if use sqlite || use mysql || use postgres; then - echo - einfo "You will need to setup or update your database using the" - einfo "scripts in /usr/share/doc/${PF}/tools/" - echo - fi - - ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' - ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' - ewarn 'the binaries have been renamed to avoid file collisions!' -} diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild deleted file mode 100644 index cc3915cf4b4a..000000000000 --- a/net-im/jabberd2/jabberd2-2.6.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools db-use eutils flag-o-matic pam systemd - -DESCRIPTION="Open Source Jabber Server" -HOMEPAGE="http://jabberd2.org" -SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib" -REQUIRED_USE="memdebug? ( debug )" - -DEPEND=" - dev-libs/expat - net-libs/udns - net-dns/libidn - virtual/gsasl - berkdb? ( >=sys-libs/db-4.1.25:= ) - ldap? ( net-nds/openldap ) - mysql? ( - virtual/libmysqlclient:= - virtual/mysql:= - ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) - libressl? ( dev-libs/libressl:= ) - ) - sqlite? ( dev-db/sqlite:3 ) - websocket? ( net-libs/http-parser:= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND=" - ${DEPEND} - >=net-im/jabber-base-0.01 -" -DEPEND=" - ${DEPEND} - app-arch/xz-utils - sys-devel/autoconf-archive - virtual/pkgconfig - test? ( dev-libs/check ) -" - -DOCS=( AUTHORS README ) - -#PATCHES=( -#) - -S="${WORKDIR}/jabberd-${PV}" - -pkg_pretend() { - if is-flagq '-O[3s]' ; then - ewarn "O3/Os compiler flags have been known to cause problems" - ewarn "with old gcc version. Be aware that this could break" - ewarn "port binding. Make sure to test this." - ewarn "See https://github.com/jabberd2/jabberd2/issues/34" - fi -} - -src_prepare() { - # Fix some default directory locations - sed -i \ - -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ - -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ - -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ - -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ - -e 's,@localstatedir@,/var/spool,g' \ - -e 's,@package@,jabber,g' \ - etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" - - # If the package wasn't merged with sqlite then default to use berkdb - use sqlite || - sed -i \ - -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ - etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" - - # avoid file collision with x11-misc/screen-message wrt #453994 - sed -i \ - -e 's/@jabberd_router_bin@/jabberd2-router/' \ - -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ - -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ - -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ - etc/jabberd*.in || die "fixing file collisions failed!" - - # rename pid files wrt #241472 - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \ - etc/c2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \ - etc/router.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \ - etc/s2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \ - etc/sm.xml.dist.in || die - - default - - eautoreconf -} - -src_configure() { - # --enable-pool-debug is currently broken - myeconfargs=( - --sysconfdir=/etc/jabber - --enable-pipe - --enable-anon - --enable-fs - $(usex debug "--enable-debug" "") - $(usex memdebug "--enable-nad-debug" "") - $(use_enable ssl) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable sqlite) - $(use_enable berkdb db) - $(use_enable ldap) - $(use_enable pam) - $(use_enable websocket) - $(use_enable experimental) - $(use_enable test tests) - $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local i - - # Fix systemd unit files installation path, bug #626026 - emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install - einstalldocs - prune_libtool_files --modules - - keepdir /var/spool/jabber/{fs,db} - fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ - /var/spool/jabber/{fs,db} - fperms 770 /var/spool/jabber/{fs,db} - fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} - - # avoid file collision with x11-misc/screen-message wrt #453994 - for i in router sm c2s s2s ; do - einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die - done - - newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd - newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd - - docompress -x /usr/share/doc/${PF}/tools - docinto tools - dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ - tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} - - # remove useless upstart files wrt #498900 - rm -rf "${ED%/}"/usr/etc -} - -pkg_postinst() { - if use pam; then - echo - ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' - ewarn 'be in the form of "contactname@jabberdomain". This behavior' - ewarn 'is likely to change in future versions of jabberd-2. It may' - ewarn 'be advisable to avoid PAM authentication for the time being.' - echo - fi - - if use sqlite || use mysql || use postgres; then - echo - einfo "You will need to setup or update your database using the" - einfo "scripts in /usr/share/doc/${PF}/tools/" - echo - fi - - ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' - ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' - ewarn 'the binaries have been renamed to avoid file collisions!' -} diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml deleted file mode 100644 index ab20f28a6a32..000000000000 --- a/net-im/jabberd2/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="experimental">Enable experimental features such - as TLS Everywhere.</flag> - <flag name="memdebug">Enable nad and pool debug. - Requires USE="debug" to be set.</flag> - <flag name="websocket">Enable WebSocket support on C2S port.</flag> - </use> - <upstream> - <remote-id type="github">jabberd2/jabberd2</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest deleted file mode 100644 index c04fa24a8f2d..000000000000 --- a/net-im/mu-conference/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX mu-conference-0.7.init 410 BLAKE2B 22062fe9457c571c027d8d623822b36be51aa2032e9706333863c67300c4f84ca1638d73391929311039461ec9764770532dafea2fc02a86da2f9bbe74b5311e SHA512 0686c42f157579acabdf01b688f2934cb06fac62ea8946781afaf4385d6333240acbcad3277af61e5f5bf282bb0ba751583be7116d6239cc25f94812000c174a -AUX mu-conference-0.8.81-sha1_64bit.patch 786 BLAKE2B 4ac7030928709bd4d2ff6c0cfafa2c4d5d01dc4e608cd212d444bcaef81fa14c3ad6f9641ac71cc16a8b9b7c782f89a58e4e0f4c2e0e63c6dbadf29dd2f5e07e SHA512 8872debbabacd3a39346a838cb71ee8acf7482cbe3d54484c60b7f985b70d601eb6ed3ae77ba4e0f3fd666c25f79b2761112092785560a1484c83eac16b29f5e -DIST mu-conference-0.8.81.tar.gz 247649 BLAKE2B 765ca8d25e11b5b0cabd000476fc12667489f742e3e222004ffac7e13c5a88eb9d462a53c1bcf8b72a3637e89134e7ddb142b5116840724dbad57dfeee65448d SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 -EBUILD mu-conference-0.8.81-r2.ebuild 2622 BLAKE2B c2f5ff5ec53de2ec5bc1a228d1573fdb1e4a5d621f5c52adbd350023d5f03a2fb047734324aa6993c76ec5a6bc372c6e53eab466995594f47ca090c61d78b001 SHA512 4c32a466dc94de66b082243aa92c417dbcef95499e989fcf7959d52e7f90071dcab60ad6e9fa3c65441774025efc8cd44ef0be8c925440472e2bc600dab6e01a -MISC metadata.xml 238 BLAKE2B dad10081ed2ffa525a484d583a71e169ae25fbc3ddeaf5c05e115a0c9afcffc05f01b3c17005d4650d1537fc5a637b10d4ef9cf4153f3ddbdc3c62de2d7f308f SHA512 9c93a4d93ed3d61578dc8eb48950760c410b5df76cf2e7c6cdceabf1fc18b91540437e8e0377144def02e4f666b3c7175a059f678f1326d52375bf7281163e82 diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init deleted file mode 100644 index a41c470cc815..000000000000 --- a/net-im/mu-conference/files/mu-conference-0.7.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net - use jabber-server -} - -start() { - ebegin "Starting MUC Jabber Transport" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec /usr/bin/mu-conference \ - -- -c /etc/jabber/mu-conference.xml - eend $? -} - -stop() { - ebegin "Stoping MUC Jabber Transport" - start-stop-daemon \ - --stop \ - --pidfile /var/run/jabber/mu-conference.pid - eend $? -} diff --git a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch deleted file mode 100644 index 2764daa10544..000000000000 --- a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- mu-conference-0.8.81/include/lib.h -+++ mu-conference-0.8.81/include/lib.h -@@ -114,13 +114,6 @@ - /* SHA calculations */ - /* */ - /* --------------------------------------------------------- */ --#if (SIZEOF_INT == 4) --typedef unsigned int uint32; --#elif (SIZEOF_SHORT == 4) --typedef unsigned short uint32; --#else --typedef unsigned int uint32; --#endif /* HAVEUINT32 */ - - char *shahash(char *str); /* NOT THREAD SAFE */ - void shahash_r(const char* str, char hashbuf[40]); /* USE ME */ -@@ -301,10 +294,10 @@ - - - typedef struct { -- uint32_t H[5]; -- uint32_t W[80]; -+ guint32 H[5]; -+ guint32 W[80]; - int lenW; -- uint32_t sizeHi,sizeLo; -+ guint32 sizeHi,sizeLo; - } j_SHA_CTX; - - - diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml deleted file mode 100644 index e3c243e00aa9..000000000000 --- a/net-im/mu-conference/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Multi User Conference for Jabber</longdescription> -</pkgmetadata> diff --git a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild deleted file mode 100644 index ed5e3ea48f72..000000000000 --- a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Multi-User Chat for jabberd" -HOMEPAGE="https://gna.org/projects/mu-conference/" -SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -SLOT="0" -IUSE="mysql" - -RDEPEND=" - dev-libs/expat - >=dev-libs/glib-2:2 - net-dns/libidn - net-im/jabberd2 - mysql? ( virtual/mysql ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - # http://gna.org/bugs/?16238 - "${FILESDIR}"/${P}-sha1_64bit.patch -) - -src_prepare() { - # Fix missing header in src/conference_user.c in order to - # make emerge happy and avoid QA notice. - sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die - - if use mysql; then - sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \ - -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die - fi - sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\ - -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\ - -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die - sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die - sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die - sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die - sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die - tc-export CC AR RANLIB - - default -} - -src_install() { - dobin src/mu-conference - fowners jabber:jabber /usr/bin/mu-conference - fperms 750 /usr/bin/mu-conference - - newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference - - dodoc ChangeLog FAQ mu-conference.sql README README.sql - docinto scripts - dodoc scripts/* - - local i - for i in log spool; do - dodir /var/${i}/jabber/mu-conference - keepdir /var/${i}/jabber/mu-conference - fowners jabber:jabber /var/${i}/jabber/mu-conference - fperms 770 /var/${i}/jabber/mu-conference - done - - insinto /etc/jabber - newins muc-default.xml mu-conference.xml - doins style.css - - sed -i \ - -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \ - -e 's,./syslogs,/var/log/jabber,g' \ - -e 's,./logs,/var/log/jabber/mu-conference,g' \ - -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \ - -e "s,../style.css,/etc/jabber/style.css,g" \ - -e "s,7009,5347,g" \ - "${D}"/etc/jabber/mu-conference.xml || die "sed failed" -} - -pkg_postinst() { - echo - elog "For jabberd-2 connection:" - elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml" - elog " match the address of your jabberd router." - elog "2. Set a common secret in mu-conference.xml and router.xml" - echo -} diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 72b3841bee86..7a0a7db8a31b 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -4,6 +4,8 @@ AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.12.0.tar.bz2 9270704 BLAKE2B d12b84c4ff94e4dec67bf5e13607510a4ccd54b81868a244a5078f760b2c1178670fa25149478032437dcee0641547993c027e34e42b5af96e222e14a43d901f SHA512 e87b39888432982ee36332fd14b272f49f7974de9e8694f7fe3bec2821748d6e6026ac5a63615a93386a033d6ee7c4de5ae0a86b725f63b9cc55650f0ab94b06 +DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 EBUILD pidgin-2.12.0.ebuild 7508 BLAKE2B e5038361a36dfded8dde32311ae84198c6b91f6bec1d1021d07d306e50603ea5c036ed4e83561cfd18f5989fe412198f0303352fd62ba50a7f5abd54afa66b20 SHA512 58d38521f0d3bfe1f2ec8c1dcdeed2adcb7c882a852f67f00d28d8ebac293ddb72a13b998c705151f225811098ddc0aee277aa0b49d137fcf1c99d6dcd0e015e +EBUILD pidgin-2.13.0.ebuild 7709 BLAKE2B 23069c6d13fb21d4e48e4953063e919bb8a74e1d9d9aa14b20d76f6a35e584141653693d8b357db06ccf6a4b1c3f24567c17cf951b4aeab027a6fe9c938f4021 SHA512 9d992654af30fc7718f5b308575d4c2c60109b59fee7a3b244eb70e57567d655889fb51a86bc8f3f23b43ff76bfbbad6fba55df2b755a5a0e31730454b6e234d MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00 diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild new file mode 100644 index 000000000000..3b87c2f0879c --- /dev/null +++ b/net-im/pidgin/pidgin-2.13.0.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python2_7 ) + +inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://pidgin.im/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2 + https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" + +LICENSE="GPL-2" +SLOT="0/2" # libpurple version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie" +IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" +IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" +IUSE+=" aqua" + +# dbus requires python to generate C code for dbus bindings (thus DEPEND only). +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is +# no way to build dbus and avoid libgnt linkage with python. If you want this +# send patch upstream. +# purple-url-handler and purple-remote require dbus-python thus in reality we +# rdepend on python if dbus enabled. But it is possible to separate this dep. +RDEPEND=" + >=dev-libs/glib-2.16 + >=dev-libs/libxml2-2.6.18 + ncurses? ( + sys-libs/ncurses:0=[unicode] + dbus? ( ${PYTHON_DEPS} ) + python? ( ${PYTHON_DEPS} ) + ) + gtk? ( + >=x11-libs/gtk+-2.10:2[aqua=] + x11-libs/libSM + >=x11-libs/pango-1.4.0 + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=app-text/gtkspell-2.0.2:2 ) + eds? ( >=gnome-extra/evolution-data-server-3.6:= ) + prediction? ( >=dev-db/sqlite-3.3:3 ) + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=net-libs/farstream-0.2.7:0.2 + ) + zeroconf? ( net-dns/avahi[dbus] ) + dbus? ( + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-0.90 + dev-python/dbus-python + ) + perl? ( >=dev-lang/perl-5.16:= ) + gadu? ( + || ( + >=net-libs/libgadu-1.11.0[ssl,gnutls] + >=net-libs/libgadu-1.11.0[-ssl] + ) + ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( + dev-libs/nspr + dev-libs/nss + ) + meanwhile? ( net-libs/meanwhile ) + silc? ( >=net-im/silc-toolkit-1.0.1 ) + tcl? ( dev-lang/tcl:0= ) + tk? ( dev-lang/tk:0= ) + sasl? ( dev-libs/cyrus-sasl:2 ) + networkmanager? ( net-misc/networkmanager ) + idn? ( net-dns/libidn ) + !<x11-plugins/pidgin-facebookchat-1.69-r1" + # Mono support crashes pidgin + #mono? ( dev-lang/mono )" + +# We want nls in case gtk is enabled, bug # +NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" + +DEPEND="$RDEPEND + dev-lang/perl + dev-perl/XML-Parser + virtual/pkgconfig + gtk? ( + x11-proto/scrnsaverproto + ${NLS_DEPEND} + ) + dbus? ( ${PYTHON_DEPS} ) + doc? ( app-doc/doxygen ) + !gtk? ( nls? ( ${NLS_DEPEND} ) )" + +DOCS=( AUTHORS HACKING NEWS README ChangeLog ) + +REQUIRED_USE=" + dbus? ( ${PYTHON_REQUIRED_USE} ) + networkmanager? ( dbus ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +# Enable Default protocols +DYNAMIC_PRPLS="irc,jabber,oscar,simple" + +# List of plugins +# app-accessibility/pidgin-festival +# net-im/librvp +# x11-plugins/guifications +# x11-plugins/msn-pecan +# x11-plugins/pidgin-encryption +# x11-plugins/pidgin-extprefs +# x11-plugins/pidgin-hotkeys +# x11-plugins/pidgin-latex +# x11-plugins/pidgintex +# x11-plugins/pidgin-libnotify +# x11-plugins/pidgin-mbpurple +# x11-plugins/pidgin-bot-sentry +# x11-plugins/pidgin-otr +# x11-plugins/pidgin-rhythmbox +# x11-plugins/purple-plugin_pack +# x11-themes/pidgin-smileys +# x11-plugins/pidgin-knotify +# Plugins in Sunrise: +# x11-plugins/pidgin-audacious-remote +# x11-plugins/pidgin-autoanswer +# x11-plugins/pidgin-birthday-reminder +# x11-plugins/pidgin-blinklight +# x11-plugins/pidgin-convreverse +# x11-plugins/pidgin-embeddedvideo +# x11-plugins/pidgin-extended-blist-sort +# x11-plugins/pidgin-gfire +# x11-plugins/pidgin-lastfm +# x11-plugins/pidgin-sendscreenshot +# x11-plugins/pidgimpd + +PATCHES=( + "${FILESDIR}/${PN}-2.10.0-gold.patch" + "${WORKDIR}/${PN}-eds-3.6.patch" + "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch" + "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch" + "${FILESDIR}/${PN}-2.10.11-tinfo.patch" + "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 +) + +pkg_setup() { + if ! use gtk && ! use ncurses ; then + elog "You did not pick the ncurses or gtk use flags, only libpurple" + elog "will be built." + fi + if use python || use dbus ; then + python-single-r1_pkg_setup + fi + + # dbus is enabled, no way to disable linkage with python => python is enabled + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls; then + ewarn "gtk build => nls is enabled!" + fi + if use dbus && ! use python; then + elog "dbus is enabled, no way to disable linkage with python => python is enabled" + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Stabilize things, for your own good + strip-flags + replace-flags -O? -O2 + use pie && append-cflags -fPIE -pie + + use gadu && DYNAMIC_PRPLS+=",gg" + use groupwise && DYNAMIC_PRPLS+=",novell" + use silc && DYNAMIC_PRPLS+=",silc" + use meanwhile && DYNAMIC_PRPLS+=",sametime" + use zephyr && DYNAMIC_PRPLS+=",zephyr" + use zeroconf && DYNAMIC_PRPLS+=",bonjour" + + local myconf=( + --disable-mono + --with-dynamic-prpls="${DYNAMIC_PRPLS}" + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" + --x-includes="${EPREFIX}"/usr/include/X11 + $(use_enable ncurses consoleui) + $(use_enable gtk gtkui) + $(use_enable gtk sm) + $(usex gtk '--enable-nls' "$(use_enable nls)") + $(use gtk && use_enable xscreensaver screensaver) + $(use gtk && use_enable prediction cap) + $(use gtk && use_enable eds gevolution) + $(use gtk && use_enable spell gtkspell) + $(use_enable perl) + $(use_enable tk) + $(use_enable tcl) + $(use_enable debug) + $(use_enable dbus) + $(use_enable meanwhile) + $(use_enable gstreamer) + $(use_with gstreamer gstreamer 1.0) + $(use_enable gstreamer farstream) + $(use_enable gstreamer vv) + $(use_enable sasl cyrus-sasl ) + $(use_enable doc doxygen) + $(use_enable networkmanager nm) + $(use_enable zeroconf avahi) + $(use_enable idn) + ) + + if use gnutls; then + einfo "Disabling NSS, using GnuTLS" + myconf+=( --enable-nss=no --enable-gnutls=yes ) + myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" ) + myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" ) + else + einfo "Disabling GnuTLS, using NSS" + myconf+=( --enable-gnutls=no --enable-nss=yes ) + fi + + if use dbus || { use ncurses && use python ; } ; then + myconf+=( --with-python=${PYTHON} ) + else + myconf+=( --without-python ) + fi + + econf "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + if use gtk; then + # Fix tray paths for e16 (x11-wm/enlightenment) and other + # implementations that are not complient with new hicolor theme yet, #323355 + local pixmapdir + for d in 16 22 32 48; do + pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions + mkdir "${pixmapdir}" || die + pushd "${pixmapdir}" >/dev/null || die + for f in ../status/*; do + ln -s ${f} || die + done + popd >/dev/null || die + done + fi + use perl && perl_delete_localpod + + if use python && use dbus ; then + python_fix_shebang "${D}" + python_optimize + fi + + dodoc ${DOCS} finch/plugins/pietray.py + docompress -x /usr/share/doc/${PF}/pietray.py + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} + +src_test() { + emake check +} + +pkg_preinst() { gnome2_icon_savelist; } + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index 9c51762bb7af..a132eaaf9b29 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -4,5 +4,5 @@ DIST psi-l10n-1.2.tar.gz 2992381 BLAKE2B abe25db86780ef436241bf71597e13e1223bc72 DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090 EBUILD psi-1.2.ebuild 2975 BLAKE2B fe293d11aa6ab9068aede5a9eccf40c2ba2f120e5b4f65cbd8734221508b0257519c9f168e595e8782b10f74a98122a9fe0b0ce1218bae2a388b3772afb4e7a8 SHA512 910c5eff50e0dd3150f4c61342586bb38cfe5936b497ec8349694eae469d9d28364af78c5d1c7624ae615c1fb5db09c2f6f6dab4662372545c47e9c5700767aa EBUILD psi-1.3.ebuild 2977 BLAKE2B 58d14bc4f5cb2899503c30ab335521e88f006e538c0173d09c56eb62cc5429dd4dc1d25d30c87badf95b0d348f7deefc79bf62fcb62ffb9112e10e578316885f SHA512 c31f84f1172757b8ef18b23665c449c544239bf2a8134bd69d8bf05b7cee49c74ba96564ed0ef070a7772ba5e9fe11fe6ccf7c98e3cc90e5d54a9ebf6dfbf228 -EBUILD psi-9999.ebuild 5075 BLAKE2B 037de2d519c57fb586a3ef104195702dc9964eda7900cd1f6508b2b568003810c1f83731c5f68f80bcb5e9db0897a3189ec1b13004b6e750a8feb540bff7af51 SHA512 ab484575e725c49f4cbd4d142e7fdfec10517685bfbca6b58bf747bf84f793293df2dad7e23aefcac59e45695bdfbd4051583695be2df544579a58165a833890 +EBUILD psi-9999.ebuild 5281 BLAKE2B 7c3245c293b96bdcc262040e242db34a24a62add923022e8058a2a7f8908b0c600c037dcb73a17cc4b453ed86f4dbf2f29b5388d40f4f0cb5df22e376cac1239 SHA512 c7f24708c70c90e06e6004e147448d27fde78cc31b78c063e6ef691475c833c6f8d8e2abd4a43ec42c1693f38e1d72901f0ad8d056d607cdf7c52ab129ffbe26 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820 diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index e6240c96afa4..59adb2304195 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit l10n git-r3 qmake-utils xdg-utils +inherit l10n git-r3 qmake-utils gnome2-utils xdg-utils DESCRIPTION="Qt XMPP client" HOMEPAGE="http://psi-im.org/" @@ -22,9 +22,6 @@ SLOT="0" KEYWORDS="" IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver" -# qconf generates not quite compatible configure scripts -QA_CONFIGURE_OPTIONS=".*" - REQUIRED_USE=" ?? ( aspell enchant hunspell ) iconsets? ( extras ) @@ -65,7 +62,7 @@ DEPEND="${RDEPEND} dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) - extras? ( >=sys-devel/qconf-2.3 ) + extras? ( >=sys-devel/qconf-2.4 ) " PDEPEND=" crypt? ( app-crypt/qca[gpg] ) @@ -140,6 +137,8 @@ src_prepare() { src_configure() { CONF=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir) --no-separate-debug-info --qtdir="$(qt5_get_bindir)/.." $(use_enable aspell) @@ -154,7 +153,10 @@ src_configure() { use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit") - econf "${CONF[@]}" + # This may generate warnings if passed option already matches with default. + # Just ignore them. It's how qconf-based configure works and will be fixed in + # future qconf versions. + ./configure "${CONF[@]}" || die "configure failed" eqmake5 psi.pro } @@ -188,12 +190,12 @@ src_install() { l10n_for_each_locale_do install_locale } -pkg_postinst(){ - xdg_mimeinfo_database_update +pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update - xdg_mimeinfo_database_update } diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 948427c7dcb1..8e176f471902 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_1.5.0_amd64.deb 65858954 BLAKE2B 60234d1cb98dd233ffc769c93bafd509ffc40eaf34cc76c3e8dfa8de1229a05e1f29291b1a57212163588a53990b1c24c1ba29486429ad63c0424049b79384c5 SHA512 36bcf67c5815bf4f001649f0bfe2a01217415fbc4b63688026ec5aba946a8a3df7e08021aa4255590fdc5820bdcd9e2d43b42798e7d8c5eb0186c351f9b10780 -EBUILD signal-desktop-bin-1.5.0.ebuild 1013 BLAKE2B 685d026c10575748a9b4e2ef72290371497942eea2f14a01eb1c9b5108c84c341cb96fc5971aa9e0b3b99d04037fcdcabebe9d786e05db48f2bc0306debf3dd8 SHA512 9c68ccf6b1d49ec97dd17613dc779069fff3465cfe01c21f0c4b6ef43e0191057486ddd0a24b7b624447aed1eea08066c4569d4e9b9b14d837ff60e37f62f472 +DIST signal-desktop_1.5.2_amd64.deb 65859590 BLAKE2B a710b8ca1c9729725a12594603e0fb3a6c800e5b03af17c9ef5158a024b8ebddd1e35ba4270a02ed805a3042a16486e163a5dca105feb1076deb80c636e043cd SHA512 10f6a0bfb1947620d2ce71f7e8dc6b9f6fe9c95556f3ae1b9b34aa5d84db0f357b78634e7ff815f9e7d2d3a6d0d628e20adb1817a027a32b2021c24ef8d4441e +EBUILD signal-desktop-bin-1.5.2.ebuild 1207 BLAKE2B ad0c425668bd9ca11cb3abf20f6d0bda8ca2af620fe61da1650f48576a9dd74ab9a9d9355a3051d19eff75133fa5230f94dc525d89f810a5db7d176684ef2cb3 SHA512 ccba5daaed772250c074a3e17df06a3e0245137adaf651ff644d2e25d2c3902309e5827fb4d5ba3d07606a6bb17d97155281c91b5da32c59a84c561d91fc5937 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild index 49c5f56fefba..92008eb4f0ec 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-1.5.0.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.5.2.ebuild @@ -5,9 +5,8 @@ EAPI=6 MY_PN="${PN/-bin/}" -inherit gnome2-utils unpacker xdg-utils pax-utils - -DESCRIPTION="Signal Desktop" +inherit gnome2-utils pax-utils unpacker xdg-utils +DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" HOMEPAGE="https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop" SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" @@ -33,7 +32,12 @@ QA_PREBUILT="opt/Signal/signal-desktop S="${WORKDIR}" src_install() { - doins -r . + insinto / + dodoc -r usr/share/doc/signal-desktop/. + doins -r opt + insinto /usr/share + doins -r usr/share/applications + doins -r usr/share/icons fperms +x /opt/Signal/signal-desktop pax-mark m opt/Signal/signal-desktop |