Add --portdir-default with default /var/db/repos/gentoo

vaeth · Feb 27, 2020 · 7960f4b · 7960f4b
1 parent 2509c0a
commit 7960f4b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,15 +1,20 @@
 # ChangeLog for eix - Ebuild IndeX for portage
 
+*eix-0.33.10
+	Martin Väth <martin at mvath.de>:
+	- Add --portdir-default with default /var/db/repos/gentoo, replacing
+	  fallback /usr/portage, see https://github.com/vaeth/eix/issues/69
+
 *eix-0.33.9
-	Martin Väth <mvath at google.com>:
+	Martin Väth <martin at mvath.de>:
 	- Support --longopt=parameter options
 	- Introduce --color {never,always,auto} for overriding, see
 	  https://github.com/vaeth/eix/issues/67
 	- Remove -m*=thunk due to https://github.com/vaeth/eix/issues/64.
 	  In gcc-9, this collides with -fcf-protection=full anyway.
 
 *eix-0.33.8
-	Martin Väth <mvath at google.com>:
+	Martin Väth <martin at mvath.de>:
 	- Output errors produced when reading repos.conf, see
 	  https://github.com/vaeth/eix/issues/60
 	- Add some missing NOEXCEPT
@@ -28,7 +33,7 @@
 	- Russian translation fix
 
 *eix-0.33.7
-	Martin Väth <mvath at google.com>:
+	Martin Väth <martin at mvath.de>:
 	- Support relative pathnames in make.conf, see
 	  https://github.com/vaeth/eix/issues/57
 	- Update sqlite links, see https://github.com/vaeth/eix/issues/58

diff --git a/config.h.in b/config.h.in
@@ -131,6 +131,10 @@
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
+/* Define to 1 if you have the Mac OS X function
+   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
+
 /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -385,6 +389,9 @@
 /* Default PORTDIR_CACHE_METHOD */
 #undef PORTDIR_CACHE_METHOD
 
+/* Default PORTDIR */
+#undef PORTDIR_DEFAULT
+
 /* Default REQUIRED_USE */
 #undef REQUIRED_USE_DEFAULT
 

diff --git a/configure.ac b/configure.ac
@@ -41,7 +41,7 @@ dnl    each item is listed in a separate line with indent level increased;
 dnl    in such a case the opening/closing braces are isolated.
 dnl 2. The AC_INIT macro must be in one line since it is parsed by
 dnl    primitive scripts.
