ob_use(): Remove

26 files changed, 0 insertions, 145 deletions

diff --git a/lib/changelog.sh b/lib/changelog.sh
index 33546fd..29c419e 100644
--- a/lib/changelog.sh
+++ b/lib/changelog.sh
@@ -20,10 +20,6 @@
 [ x"${_OB_CHANGELOG_SM+set}" = x'set' ] && return 0
 _OB_CHANGELOG_SM=1
 
-ob_use messages
-ob_use locale
-ob_use metadata
-
 OB_CHANGELOG_SOURCE=
 OB_CHANGELOG_VERSION=
 OB_CHANGELOG_DISTRIBUTION=
diff --git a/lib/control.sh b/lib/control.sh
index ae9db28..59a69c4 100644
--- a/lib/control.sh
+++ b/lib/control.sh
@@ -20,9 +20,6 @@
 [ x"${_OB_CONTROL_SM+set}" = x'set' ] && return 0
 _OB_CONTROL_SM=1
 
-ob_use messages
-ob_use locale
-
 _OB_SUBSTVARS_MAX_DEPTH=50
 
 OB_CONTROL_NAME=
diff --git a/lib/deps.sh b/lib/deps.sh
index c9b065f..3e51930 100644
--- a/lib/deps.sh
+++ b/lib/deps.sh
@@ -20,8 +20,6 @@
 [ x"${_OB_DEPS_SM+set}" = x'set' ] && return 0
 _OB_DEPS_SM=1
 
