dep_pkg: drop support for Cpv attrs with Dep objects

pkgcraft · Jul 3, 2024 · 591008c · 591008c
1 parent 92668c4
commit 591008c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 59 deletions.
diff --git a/dep_pkg.go b/dep_pkg.go
@@ -208,50 +208,6 @@ func (self *Dep) Repo() string {
 	return C.GoString(s)
 }
 
-// Return a package dependency's package and version.
-func (self *Dep) P() string {
-	c_str := C.pkgcraft_dep_p(self.ptr)
-	defer C.pkgcraft_str_free(c_str)
-	return C.GoString(c_str)
-}
-
-// Return a package dependency's package, version, and revision.
-func (self *Dep) Pf() string {
-	c_str := C.pkgcraft_dep_pf(self.ptr)
-	defer C.pkgcraft_str_free(c_str)
-	return C.GoString(c_str)
-}
-
-// Return a package dependency's revision.
-func (self *Dep) Pr() string {
-	c_str := C.pkgcraft_dep_pr(self.ptr)
-	if c_str != nil {
-		defer C.pkgcraft_str_free(c_str)
-		return C.GoString(c_str)
-	}
-	return ""
-}
-
-// Return a package dependency's version.
-func (self *Dep) Pv() string {
-	c_str := C.pkgcraft_dep_pv(self.ptr)
-	if c_str != nil {
-		defer C.pkgcraft_str_free(c_str)
-		return C.GoString(c_str)
-	}
-	return ""
-}
-
-// Return a package dependency's version and revision.
-func (self *Dep) Pvr() string {
-	c_str := C.pkgcraft_dep_pvr(self.ptr)
-	if c_str != nil {
-		defer C.pkgcraft_str_free(c_str)
-		return C.GoString(c_str)
-	}
-	return ""
-}
-
 // Return a package dependency's Cpn.
 func (self *Dep) Cpn() *Cpn {
 	ptr := C.pkgcraft_dep_cpn(self.ptr)

diff --git a/dep_pkg_test.go b/dep_pkg_test.go
@@ -56,11 +56,6 @@ func TestDepAttrs(t *testing.T) {
 	assert.Equal(t, dep.Package(), "pkg")
 	assert.Equal(t, dep.Version(), &Version{})
 	assert.Equal(t, dep.Revision(), &Revision{})
-	assert.Equal(t, dep.P(), "pkg")
-	assert.Equal(t, dep.Pf(), "pkg")
-	assert.Equal(t, dep.Pr(), "")
-	assert.Equal(t, dep.Pv(), "")
-	assert.Equal(t, dep.Pvr(), "")
 	cpn, _ = NewCpn("cat/pkg")
 	assert.Equal(t, dep.Cpn(), cpn)
 	assert.Nil(t, dep.Cpv())
@@ -81,11 +76,6 @@ func TestDepAttrs(t *testing.T) {
 	assert.True(t, dep.Version().Cmp(ver) == 0)
 	rev, _ = NewRevision("2")
 	assert.Equal(t, dep.Revision(), rev)
-	assert.Equal(t, dep.P(), "pkg-1")
-	assert.Equal(t, dep.Pf(), "pkg-1-r2")
-	assert.Equal(t, dep.Pr(), "r2")
-	assert.Equal(t, dep.Pv(), "1")
-	assert.Equal(t, dep.Pvr(), "1-r2")
 	assert.Equal(t, dep.Cpn(), cpn)
 	cpv, _ = NewCpv("cat/pkg-1-r2")
 	assert.Equal(t, dep.Cpv(), cpv)
@@ -137,11 +127,6 @@ func TestDepAttrs(t *testing.T) {
 	assert.Equal(t, dep.SlotOp(), SlotOpEqual)
 	assert.Equal(t, dep.Use(), []string{"a", "b", "c"})
 	assert.Equal(t, dep.Repo(), "repo")
-	assert.Equal(t, dep.P(), "pkg-1")
-	assert.Equal(t, dep.Pf(), "pkg-1-r2")
-	assert.Equal(t, dep.Pr(), "r2")
-	assert.Equal(t, dep.Pv(), "1")
-	assert.Equal(t, dep.Pvr(), "1-r2")
 	assert.Equal(t, dep.Cpn(), cpn)
 	assert.Equal(t, dep.Cpv(), cpv)
 	assert.Equal(t, dep.String(), "!!=cat/pkg-1-r2:3/4=::repo[a,b,c]")