From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../avahi/files/avahi-0.6.30-automake-1.11.2.patch | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch (limited to 'net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch') diff --git a/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch b/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch new file mode 100644 index 000000000000..be385f6cfbe3 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.6.30-automake-1.11.2.patch @@ -0,0 +1,102 @@ +http://bugs.gentoo.org/397477 + +--- avahi-python/avahi/Makefile.am ++++ avahi-python/avahi/Makefile.am +@@ -31,7 +31,7 @@ + -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ + -e 's,@CHECK_KEY\@,while key is not None:,g' \ + -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ +- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ ++ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ + chmod +x $@ + endif + +@@ -44,7 +44,7 @@ + -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ + -e 's,@CHECK_KEY\@,for key in keys:,g' \ + -e 's,@NEXT_KEY\@,,g' \ +- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ ++ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ + chmod +x $@ + endif + +--- avahi-python/avahi/ServiceTypeDatabase.py.in ++++ avahi-python/avahi/ServiceTypeDatabase.py.in +@@ -26,7 +26,7 @@ + class ServiceTypeDatabase: + """ServiceTypeDatabase maps service types to descriptions""" + +- def __init__(self, filename = "@pkglibdir@/service-types.db"): ++ def __init__(self, filename = "@pkgdatadir@/service-types.db"): + + self.db = @DBM@.open(filename, "r") + +--- avahi-ui/Makefile.am ++++ avahi-ui/Makefile.am +@@ -62,18 +62,18 @@ + + if HAVE_GDBM + libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c +-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + libavahi_ui_la_LIBADD += -lgdbm + +-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + libavahi_ui_gtk3_la_LIBADD += -lgdbm + endif + + if HAVE_DBM + libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c +-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + +-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + endif + + bin_PROGRAMS = bssh +--- avahi-utils/Makefile.am ++++ avahi-utils/Makefile.am +@@ -30,13 +30,13 @@ + + if HAVE_GDBM + avahi_browse_SOURCES += stdb.h stdb.c +-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + avahi_browse_LDADD += -lgdbm + endif + + if HAVE_DBM + avahi_browse_SOURCES += stdb.h stdb.c +-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + endif + + avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h +--- service-type-database/Makefile.am ++++ service-type-database/Makefile.am +@@ -18,13 +18,12 @@ + EXTRA_DIST=build-db.in service-types + + pkgdata_DATA=service-types +-pkglib_DATA= + + if HAVE_PYTHON + if HAVE_GDBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db ++pkgdata_DATA+=service-types.db + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@@ -41,7 +40,7 @@ + if HAVE_DBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db.pag service-types.db.dir ++pkgdata_DATA+=service-types.db.pag service-types.db.dir + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -- cgit v1.2.3-65-gdbad