-AC_INIT([eix], [0.33.9], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
+AC_INIT([eix], [0.33.10], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
 AC_PREREQ([2.64])
 
 m4_ifdef([AC_CONFIG_MACRO_DIR],
@@ -1604,6 +1604,19 @@ AC_DEFINE_UNQUOTED([PORTDIR_CACHE_METHOD],
 	[Default PORTDIR_CACHE_METHOD])
 AC_SUBST([PORTDIR_CACHE_METHOD])
 
+AC_MSG_CHECKING([PORTDIR default])
+AC_ARG_WITH([eprefix-default],
+	[AS_HELP_STRING([--with-eprefix-default=STR],
+		[default PORTDIR])],
+	[AS_VAR_COPY([PORTDIR_DEFAULT], [withval])],
+	[AS_VAR_SET([PORTDIR_DEFAULT], ["/var/db/repos/gentoo"])])
+MV_PREFIX(PORTDIR_DEFAULT)
+MV_MSG_RESULT_VAR([PORTDIR_DEFAULT])
+AC_DEFINE_UNQUOTED([PORTDIR_DEFAULT],
+	["$PORTDIR_DEFAULT"],
+	[Default PORTDIR])
+AC_SUBST([PORTDIR_DEFAULT])
+
 AC_MSG_CHECKING([EPREFIX default])
 AC_ARG_WITH([eprefix-default],
 	[AS_HELP_STRING([--with-eprefix-default=STR],

diff --git a/meson.build b/meson.build
@@ -1332,6 +1332,11 @@ subst.set('PORTDIR_CACHE_METHOD', portdir_cache_method)
 conf.set_quoted('PORTDIR_CACHE_METHOD', portdir_cache_method,
 	description : 'Default PORTDIR_CACHE_METHOD')
 
+portdir_default = get_option('portdir-default')
+result += [ 'portdir-default=' + portdir_default ]
+conf.set_quoted('PORTDIR_DEFAULT', portdir_default,
+	description : 'Default PORTDIR')
+
 eprefix_default = get_option('eprefix-default')
 eprefix_default_msg = ''
 if eprefix_default == 'auto'

diff --git a/meson_options.txt b/meson_options.txt
@@ -48,6 +48,8 @@ option('sh-shebang', type : 'string', value : 'auto',
 	description : 'use argument as sh script shebang. Pass auto for autodetection')
 option('portdir-cache-method', type : 'string', value : 'metadata-md5-or-flat',
 	description : 'default PORTDIR_CACHE_METHOD')
+option('portdir-default', type : 'string', value : '/var/db/repos/gentoo',
+	description : 'default PORTDIR')
 option('eprefix-default', type : 'string', value : 'auto',
 	description : 'default EPREFIX. Pass auto for autodetection')
 option('eix-prefix-default', type : 'string', value : '',

diff --git a/po/de.po b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eix\n"
 "Report-Msgid-Bugs-To: https://github.com/vaeth/eix/issues/\n"
-"POT-Creation-Date: 2019-11-27 19:27+0100\n"
+"POT-Creation-Date: 2020-02-27 06:08+0100\n"
 "PO-Revision-Date: 2019-11-27 19:52+0100\n"
 "Last-Translator: Martin Väth <martin@mvath.de>\n"
 "Language-Team: German\n"
@@ -365,16 +365,19 @@ msgid "Could not copy database to ${eixprevious}"
 msgstr "Konnte die Datenbank nicht nach ${eixprevious} kopieren"
 
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "eix-sync"
 msgid "Running eix-update"
 msgstr "Starte eix-update"
 
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "Statusline eix-sync"
 msgid "Running eix-update"
 msgstr "Starte eix-update"
 
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "eix-sync"
 msgid "eix-update failed"
 msgstr "eix-update schlug fehl"

diff --git a/po/ru.po b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eix\n"
 "Report-Msgid-Bugs-To: https://github.com/vaeth/eix/issues/\n"
-"POT-Creation-Date: 2019-11-27 19:27+0100\n"
+"POT-Creation-Date: 2020-02-27 06:08+0100\n"
 "PO-Revision-Date: 2019-11-27 19:52+0100\n"
 "Last-Translator: Artem Vorotnikov <skybon@gmail.com>\n"
 "Language-Team: русский <>\n"
@@ -383,18 +383,21 @@ msgstr "Невозможно скопировать базу данных в ${e
 
 # fuzzy
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "eix-sync"
 msgid "Running eix-update"
 msgstr "Запуск eix-update"
 
 # fuzzy
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "Statusline eix-sync"
 msgid "Running eix-update"
 msgstr "Запуск eix-update"
 
 # fuzzy
 #: src/eix-postsync.sh.in
+#, sh-format
 msgctxt "eix-sync"
 msgid "eix-update failed"
 msgstr "ошибка eix-update"

diff --git a/src/portage/conf/portagesettings.cc b/src/portage/conf/portagesettings.cc
@@ -268,7 +268,7 @@ void PortageSettings::init(EixRc *eixrc, const ParseError *e, bool getlocal, boo
 			}
 		}
 		if(portdirref.empty()) {
-			portdirref = "/usr/portage";
+			portdirref = PORTDIR_DEFAULT;
 		}
 		/* Normalize "PORTDIR": */
 		portdirref = normalize_path((m_eprefixportdir + portdirref).c_str(), true, true);