commit:     4bcc020ea1c210261614eaa4040b64e81874e934
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 17:19:14 2020 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 17:20:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcc020e

app-backup/bacula: Drop old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 app-backup/bacula/Manifest                         |   1 -
 app-backup/bacula/bacula-5.2.13-r7.ebuild          | 397 ---------------------
 .../files/5.2.10/bacula-5.2.10-fix-static.patch    |  56 ---
 .../bacula/files/5.2.12/bacula-5.2.12-depend.patch |  12 -
 .../bacula/files/5.2.3/bacula-5.2.3-Makefile.patch |  27 --
 .../bacula/files/5.2.3/bacula-5.2.3-doc.patch      |  13 -
 .../bacula/files/5.2.3/bacula-5.2.3-ldflags.patch  |  11 -
 .../files/5.2.3/bacula-5.2.3-lib-search-path.patch |  12 -
 8 files changed, 529 deletions(-)

diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index ecbc84f770f..12f45128369 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,4 +1,3 @@
-DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 
5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f
 SHA512 
dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
 DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B 
be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937
 SHA512 
4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64
 DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B 
affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8
 SHA512 
390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708
 DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B 
f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332
 SHA512 
5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee

diff --git a/app-backup/bacula/bacula-5.2.13-r7.ebuild 
b/app-backup/bacula/bacula-5.2.13-r7.ebuild
deleted file mode 100644
index 5f8d6be9621..00000000000
--- a/app-backup/bacula/bacula-5.2.13-r7.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/";
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl 
logwatch mysql postgres python readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-       dev-libs/gmp:0
-       !bacula-clientonly? (
-               postgres? ( dev-db/postgresql:=[threads] )
-               mysql? ( dev-db/mysql-connector-c:= )
-               sqlite? ( dev-db/sqlite:3 )
-               !bacula-nodir? ( virtual/mta )
-       )
-       logwatch? ( sys-apps/logwatch )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       readline? ( sys-libs/readline:0 )
-       static? (
-               acl? ( virtual/acl[static-libs] )
-               sys-libs/zlib[static-libs]
-               dev-libs/lzo[static-libs]
-               sys-libs/ncurses:=[static-libs]
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0=[static-libs] )
-                       libressl? ( dev-libs/libressl:0=[static-libs] )
-               )
-       )
-       !static? (
-               acl? ( virtual/acl )
-               sys-libs/zlib
-               dev-libs/lzo
-               sys-libs/ncurses:=
-               ssl? (
-                       !libressl? ( dev-libs/openssl:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       python? ( ${PYTHON_DEPS} )
-       "
-RDEPEND="${DEPEND}
-       !bacula-clientonly? (
-               !bacula-nosd? (
-                       sys-block/mtx
-                       app-arch/mt-st
-               )
-       )
-       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-                               static? ( bacula-clientonly )
-                               python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       #XOR and !bacula-clientonly controlled by REQUIRED_USE
-       use mysql && export mydbtype="mysql"
-       use postgres && export mydbtype="postgresql"
-       use sqlite && export mydbtype="sqlite3"
-
-       # create the daemon group and user
-       if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-               enewgroup bacula
-               einfo
-               einfo "The group 'bacula' has been created. Any users you add 
to this"
-               einfo "group have access to files created by the daemons."
-               einfo
-       fi
-
-       if ! use bacula-clientonly; then
-               if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-                       enewuser bacula -1 -1 /var/lib/bacula 
bacula,disk,tape,cdrom,cdrw
-                       einfo
-                       einfo "The user 'bacula' has been created.  Please see 
the bacula manual"
-                       einfo "for information about running bacula as a 
non-root user."
-                       einfo
-               fi
-       fi
-
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       # adjusts default configuration files for several binaries
-       # to /etc/bacula/<config> instead of ./<config>
-       pushd src >&/dev/null || die
-       for f in console/console.c dird/dird.c filed/filed.c \
-               stored/bcopy.c stored/bextract.c stored/bls.c \
-               stored/bscan.c stored/btape.c stored/stored.c \
-               qt-console/main.cpp; do
-               sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' 
"${f}" \
-                       || die "sed on ${f} failed"
-       done
-       popd >&/dev/null || die
-
-       # bug 466688 drop deprecated categories from Desktop file
-       sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-       # bug 466690 Use CXXFLAGS instead of CFLAGS
-       sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-       # drop automatic install of unneeded documentation (for bug 356499)
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-       # bug #310087
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-       # bug #311161
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-       # stop build for errors in subdirs
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
-
-       # bat needs to respect LDFLAGS
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-       # bug #328701
-       epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-       epatch "${FILESDIR}"/5.2.10/${PN}-5.2.10-fix-static.patch
-
-       # do not strip binaries
-       sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-       sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-       # fix file not found error during make depend
-       epatch "${FILESDIR}"/5.2.12/${PN}-5.2.12-depend.patch
-
-       # Fix systemd unit files:
-       # bug 497748
-       sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-       sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-       # bug 504370
-       sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in 
|| die
-       # bug 584442 and 504368
-       sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in 
|| die
-
-       # Fix tmpfiles config for client-only (no bacula user) install
-       # NOTE: Change only first occurance (user) not second (group)
-       # bug 528398 and 577486
-       if use bacula-clientonly; then
-               sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || 
die
-       fi
-
-       # fix bundled libtool (bug 466696)
-       # But first move directory with M4 macros out of the way.
-       # It is only needed by autoconf and gives errors during elibtoolize.
-       mv autoconf/libtool autoconf/libtool1 || die
-       elibtoolize
-}
-
-src_configure() {
-       local myconf=''
-
-       if use bacula-clientonly; then
-               myconf="${myconf} \
-                       $(use_enable bacula-clientonly client-only) \
-                       $(use_enable !static libtool) \
-                       $(use_enable static static-cons) \
-                       $(use_enable static static-fd)"
-       else
-               myconf="${myconf} \
-                       $(use_enable !bacula-nodir build-dird) \
-                       $(use_enable !bacula-nosd build-stored)"
-               # bug #311099
-               # database support needed by dir-only *and* sd-only
-               # build as well (for building bscan, btape, etc.)
-               myconf="${myconf} \
-                       --with-${mydbtype} \
-                       --enable-batch-insert"
-       fi
-
-       myconf="${myconf} \
-               --disable-tray-monitor \
-               $(use_with X x) \
-               $(use_with python) \
-               $(use_enable !readline conio) \
-               $(use_enable readline) \
-               $(use_with readline readline /usr) \
-               $(use_with ssl openssl) \
-               $(use_enable ipv6) \
-               $(use_enable acl) \
-               $(use_with tcpd tcp-wrappers)"
-
-       econf \
-               --libdir=/usr/$(get_libdir) \
-               --docdir=/usr/share/doc/${PF} \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --with-pid-dir=/var/run \
-               --sysconfdir=/etc/bacula \
-               --with-subsys-dir=/var/lock/subsys \
-               --with-working-dir=/var/lib/bacula \
-               --with-logdir=/var/lib/bacula \
-               --with-scriptdir=/usr/libexec/bacula \
-               --with-systemd=$(systemd_get_unitdir) \
-               --with-dir-user=bacula \
-               --with-dir-group=bacula \
-               --with-sd-user=root \
-               --with-sd-group=bacula \
-               --with-fd-user=root \
-               --with-fd-group=bacula \
-               --enable-smartalloc \
-               --disable-afs \
-               --host=${CHOST} \
-               ${myconf}
-}
-
-src_compile() {
-       # Make build log verbose (bug #447806)
-       emake NO_ECHO=""
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       doicon scripts/bacula.png
-
-       # remove some scripts we don't need at all
-       rm -f 
"${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-       # rename statically linked apps
-       if use bacula-clientonly && use static ; then
-               pushd "${D}"/usr/sbin || die
-               mv static-bacula-fd bacula-fd || die
-               mv static-bconsole bconsole || die
-               popd || die
-       fi
-
-       # extra files which 'make install' doesn't cover
-       if ! use bacula-clientonly; then
-           # the database update scripts
-               diropts -m0750
-               insinto /usr/libexec/bacula/updatedb
-               insopts -m0754
-               doins "${S}"/updatedb/*
-               fperms 0640 /usr/libexec/bacula/updatedb/README
-
-               # the logrotate configuration
-               # (now unconditional wrt bug #258187)
-               diropts -m0755
-               insinto /etc/logrotate.d
-               insopts -m0644
-               newins "${S}"/scripts/logrotate bacula
-
-               # the logwatch scripts
-               if use logwatch; then
-                       diropts -m0750
-                       dodir /etc/log.d/scripts/services
-                       dodir /etc/log.d/scripts/shared
-                       dodir /etc/log.d/conf/logfiles
-                       dodir /etc/log.d/conf/services
-                       pushd "${S}"/scripts/logwatch >&/dev/null || die
-                       emake DESTDIR="${D}" install
-                       popd >&/dev/null || die
-               fi
-       fi
-
-       rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
-       rm -vf "${D}"/usr/share/man/man1/bat.1*
-       rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-       if use bacula-clientonly || use bacula-nodir; then
-               rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-               rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-               rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-               rm -vf "${D}"/usr/libexec/bacula/create_*_database
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-               rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-               rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-               rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-       fi
-       if use bacula-clientonly || use bacula-nosd; then
-               rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-               rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-               rm -vf "${D}"/usr/share/man/man8/bextract.8*
-               rm -vf "${D}"/usr/share/man/man8/bls.8*
-               rm -vf "${D}"/usr/share/man/man8/bscan.8*
-               rm -vf "${D}"/usr/share/man/man8/btape.8*
-               rm -vf "${D}"/usr/libexec/bacula/disk-changer
-               rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-               rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-       fi
-
-       # documentation
-       dodoc ChangeLog ReleaseNotes SUPPORT technotes
-
-       # install examples (bug #457504)
-       if use examples; then
-               docinto examples/
-               dodoc -r examples/*
-       fi
-
-       # vim-files
-       if use vim-syntax; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins scripts/bacula.vim
-               insinto /usr/share/vim/vimfiles/ftdetect
-               newins scripts/filetype.vim bacula_ft.vim
-       fi
-
-       # setup init scripts
-       myscripts="bacula-fd"
-       if ! use bacula-clientonly; then
-               if ! use bacula-nodir; then
-                       myscripts="${myscripts} bacula-dir"
-               fi
-               if ! use bacula-nosd; then
-                       myscripts="${myscripts} bacula-sd"
-               fi
-       fi
-       for script in ${myscripts}; do
-               # copy over init script and config to a temporary location
-               # so we can modify them as needed
-               cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die 
"failed to copy ${script}.confd"
-               cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die 
"failed to copy ${script}.initd"
-
-               # now set the database dependancy for the director init script
-               case "${script}" in
-                       bacula-dir)
-                               case "${mydbtype}" in
-                                       sqlite3)
-                                               # sqlite databases don't have a 
daemon
-                                               sed -i -e 's/need 
"%database%"/:/g' "${T}/${script}".initd || die
-                                               ;;
-                                       *)
-                                               # all other databases have 
daemons
-                                               sed -i -e 
"s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-                                               ;;
-                               esac
-                               ;;
-                       *)
-                               ;;
-               esac
-
-               # install init script and config
-               newinitd "${T}/${script}".initd "${script}"
-               newconfd "${T}/${script}".confd "${script}"
-       done
-
-       systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-       systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
-
-       # make sure the working directory exists
-       diropts -m0750
-       keepdir /var/lib/bacula
-
-       # make sure bacula group can execute bacula libexec scripts
-       fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-       if use bacula-clientonly; then
-               fowners root:bacula /var/lib/bacula
-       else
-               fowners bacula:bacula /var/lib/bacula
-       fi
-
-       einfo
-       einfo "This Revision 6 of bacula-5.2.13 dropped support for building 
'bat' as"
-       einfo "Qt4 is not longer supported by Gentoo. Please use it only for 
installations"
-       einfo "requiring an old file demon."
-       einfo
-       if ! use bacula-clientonly && ! use bacula-nodir; then
-               einfo
-               einfo "If this is a new install, you must create the 
${mydbtype} databases with:"
-               einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-               einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-               einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-               einfo
-       fi
-
-       if use sqlite; then
-               einfo
-               einfo "Be aware that Bacula does not officially support SQLite 
database anymore."
-               einfo "Best use it only for a client-only installation. See Bug 
#445540."
-               einfo
-       fi
-
-       einfo "Please note that 'bconsole' will always be installed."
-       einfo
-}

diff --git a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch 
b/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
deleted file mode 100644
index 458c188733a..00000000000
--- a/app-backup/bacula/files/5.2.10/bacula-5.2.10-fix-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/console/Makefile.in.orig       2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in    2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:    .c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
-       @echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-       $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib 
-L../cats -o $@ $(CONSOBJS) \
--            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--            $(OPENSSL_LIBS)
-+            $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+            $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
-       strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-       cd $(topdir) \
---- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200
-+++ src/filed/Makefile.in      2012-08-16 11:08:09.000000000 +0200
-@@ -96,13 +96,13 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-       @echo "Linking $@ ..."
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o 
$@ $(SVROBJS) \
--        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) $(LIBS) \
--        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS) $(LZOLIBS)
-+        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) \
-+        $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a 
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-       $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib 
-L../findlib -o $@ $(SVROBJS) \
--         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) $(LIBS) \
--         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) 
$(AFS_LIBS) $(LZOLIBS)
-+         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm 
$(PYTHON_LIBS) \
-+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) 
$(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
-       strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

diff --git a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch 
b/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
deleted file mode 100644
index 8c419a3bdfa..00000000000
--- a/app-backup/bacula/files/5.2.12/bacula-5.2.12-depend.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix file not found error during make depend
---- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200
-+++ src/tools/Makefile.in      2012-09-20 20:35:46.000000000 +0200
-@@ -194,7 +194,7 @@
-       @$(MV) Makefile Makefile.bak
-       @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-       @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
--      @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> 
Makefile
-+      @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) 
-I../filed -I../dird -I../stored *.c >> Makefile
-       @if test -f Makefile ; then \
-           $(RMF) Makefile.bak; \
-       else \

diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch 
b/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
deleted file mode 100644
index 3cdee15d4db..00000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
---- Makefile.in.orig   2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in        2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
- 
- all: Makefile
-       @for I in ${all_subdirs}; \
--        do (cd $$I; echo "==>Entering directory `pwd`"; \
--            $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  
====== Error in `pwd` ======"; \
--                          echo ""; echo ""; exit 1;)); \
-+        do \
-+            $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
-       done
- 
- depend:
-@@ -55,9 +54,8 @@
-       
- bacula-fd: Makefile      
-       @for I in ${fd_subdirs}; \
--        do (cd $$I; echo "==>Entering directory `pwd`"; \
--            $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   
====== Error in `pwd` ======"; \
--                          echo ""; echo ""; exit 1;)); \
-+        do \
-+              $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
-       done
- 
- #-------------------------------------------------------------------------

diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch 
b/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
deleted file mode 100644
index 98c6e6ce34b..00000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# drop automatic installation of doc files
---- Makefile.in.orig   2011-02-26 09:05:21.000000000 +0000
-+++ Makefile.in        2011-02-26 09:06:01.000000000 +0000
-@@ -34,8 +34,7 @@
-       autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
-       autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
--          INSTALL
-+doc_files = 
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@

diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch 
b/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
deleted file mode 100644
index 94d8fb60120..00000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
---- src/qt-console/bat.pro.in.orig     2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in  2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@ 

diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch 
b/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
deleted file mode 100644
index c3bded40ad0..00000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of lib search 
path.
---- src/console/Makefile.in.orig       2010-03-29 11:35:00.000000000 +0000
-+++ src/console/Makefile.in    2010-03-29 11:45:14.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--      $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o 
$@ $(CONSOBJS) \
-+      $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o 
$@ $(CONSOBJS) \
-             $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
-             $(OPENSSL_LIBS)
- 

Reply via email to