-ob_use metadata
-
 ob_parse_dep()
 {
 	local opt=
diff --git a/lib/load.sh b/lib/load.sh
deleted file mode 100644
index 7cdaf5f..0000000
--- a/lib/load.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-# opkbuild
-# lib/load.sh
-# Functions for loading library modules.
-#
-# Copyright (C) 2012 Patrick "P. J." McDermott
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-[ x"${_OB_LOAD_SM+set}" = x'set' ] && return 0
-_OB_LOAD_SM=1
-
-# The "common" module is used by this and all other modules.
-# We have to manually load the "common" module so we can use it in ob_use.
-# . "${PKGLIBDIR}/common.sho"
-
-ob_use()
-{
-	local module
-
-	if [ ${#} -eq 1 ]; then
-		module="${1}"
-	else
-		return 125
-	fi
-
-	module="${PKGLIBDIR}/${module}.sho"
-	if [ -r "${module}" ]; then
-		: . "${module}"
-	else
-		return 1
-	fi
-
-	return 0
-}
diff --git a/lib/local.mk b/lib/local.mk
index 7bf8675..21aa786 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -1,5 +1,4 @@
 pkgdata_sources = \
-	lib/load.sh \
 	lib/common.sh \
 	lib/locale.sh \
 	lib/output.sh \
diff --git a/lib/locale.sh b/lib/locale.sh
index b2fe329..43f5ec3 100644
--- a/lib/locale.sh
+++ b/lib/locale.sh
@@ -20,8 +20,6 @@
 [ x"${_OB_LOCALE_SM+set}" = x'set' ] && return 0
 _OB_LOCALE_SM=1
 
-ob_use output
-
 _OB_DEFAULT_LOCALE='en_US'
 _OB_INTERNAL_TEXT_DOMAIN='libopkbuild_1'
 _OB_TEXT_DOMAIN=
diff --git a/lib/metadata.sh b/lib/metadata.sh
index 5bd56da..62f5328 100644
--- a/lib/metadata.sh
+++ b/lib/metadata.sh
@@ -20,8 +20,6 @@
 [ x"${_OB_METADATA_SM+set}" = x'set' ] && return 0
 _OB_METADATA_SM=1
 
-ob_use "metadata/${METADATA}"
-
 ob_validate_source_name()
 {
 	local name=
diff --git a/lib/output.sh b/lib/output.sh
index 783d194..d6982be 100644
--- a/lib/output.sh
+++ b/lib/output.sh
@@ -20,8 +20,6 @@
 [ x"${_OB_OUTPUT_SM+set}" = x'set' ] && return 0
 _OB_OUTPUT_SM=1
 
-ob_use locale
-
 ob_error()
 {
 	printf '%s: Error: ' "${0##*/}" >&2
diff --git a/lib/package.sh b/lib/package.sh
index 185450d..aad1d8f 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -20,8 +20,6 @@
 [ x"${_OB_PACKAGE_SM+set}" = x'set' ] && return 0
 _OB_PACKAGE_SM=1
 
-ob_use metadata
-
 _OB_PACKAGE_DIR=
 _OB_PACKAGE_FORMAT=
 _OB_BINARY_PACKAGES=
@@ -57,8 +55,6 @@ ob_init_package()
 		return 1
 	fi
 
-	ob_use "package/${_OB_PACKAGE_FORMAT}"
-
 	_OB_BINARY_PACKAGES=
 
 	return 0
diff --git a/lib/package/2.sh b/lib/package/2.sh
index 8ec4784..0be38fc 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -20,9 +20,6 @@
 [ x"${_OB_PACKAGE_2_SM+set}" = x'set' ] && return 0
 _OB_PACKAGE_2_SM=1
 
-ob_use control
-ob_use changelog
-
 _OB_SOURCE_FIELDS_REQUIRED_2='Maintainer'
 _OB_SOURCE_FIELDS_OPTIONAL_2='Build-Depends Homepage'
 _OB_BINARY_FIELDS_REQUIRED_2='Architecture Platform Description'
diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh
index dfba5b6..a36a0ea 100644
--- a/src/ob-applypatches.sh
+++ b/src/ob-applypatches.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index 550dc83..8f07f8c 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -21,11 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-ob_use deps
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index 9d00c7c..fd1294c 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index f0737da..40706c0 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -21,11 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-ob_use deps
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh
index 92d8c43..8bf86a1 100644
--- a/src/ob-genchanges.sh
+++ b/src/ob-genchanges.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 8d01d3f..e9d5b3e 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -21,11 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-ob_use deps
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index b5dd882..eaa8fbb 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 main()
 {
 	ob_set_text_domain 'opkbuild'
diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index a4d71ec..c760b3d 100644
--- a/src/ob-installplatconf.sh
+++ b/src/ob-installplatconf.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 system_paths_ifs='
 '
 
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index c8c9df2..baadf78 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -21,10 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-
 upstream_ar_base=
 upstream_ar=
 upstream_ar_z=
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index 57560b7..e6defe2 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -21,11 +21,6 @@
 
 . '@@LIBDATADIR@@/libopkbuild.shso.1'
 
-ob_use locale
-ob_use output
-ob_use package
-ob_use metadata
-
 export OPK_SOURCE=
 export OPK_SOURCE_VERSION=
 export OPK_SOURCE_VERSION_UPSTREAM=
diff --git a/tests/common.sh b/tests/common.sh
index 83cb42a..350ae53 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -19,30 +19,8 @@
 
 BUILDDIR="${PWD}/.."
 
-# The "common" module is used by all library modules.
-# We have to manually load the "common" module so we can use it in ob_use.
 . "${BUILDDIR}/lib/libopkbuild.shso.1"
 
-ob_use()
-{
-	local module=
-
-	if [ "${#}" -eq 1 ]; then
-		module="${1}"
-	else
-		return 125
-	fi
-
-	module="${BUILDDIR}/lib/${module}.sho"
-	if [ -r "${module}" ]; then
-		: . "${module}"
-	else
-		return 1
-	fi
-
-	return 0
-}
-
 test_assert()
 {
 	eval "${*}"
diff --git a/tests/ob_arch_is_concerned.sh b/tests/ob_arch_is_concerned.sh
index bd5b1af..9ed9bf8 100644
--- a/tests/ob_arch_is_concerned.sh
+++ b/tests/ob_arch_is_concerned.sh
@@ -19,8 +19,6 @@
 
 . ./common.sh
 
-ob_use metadata
-
 ret=0
 host_arch=
 arches=
diff --git a/tests/ob_match_arch.sh b/tests/ob_match_arch.sh
index fe3ef5d..545b2af 100644
--- a/tests/ob_match_arch.sh
+++ b/tests/ob_match_arch.sh
@@ -19,9 +19,6 @@
 
 . ./common.sh
 
-ob_use metadata
-ob_use output
-
 ret=0
 arch=
 arch_field=
diff --git a/tests/ob_parse_dep.sh b/tests/ob_parse_dep.sh
index 0f04583..2b4a074 100644
--- a/tests/ob_parse_dep.sh
+++ b/tests/ob_parse_dep.sh
@@ -19,8 +19,6 @@
 
 . ./common.sh
 
-ob_use deps
-
 ret=0
 dep=
 pkg=
diff --git a/tests/ob_plat_is_concerned.sh b/tests/ob_plat_is_concerned.sh
index 2fa7339..bbde8d6 100644
--- a/tests/ob_plat_is_concerned.sh
+++ b/tests/ob_plat_is_concerned.sh
@@ -19,8 +19,6 @@
 
 . ./common.sh
 
-ob_use metadata
-
 ret=0
 host_plat=
 plats=
diff --git a/tests/ob_reduce_deps.sh b/tests/ob_reduce_deps.sh
index 5c725b9..406db0b 100644
--- a/tests/ob_reduce_deps.sh
+++ b/tests/ob_reduce_deps.sh
@@ -19,8 +19,6 @@
 
 . ./common.sh
 
-ob_use deps
-
 ret=0
 type=
 host_arch=